@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+28 -21
+8 -8
resources/celerity/map.php
··· 7 7 */ 8 8 return array( 9 9 'names' => array( 10 - 'conpherence.pkg.css' => 'f8390290', 10 + 'conpherence.pkg.css' => '437d3b5a', 11 11 'conpherence.pkg.js' => '281b1a73', 12 - 'core.pkg.css' => '30a64ed6', 12 + 'core.pkg.css' => '9139007e', 13 13 'core.pkg.js' => 'fbc1c380', 14 14 'darkconsole.pkg.js' => 'e7393ebb', 15 15 'differential.pkg.css' => '90b30783', ··· 45 45 'rsrc/css/application/config/config-template.css' => '8f18fa41', 46 46 'rsrc/css/application/config/setup-issue.css' => 'f794cfc3', 47 47 'rsrc/css/application/config/unhandled-exception.css' => '4c96257a', 48 - 'rsrc/css/application/conpherence/durable-column.css' => '292c71f0', 48 + 'rsrc/css/application/conpherence/durable-column.css' => '89ea6bef', 49 49 'rsrc/css/application/conpherence/header-pane.css' => '4082233d', 50 - 'rsrc/css/application/conpherence/menu.css' => '5abfb32d', 50 + 'rsrc/css/application/conpherence/menu.css' => '3d8e5c9c', 51 51 'rsrc/css/application/conpherence/message-pane.css' => 'd1fc13e1', 52 52 'rsrc/css/application/conpherence/notification.css' => 'cef0a3fc', 53 53 'rsrc/css/application/conpherence/participant-pane.css' => '604a8b02', ··· 157 157 'rsrc/css/phui/phui-info-view.css' => 'ec92802a', 158 158 'rsrc/css/phui/phui-invisible-character-view.css' => '6993d9f0', 159 159 'rsrc/css/phui/phui-lightbox.css' => '0a035e40', 160 - 'rsrc/css/phui/phui-list.css' => 'a3ec3cf1', 160 + 'rsrc/css/phui/phui-list.css' => '12eb8ce6', 161 161 'rsrc/css/phui/phui-object-box.css' => '8b289e3d', 162 162 'rsrc/css/phui/phui-pager.css' => '77d8a794', 163 163 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', ··· 552 552 'conduit-api-css' => '7bc725c4', 553 553 'config-options-css' => '0ede4c9b', 554 554 'config-page-css' => 'c1d5121b', 555 - 'conpherence-durable-column-view' => '292c71f0', 555 + 'conpherence-durable-column-view' => '89ea6bef', 556 556 'conpherence-header-pane-css' => '4082233d', 557 - 'conpherence-menu-css' => '5abfb32d', 557 + 'conpherence-menu-css' => '3d8e5c9c', 558 558 'conpherence-message-pane-css' => 'd1fc13e1', 559 559 'conpherence-notification-css' => 'cef0a3fc', 560 560 'conpherence-participant-pane-css' => '604a8b02', ··· 860 860 'phui-inline-comment-view-css' => 'be663c95', 861 861 'phui-invisible-character-view-css' => '6993d9f0', 862 862 'phui-lightbox-css' => '0a035e40', 863 - 'phui-list-view-css' => 'a3ec3cf1', 863 + 'phui-list-view-css' => '12eb8ce6', 864 864 'phui-object-box-css' => '8b289e3d', 865 865 'phui-oi-big-ui-css' => '19f9369b', 866 866 'phui-oi-color-css' => 'cd2b9b77',
+1 -2
src/applications/search/menuitem/PhabricatorConpherenceProfileMenuItem.php
··· 36 36 } 37 37 38 38 public function willBuildNavigationItems(array $items) { 39 - require_celerity_resource('conpherence-menu-css'); 40 39 $viewer = $this->getViewer(); 41 40 $room_phids = array(); 42 41 foreach ($items as $item) { ··· 115 114 $count = phutil_tag( 116 115 'span', 117 116 array( 118 - 'class' => 'conpherence-menu-item-count', 117 + 'class' => 'phui-list-item-count', 119 118 ), 120 119 $unread_count); 121 120 }
+4 -4
webroot/rsrc/css/application/conpherence/durable-column.css
··· 65 65 font-size: 10px; 66 66 } 67 67 68 - .conpherence-durable-column-header .phabricator-application-menu 68 + .device-desktop .conpherence-durable-column-header .phabricator-application-menu 69 69 .phui-list-item-view { 70 70 margin: 0; 71 71 width: 28px; ··· 73 73 min-width: 28px; 74 74 } 75 75 76 - .conpherence-durable-column-header .phabricator-application-menu 76 + .device-desktop .conpherence-durable-column-header .phabricator-application-menu 77 77 .phui-list-item-href { 78 78 background: transparent; 79 79 border: none; ··· 300 300 301 301 .minimize-column .conpherence-durable-column 302 302 .conpherence-durable-column-header .phabricator-application-menu 303 - .phui-list-item-icon.phui-font-fa:hover { 303 + .phui-list-item-view:hover .phui-list-item-icon.phui-font-fa { 304 304 color: {$darkbluetext}; 305 305 } 306 306 ··· 311 311 } 312 312 313 313 .minimize-column .conpherence-durable-column .phabricator-application-menu 314 - .conpherence-settings-icon { 314 + .fa-gear { 315 315 display: none; 316 316 }
+1 -7
webroot/rsrc/css/application/conpherence/menu.css
··· 167 167 } 168 168 169 169 .conpherence-menu .conpherence-menu-item-view 170 - .conpherence-menu-item-unread-count, 171 - .conpherence-menu-item-count { 170 + .conpherence-menu-item-unread-count { 172 171 position: absolute; 173 172 right: 4px; 174 173 top: 10px; ··· 178 177 font-weight: bold; 179 178 padding: 0 5px 1px; 180 179 font-size: {$smallestfontsize}; 181 - } 182 - 183 - .phui-list-item-view .conpherence-menu-item-count { 184 - right: 7px; 185 - top: 7px; 186 180 } 187 181 188 182 .conpherence-menu .hide-unread-count .conpherence-menu-item-unread-count,
+14
webroot/rsrc/css/phui/phui-list.css
··· 228 228 .phui-list-item-action-icon { 229 229 opacity: 1; 230 230 } 231 + 232 + /* - Item Counts ----------------------------------------------------------- */ 233 + 234 + .phui-list-item-count { 235 + position: absolute; 236 + right: 7px; 237 + top: 7px; 238 + background: {$blue}; 239 + border-radius: 2px; 240 + color: #fff; 241 + font-weight: bold; 242 + padding: 0 5px 1px; 243 + font-size: {$smallestfontsize}; 244 + }