From 2c5ee2a22556a395fa9cd0d9f7a78dac25617722 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Thu, 13 Apr 2017 11:20:51 -0700 Subject: [PATCH] Fix Durable Column CSS-Overload Summary: This moves the count on the Conpherence Menu Item into a phui-list-item-count, and removes the CSS call to the entire Conphrence stack when durable column is open. Test Plan: Test with and without the chat column, and a menu with a count Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D17677 --- resources/celerity/map.php | 16 ++++++++-------- .../PhabricatorConpherenceProfileMenuItem.php | 3 +-- .../application/conpherence/durable-column.css | 8 ++++---- .../rsrc/css/application/conpherence/menu.css | 8 +------- webroot/rsrc/css/phui/phui-list.css | 14 ++++++++++++++ 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index b0d1e64332..e9c86db2e9 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,9 +7,9 @@ */ return array( 'names' => array( - 'conpherence.pkg.css' => 'f8390290', + 'conpherence.pkg.css' => '437d3b5a', 'conpherence.pkg.js' => '281b1a73', - 'core.pkg.css' => '30a64ed6', + 'core.pkg.css' => '9139007e', 'core.pkg.js' => 'fbc1c380', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '90b30783', @@ -45,9 +45,9 @@ return array( 'rsrc/css/application/config/config-template.css' => '8f18fa41', 'rsrc/css/application/config/setup-issue.css' => 'f794cfc3', 'rsrc/css/application/config/unhandled-exception.css' => '4c96257a', - 'rsrc/css/application/conpherence/durable-column.css' => '292c71f0', + 'rsrc/css/application/conpherence/durable-column.css' => '89ea6bef', 'rsrc/css/application/conpherence/header-pane.css' => '4082233d', - 'rsrc/css/application/conpherence/menu.css' => '5abfb32d', + 'rsrc/css/application/conpherence/menu.css' => '3d8e5c9c', 'rsrc/css/application/conpherence/message-pane.css' => 'd1fc13e1', 'rsrc/css/application/conpherence/notification.css' => 'cef0a3fc', 'rsrc/css/application/conpherence/participant-pane.css' => '604a8b02', @@ -157,7 +157,7 @@ return array( 'rsrc/css/phui/phui-info-view.css' => 'ec92802a', 'rsrc/css/phui/phui-invisible-character-view.css' => '6993d9f0', 'rsrc/css/phui/phui-lightbox.css' => '0a035e40', - 'rsrc/css/phui/phui-list.css' => 'a3ec3cf1', + 'rsrc/css/phui/phui-list.css' => '12eb8ce6', 'rsrc/css/phui/phui-object-box.css' => '8b289e3d', 'rsrc/css/phui/phui-pager.css' => '77d8a794', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', @@ -552,9 +552,9 @@ return array( 'conduit-api-css' => '7bc725c4', 'config-options-css' => '0ede4c9b', 'config-page-css' => 'c1d5121b', - 'conpherence-durable-column-view' => '292c71f0', + 'conpherence-durable-column-view' => '89ea6bef', 'conpherence-header-pane-css' => '4082233d', - 'conpherence-menu-css' => '5abfb32d', + 'conpherence-menu-css' => '3d8e5c9c', 'conpherence-message-pane-css' => 'd1fc13e1', 'conpherence-notification-css' => 'cef0a3fc', 'conpherence-participant-pane-css' => '604a8b02', @@ -860,7 +860,7 @@ return array( 'phui-inline-comment-view-css' => 'be663c95', 'phui-invisible-character-view-css' => '6993d9f0', 'phui-lightbox-css' => '0a035e40', - 'phui-list-view-css' => 'a3ec3cf1', + 'phui-list-view-css' => '12eb8ce6', 'phui-object-box-css' => '8b289e3d', 'phui-oi-big-ui-css' => '19f9369b', 'phui-oi-color-css' => 'cd2b9b77', diff --git a/src/applications/search/menuitem/PhabricatorConpherenceProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorConpherenceProfileMenuItem.php index 18342cb357..cd41d41148 100644 --- a/src/applications/search/menuitem/PhabricatorConpherenceProfileMenuItem.php +++ b/src/applications/search/menuitem/PhabricatorConpherenceProfileMenuItem.php @@ -36,7 +36,6 @@ final class PhabricatorConpherenceProfileMenuItem } public function willBuildNavigationItems(array $items) { - require_celerity_resource('conpherence-menu-css'); $viewer = $this->getViewer(); $room_phids = array(); foreach ($items as $item) { @@ -115,7 +114,7 @@ final class PhabricatorConpherenceProfileMenuItem $count = phutil_tag( 'span', array( - 'class' => 'conpherence-menu-item-count', + 'class' => 'phui-list-item-count', ), $unread_count); } diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css index 2b0ab85e44..fdbdbe848f 100644 --- a/webroot/rsrc/css/application/conpherence/durable-column.css +++ b/webroot/rsrc/css/application/conpherence/durable-column.css @@ -65,7 +65,7 @@ font-size: 10px; } -.conpherence-durable-column-header .phabricator-application-menu +.device-desktop .conpherence-durable-column-header .phabricator-application-menu .phui-list-item-view { margin: 0; width: 28px; @@ -73,7 +73,7 @@ min-width: 28px; } -.conpherence-durable-column-header .phabricator-application-menu +.device-desktop .conpherence-durable-column-header .phabricator-application-menu .phui-list-item-href { background: transparent; border: none; @@ -300,7 +300,7 @@ img { .minimize-column .conpherence-durable-column .conpherence-durable-column-header .phabricator-application-menu - .phui-list-item-icon.phui-font-fa:hover { + .phui-list-item-view:hover .phui-list-item-icon.phui-font-fa { color: {$darkbluetext}; } @@ -311,6 +311,6 @@ img { } .minimize-column .conpherence-durable-column .phabricator-application-menu - .conpherence-settings-icon { + .fa-gear { display: none; } diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css index 775dfaed43..e0719cdcc8 100644 --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -167,8 +167,7 @@ } .conpherence-menu .conpherence-menu-item-view -.conpherence-menu-item-unread-count, -.conpherence-menu-item-count { +.conpherence-menu-item-unread-count { position: absolute; right: 4px; top: 10px; @@ -180,11 +179,6 @@ font-size: {$smallestfontsize}; } -.phui-list-item-view .conpherence-menu-item-count { - right: 7px; - top: 7px; -} - .conpherence-menu .hide-unread-count .conpherence-menu-item-unread-count, .conpherence-menu .conpherence-selected .conpherence-menu-item-unread-count { display: none; diff --git a/webroot/rsrc/css/phui/phui-list.css b/webroot/rsrc/css/phui/phui-list.css index eadd1987ee..e571e228d8 100644 --- a/webroot/rsrc/css/phui/phui-list.css +++ b/webroot/rsrc/css/phui/phui-list.css @@ -228,3 +228,17 @@ .phui-list-item-action-icon { opacity: 1; } + +/* - Item Counts ----------------------------------------------------------- */ + +.phui-list-item-count { + position: absolute; + right: 7px; + top: 7px; + background: {$blue}; + border-radius: 2px; + color: #fff; + font-weight: bold; + padding: 0 5px 1px; + font-size: {$smallestfontsize}; +}