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' => '9cc0bd27', + 'core.pkg.css' => '6b901dd5', 'core.pkg.js' => 'b7bdab05', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => 'd1b3a605', @@ -29,7 +29,7 @@ 'rsrc/css/aphront/notification.css' => '6901121e', 'rsrc/css/aphront/pager-view.css' => '2e3539af', 'rsrc/css/aphront/panel-view.css' => '5846dfa2', - 'rsrc/css/aphront/phabricator-nav-view.css' => '80e60fc1', + 'rsrc/css/aphront/phabricator-nav-view.css' => '627224f5', 'rsrc/css/aphront/request-failure-view.css' => 'da14df31', 'rsrc/css/aphront/table-view.css' => '92a719ca', 'rsrc/css/aphront/tokenizer.css' => '36903077', @@ -38,9 +38,9 @@ 'rsrc/css/aphront/two-column.css' => '16ab3ad2', 'rsrc/css/aphront/typeahead.css' => '271456a1', 'rsrc/css/application/auth/auth.css' => '1e655982', - 'rsrc/css/application/base/main-menu-view.css' => 'd36e0c11', + 'rsrc/css/application/base/main-menu-view.css' => '2a38fab4', 'rsrc/css/application/base/notification-menu.css' => 'fc9a363c', - 'rsrc/css/application/base/phabricator-application-launch-view.css' => '5cb75f67', + 'rsrc/css/application/base/phabricator-application-launch-view.css' => '35d41a43', 'rsrc/css/application/base/standard-page-view.css' => '517cdfb1', 'rsrc/css/application/chatlog/chatlog.css' => '852140ff', 'rsrc/css/application/config/config-options.css' => '7fedf08b', @@ -121,7 +121,7 @@ 'rsrc/css/layout/phabricator-crumbs-view.css' => '2d9db584', 'rsrc/css/layout/phabricator-filetree-view.css' => 'a8c86ace', 'rsrc/css/layout/phabricator-hovercard-view.css' => '67c12b16', - 'rsrc/css/layout/phabricator-side-menu-view.css' => '503699d0', + 'rsrc/css/layout/phabricator-side-menu-view.css' => '393c1876', 'rsrc/css/layout/phabricator-source-code-view.css' => '62a99814', 'rsrc/css/phui/calendar/phui-calendar-day.css' => 'de035c8a', 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59', @@ -156,7 +156,7 @@ 'rsrc/css/sprite-buttonbar.css' => 'ba1c5738', 'rsrc/css/sprite-conpherence.css' => '3b4a0487', 'rsrc/css/sprite-docs.css' => '5f65d0da', - 'rsrc/css/sprite-gradient.css' => 'a10def53', + 'rsrc/css/sprite-gradient.css' => '16352967', 'rsrc/css/sprite-icons.css' => 'f19a828c', 'rsrc/css/sprite-login.css' => '9fbaec81', 'rsrc/css/sprite-main-header.css' => '92720ee2', @@ -401,7 +401,7 @@ 'rsrc/js/application/policy/behavior-policy-control.js' => 'c01153ea', 'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '263aeb8c', 'rsrc/js/application/ponder/behavior-votebox.js' => '327dbe61', - 'rsrc/js/application/projects/behavior-project-boards.js' => '1b9facd8', + 'rsrc/js/application/projects/behavior-project-boards.js' => 'cbdc9b22', 'rsrc/js/application/projects/behavior-project-create.js' => '065227cc', 'rsrc/js/application/releeph/releeph-preview-branch.js' => '9eb2cedb', 'rsrc/js/application/releeph/releeph-request-state-change.js' => 'fe7fc914', @@ -610,7 +610,7 @@ 'javelin-behavior-policy-control' => 'c01153ea', 'javelin-behavior-policy-rule-editor' => '263aeb8c', 'javelin-behavior-ponder-votebox' => '327dbe61', - 'javelin-behavior-project-boards' => '1b9facd8', + 'javelin-behavior-project-boards' => 'cbdc9b22', 'javelin-behavior-project-create' => '065227cc', 'javelin-behavior-refresh-csrf' => 'c4b31646', 'javelin-behavior-releeph-preview-branch' => '9eb2cedb', @@ -675,7 +675,7 @@ 'people-profile-css' => 'ba7b2762', 'phabricator-action-header-view-css' => 'c14dfc57', 'phabricator-action-list-view-css' => '81383e25', - 'phabricator-application-launch-view-css' => '5cb75f67', + 'phabricator-application-launch-view-css' => '35d41a43', 'phabricator-busy' => '6453c869', 'phabricator-chatlog-css' => '852140ff', 'phabricator-content-source-view-css' => '4b8b05d4', @@ -695,9 +695,9 @@ 'phabricator-jump-nav' => 'f0c5e726', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'ad7a69ca', - 'phabricator-main-menu-view' => 'd36e0c11', + 'phabricator-main-menu-view' => '2a38fab4', 'phabricator-menu-item' => '0f386ef4', - 'phabricator-nav-view-css' => '80e60fc1', + 'phabricator-nav-view-css' => '627224f5', 'phabricator-notification' => '0c6946e7', 'phabricator-notification-css' => '6901121e', 'phabricator-notification-menu-css' => 'fc9a363c', @@ -711,7 +711,7 @@ 'phabricator-search-results-css' => 'f240504c', 'phabricator-settings-css' => 'ea8f5915', 'phabricator-shaped-request' => 'dfa181a4', - 'phabricator-side-menu-view-css' => '503699d0', + 'phabricator-side-menu-view-css' => '393c1876', 'phabricator-slowvote-css' => '266df6a1', 'phabricator-source-code-view-css' => '62a99814', 'phabricator-standard-page-view' => '517cdfb1', @@ -790,7 +790,7 @@ 'sprite-buttonbar-css' => 'ba1c5738', 'sprite-conpherence-css' => '3b4a0487', 'sprite-docs-css' => '5f65d0da', - 'sprite-gradient-css' => 'a10def53', + 'sprite-gradient-css' => '16352967', 'sprite-icons-css' => 'f19a828c', 'sprite-login-css' => '9fbaec81', 'sprite-main-header-css' => '92720ee2', @@ -937,15 +937,6 @@ 1 => 'javelin-util', 2 => 'phabricator-keyboard-shortcut-manager', ), - '1b9facd8' => - array( - 0 => 'javelin-behavior', - 1 => 'javelin-dom', - 2 => 'javelin-util', - 3 => 'javelin-stratcom', - 4 => 'javelin-workflow', - 5 => 'phabricator-draggable-list', - ), '1e1c8a59' => array( 0 => 'javelin-behavior', @@ -1225,13 +1216,6 @@ 2 => 'javelin-util', 3 => 'phabricator-shaped-request', ), - '62e18640' => - array( - 0 => 'javelin-install', - 1 => 'javelin-util', - 2 => 'javelin-dom', - 3 => 'javelin-typeahead-normalizer', - ), '6453c869' => array( 0 => 'javelin-install', @@ -1265,6 +1249,13 @@ 0 => 'javelin-behavior', 1 => 'javelin-dom', ), + '62e18640' => + array( + 0 => 'javelin-install', + 1 => 'javelin-util', + 2 => 'javelin-dom', + 3 => 'javelin-typeahead-normalizer', + ), '75903ee1' => array( 0 => 'javelin-behavior', @@ -1698,6 +1689,15 @@ 2 => 'javelin-stratcom', 3 => 'phabricator-phtize', ), + 'cbdc9b22' => + array( + 0 => 'javelin-behavior', + 1 => 'javelin-dom', + 2 => 'javelin-util', + 3 => 'javelin-stratcom', + 4 => 'javelin-workflow', + 5 => 'phabricator-draggable-list', + ), 'cd9e7094' => array( 0 => 'javelin-behavior', diff --git a/resources/sprite/manifest/gradient.json b/resources/sprite/manifest/gradient.json --- a/resources/sprite/manifest/gradient.json +++ b/resources/sprite/manifest/gradient.json @@ -55,6 +55,6 @@ "scales" : [ 1 ], - "header" : "\/**\n * @provides sprite-gradient-css\n * @generated\n *\/\n\n.sprite-gradient, .phabricator-dark-menu .phui-list-item-type-label, .phabricator-side-menu .phui-list-item-type-label {\n background-image: url(\/rsrc\/image\/sprite-gradient.png);\n background-repeat: repeat-x;\n}\n\n\n", + "header" : "\/**\n * @provides sprite-gradient-css\n * @generated\n *\/\n\n.sprite-gradient {\n background-image: url(\/rsrc\/image\/sprite-gradient.png);\n background-repeat: repeat-x;\n}\n\n\n", "type" : "repeat-x" } diff --git a/src/applications/meta/view/PhabricatorApplicationLaunchView.php b/src/applications/meta/view/PhabricatorApplicationLaunchView.php --- a/src/applications/meta/view/PhabricatorApplicationLaunchView.php +++ b/src/applications/meta/view/PhabricatorApplicationLaunchView.php @@ -47,15 +47,6 @@ "\xCE\xB2"); } - if ($this->fullWidth) { - $content[] = phutil_tag( - 'span', - array( - 'class' => 'phabricator-application-launch-description', - ), - $application->getShortDescription()); - } - $counts = array(); $text = array(); if ($this->status) { @@ -131,6 +122,8 @@ $classes[] = 'phabricator-application-launch-container'; if ($this->fullWidth) { $classes[] = 'application-tile-full'; + } else { + $classes[] = 'app-tl-sm'; // wow. such small. } $title = null; diff --git a/src/infrastructure/celerity/CeleritySpriteGenerator.php b/src/infrastructure/celerity/CeleritySpriteGenerator.php --- a/src/infrastructure/celerity/CeleritySpriteGenerator.php +++ b/src/infrastructure/celerity/CeleritySpriteGenerator.php @@ -637,9 +637,7 @@ $sheet = $this->buildSheet( 'gradient', false, - PhutilSpriteSheet::TYPE_REPEAT_X, - ', .phabricator-dark-menu .phui-list-item-type-label, '. - '.phabricator-side-menu .phui-list-item-type-label'); + PhutilSpriteSheet::TYPE_REPEAT_X); foreach ($sprites as $sprite) { $sheet->addSprite($sprite); } 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 @@ -24,7 +24,6 @@ bottom: -480px; width: 205px; background: #303539; - box-shadow: inset -3px 0 3px rgba(0, 0, 0, 0.5); } .phabricator-nav-column-background, diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -302,7 +302,6 @@ border-width: 1px 0; border-style: solid; border-color: #34373b transparent #282c2d; - background-image: url(/rsrc/image/texture/dark-menu.png); padding: 4px 0; display: block; } 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 @@ -25,43 +25,39 @@ div.phabricator-application-launch-container { display: block; float: left; - width: 78px; - height: 66px; overflow: hidden; position: relative; - border: 1px solid #1c1e22; text-decoration: none; } +.phabricator-application-launch-container.app-tl-sm { + width: 78px; + height: 60px; + border-right: 2px solid #1e2225; + border-bottom: 2px solid #1e2225; +} + a.application-tile-full { width: 100%; - height: 52px; - border-bottom: none; - border-left: none; - border-right: none; + height: 40px; + border-bottom: 1px solid #1e2225; } .device-phone div.phabricator-application-launch-container { display: none; } -a.application-tile-full.application-tile-create { - width: 88%; - height: 52px; - border-right: none; -} - .phabricator-application-launch-icon { display: block; position: absolute; left: 25px; - top: 10px; + top: 8px; width: 28px; height: 28px; } .application-tile-full .phabricator-application-launch-icon { - top: 12px; + top: 6px; left: 10px; } @@ -72,20 +68,20 @@ .phabricator-application-launch-name { display: block; - margin-top: 42px; - font-weight: bold; + margin-top: 38px; font-size: 11px; text-align: center; - color: #ffffff; - text-shadow: 0px 1px 1px #000000; + color: #f7f7f7; + text-shadow: 0px 1px 1px #000; + font-weight: bold; + -webkit-font-smoothing: antialiased; } .application-tile-full .phabricator-application-launch-name { font-size: 13px; - margin-top: 11px; + margin-top: 12px; text-align: left; - margin-left: 48px; - + margin-left: 46px; } .application-tile-full .phabricator-application-launch-description { @@ -106,39 +102,31 @@ .phabricator-application-launch-attention { position: absolute; top: 4px; - border-radius: 10px; + right: 4px; color: white; font-weight: bold; - padding: 1px 0 2px; - border: 2px solid #333; font-size: 11px; - box-shadow: 0 0px 2px #000; } .phabricator-application-attention-count { background-color: {$blue}; - border-radius: 10px; - color: white; - font-weight: bold; - padding: 1px 6px 2px; - border: 1px solid #333; - font-size: 11px; + border-radius: 2px; + padding: 1px 5px 2px; + box-shadow: 0 0 1px #000; } .phabricator-application-warning-count { - padding: 6px; + background-color: #1e2225; + border-radius: 2px; + padding: 1px 5px 2px; + box-shadow: 0 0 1px #000; } .phabricator-application-attention-count + .phabricator-application-warning-count { - margin-left: -2px; -} - -.phabricator-application-launch-attention { - right: 4px; - background-color: rgb(119, 119, 119); + margin-left: 4px; } .application-tile-full .phabricator-application-launch-attention { - top: 16px; + top: 13px; right: 8px; } diff --git a/webroot/rsrc/css/layout/phabricator-side-menu-view.css b/webroot/rsrc/css/layout/phabricator-side-menu-view.css --- a/webroot/rsrc/css/layout/phabricator-side-menu-view.css +++ b/webroot/rsrc/css/layout/phabricator-side-menu-view.css @@ -12,7 +12,7 @@ .phabricator-side-menu .phui-list-item-href { display: block; padding: 6px 8px 6px 24px; - color: #e1e2e5; + color: #f7f7f7; text-shadow: rgba(0, 0, 0, 1) 0px 1px 1px; } @@ -24,28 +24,13 @@ } .phabricator-side-menu .phui-list-item-type-label { - padding: 6px 8px 4px 12px; + padding: 4px 8px 6px 12px; color: #f7f7f7; + text-shadow: 0px 1px 1px #000; text-transform: uppercase; font-size: 11px; font-weight: bold; - border-style: solid; - background-color: #000; -} - -.phabricator-dark-menu .phui-list-item-type-button, -.phabricator-side-menu .phui-list-item-type-button { - width: 50%; - padding: 5px 8px; - display: block; - border-radius: 4px; - border: 2px solid #000; - margin: 10px auto; - color: #fff; - font-size: 14px; - text-shadow: 0px 1px 1px #000000; - font-weight: bold; - text-align: center; + background-color: #1e2225; } .phabricator-side-menu .phui-list-item-type-button:hover { diff --git a/webroot/rsrc/css/sprite-gradient.css b/webroot/rsrc/css/sprite-gradient.css --- a/webroot/rsrc/css/sprite-gradient.css +++ b/webroot/rsrc/css/sprite-gradient.css @@ -3,7 +3,7 @@ * @generated */ -.sprite-gradient, .phabricator-dark-menu .phui-list-item-type-label, .phabricator-side-menu .phui-list-item-type-label { +.sprite-gradient { background-image: url(/rsrc/image/sprite-gradient.png); background-repeat: repeat-x; }