diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'b93886be', + 'core.pkg.css' => '784344e7', 'core.pkg.js' => '60924527', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'bb338e4b', @@ -25,7 +25,7 @@ 'rsrc/css/aphront/notification.css' => '9c279160', 'rsrc/css/aphront/pager-view.css' => '2e3539af', 'rsrc/css/aphront/panel-view.css' => '8427b78d', - 'rsrc/css/aphront/phabricator-nav-view.css' => '7aeaf435', + 'rsrc/css/aphront/phabricator-nav-view.css' => '3e02e410', 'rsrc/css/aphront/table-view.css' => '59e2c0f8', 'rsrc/css/aphront/tokenizer.css' => '86a13f7f', 'rsrc/css/aphront/tooltip.css' => '7672b60f', @@ -36,7 +36,7 @@ 'rsrc/css/application/auth/auth.css' => '1e655982', 'rsrc/css/application/base/main-menu-view.css' => '1766b04d', 'rsrc/css/application/base/notification-menu.css' => '3c9d8aa1', - 'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f', + 'rsrc/css/application/base/phabricator-application-launch-view.css' => '3fa70b5a', 'rsrc/css/application/base/standard-page-view.css' => 'dc14c671', 'rsrc/css/application/chatlog/chatlog.css' => '852140ff', 'rsrc/css/application/config/config-options.css' => '7fedf08b', @@ -73,7 +73,6 @@ 'rsrc/css/application/harbormaster/harbormaster.css' => '49d64eb4', 'rsrc/css/application/herald/herald-test.css' => '778b008e', 'rsrc/css/application/herald/herald.css' => '826075fa', - 'rsrc/css/application/home/home.css' => 'e34bf140', 'rsrc/css/application/maniphest/batch-editor.css' => '8f380ebc', 'rsrc/css/application/maniphest/report.css' => 'f6931fdf', 'rsrc/css/application/maniphest/task-edit.css' => '8e23031b', @@ -107,7 +106,7 @@ 'rsrc/css/application/slowvote/slowvote.css' => '266df6a1', 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', - 'rsrc/css/core/core.css' => '8971b2d1', + 'rsrc/css/core/core.css' => 'cee2aadb', 'rsrc/css/core/remarkup.css' => '0037bdbf', 'rsrc/css/core/syntax.css' => '6b7b24d9', 'rsrc/css/core/z-index.css' => '3b612549', @@ -126,7 +125,7 @@ 'rsrc/css/phui/phui-action-header-view.css' => '89c497e7', 'rsrc/css/phui/phui-action-list.css' => '4f4d09f2', 'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5', - 'rsrc/css/phui/phui-box.css' => '7b3a2eed', + 'rsrc/css/phui/phui-box.css' => 'a5bb366d', 'rsrc/css/phui/phui-button.css' => 'de610129', 'rsrc/css/phui/phui-crumbs-view.css' => '594d719e', 'rsrc/css/phui/phui-document.css' => '94d5dcd8', @@ -134,16 +133,16 @@ 'rsrc/css/phui/phui-fontkit.css' => 'dd8ddf27', 'rsrc/css/phui/phui-form-view.css' => '17eace76', 'rsrc/css/phui/phui-form.css' => 'f535f938', - 'rsrc/css/phui/phui-header-view.css' => 'da4586b1', + 'rsrc/css/phui/phui-header-view.css' => '31868fb6', 'rsrc/css/phui/phui-icon.css' => 'bc766998', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-info-view.css' => 'c6f0aef8', 'rsrc/css/phui/phui-list.css' => '2e25ebfb', - 'rsrc/css/phui/phui-object-box.css' => '7d160002', - 'rsrc/css/phui/phui-object-item-list-view.css' => '9db65899', + 'rsrc/css/phui/phui-object-box.css' => '2d3b3b42', + 'rsrc/css/phui/phui-object-item-list-view.css' => 'bfe590d4', 'rsrc/css/phui/phui-pinboard-view.css' => 'eaab2b1b', - 'rsrc/css/phui/phui-property-list-view.css' => '5b671934', + 'rsrc/css/phui/phui-property-list-view.css' => 'da85c07d', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', 'rsrc/css/phui/phui-spacing.css' => '042804d6', 'rsrc/css/phui/phui-status.css' => '888cedb8', @@ -537,7 +536,6 @@ 'herald-css' => '826075fa', 'herald-rule-editor' => '9229e764', 'herald-test-css' => '778b008e', - 'homepage-panel-css' => 'e34bf140', 'inline-comment-summary-css' => 'eb5f8e8c', 'javelin-aphlict' => '30a6303c', 'javelin-behavior' => '61cbc29a', @@ -710,11 +708,11 @@ 'path-typeahead' => 'f7fc67ec', 'people-profile-css' => '25970776', 'phabricator-action-list-view-css' => '4f4d09f2', - 'phabricator-application-launch-view-css' => '16ca323f', + 'phabricator-application-launch-view-css' => '3fa70b5a', 'phabricator-busy' => '59a7976a', 'phabricator-chatlog-css' => '852140ff', 'phabricator-content-source-view-css' => '4b8b05d4', - 'phabricator-core-css' => '8971b2d1', + 'phabricator-core-css' => 'cee2aadb', 'phabricator-countdown-css' => '86b7b0a0', 'phabricator-dashboard-css' => '17937d22', 'phabricator-drag-and-drop-file-upload' => '07de8873', @@ -729,7 +727,7 @@ 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', 'phabricator-main-menu-view' => '1766b04d', - 'phabricator-nav-view-css' => '7aeaf435', + 'phabricator-nav-view-css' => '3e02e410', 'phabricator-notification' => '0c6946e7', 'phabricator-notification-css' => '9c279160', 'phabricator-notification-menu-css' => '3c9d8aa1', @@ -770,7 +768,7 @@ 'phriction-document-css' => '0d16bc9a', 'phui-action-header-view-css' => '89c497e7', 'phui-action-panel-css' => '3ee9afd5', - 'phui-box-css' => '7b3a2eed', + 'phui-box-css' => 'a5bb366d', 'phui-button-css' => 'de610129', 'phui-calendar-css' => '8675968e', 'phui-calendar-day-css' => '75b8cc4a', @@ -783,17 +781,17 @@ 'phui-fontkit-css' => 'dd8ddf27', 'phui-form-css' => 'f535f938', 'phui-form-view-css' => '17eace76', - 'phui-header-view-css' => 'da4586b1', + 'phui-header-view-css' => '31868fb6', 'phui-icon-view-css' => 'bc766998', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', 'phui-info-view-css' => 'c6f0aef8', 'phui-inline-comment-view-css' => '2174771a', 'phui-list-view-css' => '2e25ebfb', - 'phui-object-box-css' => '7d160002', - 'phui-object-item-list-view-css' => '9db65899', + 'phui-object-box-css' => '2d3b3b42', + 'phui-object-item-list-view-css' => 'bfe590d4', 'phui-pinboard-view-css' => 'eaab2b1b', - 'phui-property-list-view-css' => '5b671934', + 'phui-property-list-view-css' => 'da85c07d', 'phui-remarkup-preview-css' => '19ad512b', 'phui-spacing-css' => '042804d6', 'phui-status-list-view-css' => '888cedb8', diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php --- a/src/applications/home/controller/PhabricatorHomeMainController.php +++ b/src/applications/home/controller/PhabricatorHomeMainController.php @@ -104,7 +104,6 @@ $revision_panel = null; } - require_celerity_resource('homepage-panel-css'); $home = phutil_tag( 'div', array( diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php --- a/src/view/phui/PHUIObjectBoxView.php +++ b/src/view/phui/PHUIObjectBoxView.php @@ -148,10 +148,14 @@ require_celerity_resource('phui-object-box-css'); + + // TODO: (redesign-2015) For now going to override this by hand instead of hunting + // down all call sites. This is mostly to prove the design will work + // then do the legwork before re-merging to master. if ($this->headerColor) { $header_color = $this->headerColor; } else { - $header_color = PHUIActionHeaderView::HEADER_LIGHTBLUE; + $header_color = PHUIActionHeaderView::HEADER_WHITE; } if ($this->header) { diff --git a/webroot/rsrc/css/aphront/phabricator-nav-view.css b/webroot/rsrc/css/aphront/phabricator-nav-view.css --- a/webroot/rsrc/css/aphront/phabricator-nav-view.css +++ b/webroot/rsrc/css/aphront/phabricator-nav-view.css @@ -23,7 +23,7 @@ element extend off the bottom of the screen to prevent this. */ bottom: -480px; width: 204px; - background: #dbdde0; + background: #fff; border-right: 1px solid {$hovergrey}; } diff --git a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css --- a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css +++ b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css @@ -30,7 +30,7 @@ text-decoration: none; width: 100%; height: 44px; - border-bottom: 1px solid {$hovergrey}; + border-bottom: 1px solid {$thinblueborder}; } .device-phone div.phabricator-application-launch-container { @@ -51,7 +51,7 @@ } .device-desktop a.phabricator-application-launch-container:hover { - background-color: {$hovergrey}; + background-color: rgba(0,0,0,.05); text-decoration: none; } diff --git a/webroot/rsrc/css/application/home/home.css b/webroot/rsrc/css/application/home/home.css deleted file mode 100644 --- a/webroot/rsrc/css/application/home/home.css +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @provides homepage-panel-css - */ - -.homepage-panel h1.phui-header-view { - font-size: 14px; - padding-top: 4px; - padding-bottom: 4px; -} diff --git a/webroot/rsrc/css/core/core.css b/webroot/rsrc/css/core/core.css --- a/webroot/rsrc/css/core/core.css +++ b/webroot/rsrc/css/core/core.css @@ -47,7 +47,7 @@ direction: ltr; text-align: left; unicode-bidi: embed; - background: #fff; + background: #f7f7f7; /* By default, the iPhone zooms all text on the page by some percentage when you rotate from portrait mode to landscape mode. Disable this, since it diff --git a/webroot/rsrc/css/phui/phui-box.css b/webroot/rsrc/css/phui/phui-box.css --- a/webroot/rsrc/css/phui/phui-box.css +++ b/webroot/rsrc/css/phui/phui-box.css @@ -4,8 +4,8 @@ .phui-box-border { border: 1px solid {$lightblueborder}; - border-bottom: 1px solid {$blueborder}; background-color: #fff; + border-radius: 3px; } .phui-box.focus { diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -3,13 +3,16 @@ */ .phui-header-shell { - background-color: #e0e3ec; border-width: 1px 0; border-style: solid; border-color: {$hovergrey}; overflow: hidden; } +.phui-header-shell.sprite-gradient.gradient-white-header { + background: transparent; +} + body .phui-header-shell.phui-header-no-backgound { background-color: transparent; border: none; @@ -38,7 +41,7 @@ .phui-header-view { padding: 16px; - font-size: 15px; + font-size: 16px; color: {$darkbluetext}; position: relative; } diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css --- a/webroot/rsrc/css/phui/phui-object-box.css +++ b/webroot/rsrc/css/phui/phui-object-box.css @@ -4,6 +4,7 @@ .phui-object-box { position: relative; + padding: 12px 12px 4px 12px; } div.phui-object-box.phui-object-box-flush { @@ -11,8 +12,8 @@ } .phui-object-box .phui-header-shell { - padding: 4px 5px 4px 12px; - border-bottom: 1px solid {$lightblueborder}; + padding: 0 5px 4px 4px; + border-bottom: 1px solid {$thinblueborder}; border-top: none; } @@ -21,8 +22,8 @@ } .phui-object-box .phui-header-shell h1 { - text-shadow: 0 1px #fff; - padding: 8px 0; + padding: 0 0 8px 0; + font-weight: normal; } .phui-object-box .phui-header-shell + .phui-info-view { diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -39,7 +39,6 @@ border-color: {$lightgreyborder}; margin: 5px 0; overflow: hidden; - border-left-width: 4px; background: #fff; margin-bottom: 4px; } @@ -249,7 +248,7 @@ border-right: none; } -.phui-object-box .phui-object-list-stackable:last-child +.phui-object-box .phui-object-item:last-child .phui-object-item-frame { border-bottom: none; } diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css --- a/webroot/rsrc/css/phui/phui-property-list-view.css +++ b/webroot/rsrc/css/phui/phui-property-list-view.css @@ -2,10 +2,6 @@ * @provides phui-property-list-view-css */ -.phui-property-list-view { - background-color: #fff; -} - .phui-property-list-view .keyboard-shortcuts-available { float: right; height: 16px; @@ -117,7 +113,6 @@ .phui-property-list-text-content { padding: 12px 16px; - background: #fff; overflow: hidden; } @@ -127,7 +122,6 @@ .phui-property-list-raw-content { padding: 0px; - background: #fff; overflow: hidden; }