From ea520263a64dfd737fe949d05c0937c7a25bd7d5 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Wed, 1 Jul 2015 15:17:44 -0700 Subject: [PATCH] [Redesign] Normalize menus and lists Summary: Ref T8099, An attempt to consolidate spacing, size, and border styles of various dropdown menus and list elements. Test Plan: Look at as many lists as I could find, probably worth collapsing some of the duplicates sometime. Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: epriestley, Korvin Maniphest Tasks: T8099 Differential Revision: https://secure.phabricator.com/D13517 --- resources/celerity/map.php | 24 +++++++++---------- .../css/application/base/main-menu-view.css | 13 +++++----- webroot/rsrc/css/phui/phui-action-list.css | 17 ++++--------- webroot/rsrc/css/phui/phui-button.css | 3 +-- webroot/rsrc/css/phui/phui-list.css | 12 +++++----- 5 files changed, 30 insertions(+), 39 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 514317faee..deda17722f 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '92a58b45', + 'core.pkg.css' => 'a9324064', 'core.pkg.js' => 'a590b451', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '73f1d1bc', @@ -33,7 +33,7 @@ return array( 'rsrc/css/aphront/typeahead.css' => '0e403212', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 'rsrc/css/application/auth/auth.css' => 'dc62cb0e', - 'rsrc/css/application/base/main-menu-view.css' => '09265034', + 'rsrc/css/application/base/main-menu-view.css' => '2f670a96', 'rsrc/css/application/base/notification-menu.css' => 'f31c0bde', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '077e63cb', 'rsrc/css/application/base/phui-theme.css' => '6b451f24', @@ -124,10 +124,10 @@ return array( 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1c7f338', 'rsrc/css/phui/calendar/phui-calendar-month.css' => '476be7e0', 'rsrc/css/phui/calendar/phui-calendar.css' => 'ccabe893', - 'rsrc/css/phui/phui-action-list.css' => '32c388b3', + 'rsrc/css/phui/phui-action-list.css' => 'c5eba19d', 'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5', 'rsrc/css/phui/phui-box.css' => 'a5bb366d', - 'rsrc/css/phui/phui-button.css' => 'e9ea9260', + 'rsrc/css/phui/phui-button.css' => 'fab6043f', 'rsrc/css/phui/phui-crumbs-view.css' => 'ce840ec2', 'rsrc/css/phui/phui-document.css' => '3eb3b3e3', 'rsrc/css/phui/phui-feed-story.css' => 'c7d8113a', @@ -139,7 +139,7 @@ return array( 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-info-view.css' => '5b16bac6', - 'rsrc/css/phui/phui-list.css' => '02ab3534', + 'rsrc/css/phui/phui-list.css' => '125599df', 'rsrc/css/phui/phui-object-box.css' => '3db9f358', 'rsrc/css/phui/phui-object-item-list-view.css' => '0053b016', 'rsrc/css/phui/phui-pager.css' => 'bea33d23', @@ -705,7 +705,7 @@ return array( 'paste-css' => '1898e534', 'path-typeahead' => 'f7fc67ec', 'people-profile-css' => '25970776', - 'phabricator-action-list-view-css' => '32c388b3', + 'phabricator-action-list-view-css' => 'c5eba19d', 'phabricator-application-launch-view-css' => '077e63cb', 'phabricator-busy' => '59a7976a', 'phabricator-chatlog-css' => 'd295b020', @@ -724,7 +724,7 @@ return array( 'phabricator-hovercard-view-css' => '3a8553e7', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '09265034', + 'phabricator-main-menu-view' => '2f670a96', 'phabricator-nav-view-css' => 'a24cb589', 'phabricator-notification' => 'ccf1cbf8', 'phabricator-notification-css' => '9c279160', @@ -765,7 +765,7 @@ return array( 'phriction-document-css' => 'd1861e06', 'phui-action-panel-css' => '3ee9afd5', 'phui-box-css' => 'a5bb366d', - 'phui-button-css' => 'e9ea9260', + 'phui-button-css' => 'fab6043f', 'phui-calendar-css' => 'ccabe893', 'phui-calendar-day-css' => 'd1cf6f93', 'phui-calendar-list-css' => 'c1c7f338', @@ -783,7 +783,7 @@ return array( 'phui-info-panel-css' => '27ea50a1', 'phui-info-view-css' => '5b16bac6', 'phui-inline-comment-view-css' => '9fadd6b8', - 'phui-list-view-css' => '02ab3534', + 'phui-list-view-css' => '125599df', 'phui-object-box-css' => '3db9f358', 'phui-object-item-list-view-css' => '0053b016', 'phui-pager-css' => 'bea33d23', @@ -898,9 +898,6 @@ return array( 'javelin-stratcom', 'javelin-vector', ), - '09265034' => array( - 'phui-theme-css', - ), '0a3f3021' => array( 'javelin-behavior', 'javelin-stratcom', @@ -1039,6 +1036,9 @@ return array( 'javelin-install', 'javelin-event', ), + '2f670a96' => array( + 'phui-theme-css', + ), '331b1611' => array( 'javelin-install', ), diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index 0efd458be9..b70e0b7470 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -129,7 +129,7 @@ .phabricator-main-menu-search-target { position: absolute; - top: 46px; + top: 42px; } .device-desktop .phabricator-main-menu-search-target { @@ -160,6 +160,7 @@ border-width: 1px; border-color: {$lightblueborder}; border-radius: 3px; + border-style: solid; background-color: #fff; height: 28px; padding: 3px 30px 3px 6px; @@ -277,7 +278,7 @@ button.phabricator-main-menu-search-dropdown .caret:before { word-wrap: break-word; overflow-y: auto; box-shadow: {$dropshadow}; - border: {$blueborder}; + border: 1px solid {$blueborder}; border-radius: 3px; margin-left: 40px; } @@ -559,10 +560,10 @@ button.phabricator-main-menu-search-dropdown .caret:before { .phabricator-main-menu-dropdown { position: absolute; background: #fff; - top: 38px; + top: 42px; padding: 2px; box-shadow: {$dropshadow}; - border: {$blueborder}; + border: 1px solid {$blueborder}; border-radius: 3px; } @@ -576,10 +577,10 @@ button.phabricator-main-menu-search-dropdown .caret:before { .device .phabricator-application-menu-expanded .phabricator-application-menu { display: block; position: absolute; - border: 1px solid {$lightblueborder}; + border: 1px solid {$blueborder}; border-radius: 3px; box-shadow: {$dropshadow}; - top: 38px; + top: 42px; right: 8px; width: 240px; } diff --git a/webroot/rsrc/css/phui/phui-action-list.css b/webroot/rsrc/css/phui/phui-action-list.css index 6869d3a97e..79c7897dde 100644 --- a/webroot/rsrc/css/phui/phui-action-list.css +++ b/webroot/rsrc/css/phui/phui-action-list.css @@ -2,14 +2,6 @@ * @provides phabricator-action-list-view-css */ -.device-desktop .phabricator-action-list-view { - font-size: {$smallerfontsize}; -} - -.phuix-dropdown-menu .phabricator-action-list-view { - font-size: {$normalfontsize}; -} - .device .phabricator-action-list-view { padding: 4px 0; display: none; @@ -66,11 +58,10 @@ .phabricator-action-view button.phabricator-action-view-item, .phabricator-action-view-item { - padding: 3px 4px 3px 28px; - line-height: 18px; + padding: 4px 4px 4px 28px; display: block; text-decoration: none; - color: {$darkgreytext}; + color: {$darkbluetext}; } .phabricator-action-view-label .phabricator-action-view-item { @@ -96,9 +87,9 @@ width: 14px; height: 14px; position: absolute; - top: 5px; + top: 6px; left: 9px; - font-size: 13px; + text-align: center; } .device-desktop .phabricator-action-view:hover .phabricator-action-view-item { diff --git a/webroot/rsrc/css/phui/phui-button.css b/webroot/rsrc/css/phui/phui-button.css index 3a68abb9cb..30c84c9a19 100644 --- a/webroot/rsrc/css/phui/phui-button.css +++ b/webroot/rsrc/css/phui/phui-button.css @@ -177,8 +177,7 @@ button.link:hover { margin-top: -1px; padding: 5px 0; box-shadow: {$dropshadow}; - border: 1px solid {$lightgreyborder}; - border-bottom: 1px solid {$greyborder}; + border: 1px solid {$blueborder}; border-radius: 3px; margin-bottom: 16px; } diff --git a/webroot/rsrc/css/phui/phui-list.css b/webroot/rsrc/css/phui/phui-list.css index cbb41e6ffd..01d04f8b37 100644 --- a/webroot/rsrc/css/phui/phui-list.css +++ b/webroot/rsrc/css/phui/phui-list.css @@ -37,7 +37,8 @@ width: 14px; display: inline-block; position: absolute; - top: 4px; + top: 6px; + text-align: center; } .phui-list-sidenav .phui-list-item-icon + .phui-list-item-name { @@ -66,7 +67,7 @@ } .phui-list-sidenav .phui-list-item-has-icon .phui-list-item-href { - padding: 2px 10px; + padding: 4px 10px; } .device-desktop .phui-list-sidenav .phui-list-item-href:hover { @@ -106,14 +107,13 @@ .phui-list-navbar .phui-list-item-href { color: {$bluetext}; padding: 8px 16px; - font-size: {$smallerfontsize}; - letter-spacing: 0.5px; + line-height: 16px; } .phui-list-navbar .phui-list-item-selected .phui-list-item-href { - background: {$lightgreybackground}; + background: {$lightbluebackground}; color: {$darkbluetext}; - font-weight: 500; + font-weight: bold; } .phui-list-navbar .phui-list-item-href:hover {