@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 search and core icons in top nav

Summary: Fixes T3330

Test Plan: Test desktop and mobile menus in chrome and ios.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T3330

Differential Revision: https://secure.phabricator.com/D6157

+66 -68
+45 -45
src/__celerity_resource_map__.php
··· 3158 3158 ), 3159 3159 'phabricator-main-menu-view' => 3160 3160 array( 3161 - 'uri' => '/res/0c386cc5/rsrc/css/application/base/main-menu-view.css', 3161 + 'uri' => '/res/c9685da2/rsrc/css/application/base/main-menu-view.css', 3162 3162 'type' => 'css', 3163 3163 'requires' => 3164 3164 array( ··· 4025 4025 ), array( 4026 4026 'packages' => 4027 4027 array( 4028 - 'f47c276a' => 4028 + '421eb3b7' => 4029 4029 array( 4030 4030 'name' => 'core.pkg.css', 4031 4031 'symbols' => ··· 4073 4073 40 => 'phabricator-property-list-view-css', 4074 4074 41 => 'phabricator-tag-view-css', 4075 4075 ), 4076 - 'uri' => '/res/pkg/f47c276a/core.pkg.css', 4076 + 'uri' => '/res/pkg/421eb3b7/core.pkg.css', 4077 4077 'type' => 'css', 4078 4078 ), 4079 4079 'f2ad0683' => ··· 4267 4267 'reverse' => 4268 4268 array( 4269 4269 'aphront-attached-file-view-css' => 'a7ca34a9', 4270 - 'aphront-dialog-view-css' => 'f47c276a', 4271 - 'aphront-error-view-css' => 'f47c276a', 4272 - 'aphront-form-view-css' => 'f47c276a', 4273 - 'aphront-list-filter-view-css' => 'f47c276a', 4274 - 'aphront-pager-view-css' => 'f47c276a', 4275 - 'aphront-panel-view-css' => 'f47c276a', 4276 - 'aphront-table-view-css' => 'f47c276a', 4277 - 'aphront-tokenizer-control-css' => 'f47c276a', 4278 - 'aphront-tooltip-css' => 'f47c276a', 4279 - 'aphront-typeahead-control-css' => 'f47c276a', 4270 + 'aphront-dialog-view-css' => '421eb3b7', 4271 + 'aphront-error-view-css' => '421eb3b7', 4272 + 'aphront-form-view-css' => '421eb3b7', 4273 + 'aphront-list-filter-view-css' => '421eb3b7', 4274 + 'aphront-pager-view-css' => '421eb3b7', 4275 + 'aphront-panel-view-css' => '421eb3b7', 4276 + 'aphront-table-view-css' => '421eb3b7', 4277 + 'aphront-tokenizer-control-css' => '421eb3b7', 4278 + 'aphront-tooltip-css' => '421eb3b7', 4279 + 'aphront-typeahead-control-css' => '421eb3b7', 4280 4280 'differential-changeset-view-css' => 'dd27a69b', 4281 4281 'differential-core-view-css' => 'dd27a69b', 4282 4282 'differential-inline-comment-editor' => '9488bb69', ··· 4290 4290 'differential-table-of-contents-css' => 'dd27a69b', 4291 4291 'diffusion-commit-view-css' => 'c8ce2d88', 4292 4292 'diffusion-icons-css' => 'c8ce2d88', 4293 - 'global-drag-and-drop-css' => 'f47c276a', 4293 + 'global-drag-and-drop-css' => '421eb3b7', 4294 4294 'inline-comment-summary-css' => 'dd27a69b', 4295 4295 'javelin-aphlict' => 'f2ad0683', 4296 4296 'javelin-behavior' => 'a9f14d76', ··· 4364 4364 'javelin-util' => 'a9f14d76', 4365 4365 'javelin-vector' => 'a9f14d76', 4366 4366 'javelin-workflow' => 'a9f14d76', 4367 - 'lightbox-attachment-css' => 'f47c276a', 4367 + 'lightbox-attachment-css' => '421eb3b7', 4368 4368 'maniphest-task-summary-css' => 'a7ca34a9', 4369 4369 'maniphest-transaction-detail-css' => 'a7ca34a9', 4370 - 'phabricator-action-list-view-css' => 'f47c276a', 4371 - 'phabricator-application-launch-view-css' => 'f47c276a', 4370 + 'phabricator-action-list-view-css' => '421eb3b7', 4371 + 'phabricator-application-launch-view-css' => '421eb3b7', 4372 4372 'phabricator-busy' => 'f2ad0683', 4373 4373 'phabricator-content-source-view-css' => 'dd27a69b', 4374 - 'phabricator-core-buttons-css' => 'f47c276a', 4375 - 'phabricator-core-css' => 'f47c276a', 4376 - 'phabricator-crumbs-view-css' => 'f47c276a', 4374 + 'phabricator-core-buttons-css' => '421eb3b7', 4375 + 'phabricator-core-css' => '421eb3b7', 4376 + 'phabricator-crumbs-view-css' => '421eb3b7', 4377 4377 'phabricator-drag-and-drop-file-upload' => '9488bb69', 4378 4378 'phabricator-dropdown-menu' => 'f2ad0683', 4379 4379 'phabricator-file-upload' => 'f2ad0683', 4380 - 'phabricator-filetree-view-css' => 'f47c276a', 4381 - 'phabricator-flag-css' => 'f47c276a', 4382 - 'phabricator-form-view-css' => 'f47c276a', 4383 - 'phabricator-header-view-css' => 'f47c276a', 4380 + 'phabricator-filetree-view-css' => '421eb3b7', 4381 + 'phabricator-flag-css' => '421eb3b7', 4382 + 'phabricator-form-view-css' => '421eb3b7', 4383 + 'phabricator-header-view-css' => '421eb3b7', 4384 4384 'phabricator-hovercard' => 'f2ad0683', 4385 - 'phabricator-jump-nav' => 'f47c276a', 4385 + 'phabricator-jump-nav' => '421eb3b7', 4386 4386 'phabricator-keyboard-shortcut' => 'f2ad0683', 4387 4387 'phabricator-keyboard-shortcut-manager' => 'f2ad0683', 4388 - 'phabricator-main-menu-view' => 'f47c276a', 4388 + 'phabricator-main-menu-view' => '421eb3b7', 4389 4389 'phabricator-menu-item' => 'f2ad0683', 4390 - 'phabricator-nav-view-css' => 'f47c276a', 4390 + 'phabricator-nav-view-css' => '421eb3b7', 4391 4391 'phabricator-notification' => 'f2ad0683', 4392 - 'phabricator-notification-css' => 'f47c276a', 4393 - 'phabricator-notification-menu-css' => 'f47c276a', 4394 - 'phabricator-object-item-list-view-css' => 'f47c276a', 4392 + 'phabricator-notification-css' => '421eb3b7', 4393 + 'phabricator-notification-menu-css' => '421eb3b7', 4394 + 'phabricator-object-item-list-view-css' => '421eb3b7', 4395 4395 'phabricator-object-selector-css' => 'dd27a69b', 4396 4396 'phabricator-phtize' => 'f2ad0683', 4397 4397 'phabricator-prefab' => 'f2ad0683', 4398 4398 'phabricator-project-tag-css' => 'a7ca34a9', 4399 - 'phabricator-property-list-view-css' => 'f47c276a', 4400 - 'phabricator-remarkup-css' => 'f47c276a', 4399 + 'phabricator-property-list-view-css' => '421eb3b7', 4400 + 'phabricator-remarkup-css' => '421eb3b7', 4401 4401 'phabricator-shaped-request' => '9488bb69', 4402 - 'phabricator-side-menu-view-css' => 'f47c276a', 4403 - 'phabricator-standard-page-view' => 'f47c276a', 4404 - 'phabricator-tag-view-css' => 'f47c276a', 4402 + 'phabricator-side-menu-view-css' => '421eb3b7', 4403 + 'phabricator-standard-page-view' => '421eb3b7', 4404 + 'phabricator-tag-view-css' => '421eb3b7', 4405 4405 'phabricator-textareautils' => 'f2ad0683', 4406 4406 'phabricator-tooltip' => 'f2ad0683', 4407 - 'phabricator-transaction-view-css' => 'f47c276a', 4408 - 'phabricator-zindex-css' => 'f47c276a', 4409 - 'phui-form-css' => 'f47c276a', 4410 - 'phui-icon-view-css' => 'f47c276a', 4411 - 'spacing-css' => 'f47c276a', 4412 - 'sprite-apps-large-css' => 'f47c276a', 4413 - 'sprite-gradient-css' => 'f47c276a', 4414 - 'sprite-icons-css' => 'f47c276a', 4415 - 'sprite-menu-css' => 'f47c276a', 4416 - 'syntax-highlighting-css' => 'f47c276a', 4407 + 'phabricator-transaction-view-css' => '421eb3b7', 4408 + 'phabricator-zindex-css' => '421eb3b7', 4409 + 'phui-form-css' => '421eb3b7', 4410 + 'phui-icon-view-css' => '421eb3b7', 4411 + 'spacing-css' => '421eb3b7', 4412 + 'sprite-apps-large-css' => '421eb3b7', 4413 + 'sprite-gradient-css' => '421eb3b7', 4414 + 'sprite-icons-css' => '421eb3b7', 4415 + 'sprite-menu-css' => '421eb3b7', 4416 + 'syntax-highlighting-css' => '421eb3b7', 4417 4417 ), 4418 4418 ));
+1
src/applications/diviner/application/PhabricatorApplicationDiviner.php
··· 53 53 if ($application && $application->getHelpURI()) { 54 54 $item = new PHUIListItemView(); 55 55 $item->setName(pht('%s Help', $application->getName())); 56 + $item->addClass('core-menu-item'); 56 57 $item->setIcon('help'); 57 58 $item->setHref($application->getHelpURI()); 58 59 $items[] = $item;
+1 -1
src/applications/people/application/PhabricatorApplicationPeople.php
··· 66 66 $item = new PHUIListItemView(); 67 67 $item->setName($user->getUsername()); 68 68 $item->setHref('/p/'.$user->getUsername().'/'); 69 - $item->addClass('phabricator-core-menu-item'); 69 + $item->addClass('core-menu-item'); 70 70 71 71 $classes = array( 72 72 'phabricator-core-menu-icon',
+1 -1
src/applications/settings/application/PhabricatorApplicationSettings.php
··· 42 42 $item = new PHUIListItemView(); 43 43 $item->setName(pht('Settings')); 44 44 $item->setIcon('settings'); 45 - $item->addClass('phabricator-core-menu-item'); 45 + $item->addClass('core-menu-item'); 46 46 $item->setSelected($selected); 47 47 $item->setHref('/settings/'); 48 48 $items[] = $item;
+1 -3
src/view/page/menu/PhabricatorMainMenuView.php
··· 166 166 if ($actions) { 167 167 $view->addMenuItem( 168 168 id(new PHUIListItemView()) 169 - ->addClass('phabricator-core-item-device') 170 169 ->setType(PHUIListItemView::TYPE_LABEL) 171 170 ->setName(pht('Actions'))); 172 171 foreach ($actions as $action) { ··· 185 184 if ($user->isLoggedIn()) { 186 185 $view->addMenuItem( 187 186 id(new PHUIListItemView()) 188 - ->addClass('phui-list-item-type-link') 189 - ->addClass('phabricator-core-menu-item') 187 + ->addClass('core-menu-item') 190 188 ->setName(pht('Log Out')) 191 189 ->setHref('/logout/') 192 190 ->appendChild($this->renderMenuIcon('power-light-large')));
+17 -18
webroot/rsrc/css/application/base/main-menu-view.css
··· 103 103 width: 220px; 104 104 } 105 105 106 + .device .phabricator-main-menu-search { 107 + height: 40px; 108 + } 109 + 106 110 .phabricator-main-menu-search-container { 107 111 padding: 10px 0; 108 112 position: relative; ··· 126 130 } 127 131 128 132 .device .phabricator-main-menu-search-container { 129 - padding: 0; 133 + padding: 4px 0; 130 134 } 131 135 132 136 .phabricator-main-menu .phabricator-main-menu-search input { ··· 185 189 } 186 190 187 191 .device .phabricator-main-menu-search button { 188 - top: 3px; 192 + top: 7px; 189 193 } 190 194 191 195 .phabricator-main-menu-search-target div.jx-typeahead-results { ··· 219 223 font-weight: normal; 220 224 } 221 225 226 + .device .phabricator-application-menu-expanded.phabricator-search-menu-expanded 227 + .phabricator-search-menu { 228 + padding: 0; 229 + } 230 + 222 231 223 232 /* - Alert --------------------------------------------------------------------- 224 233 ··· 291 300 border-width: 1px 0; 292 301 border-style: solid; 293 302 border-color: #34373b transparent #282c2d; 294 - background-image: url(/res/41ee673a/rsrc/image/texture/dark-menu.png); 303 + background-image: url(/rsrc/image/texture/dark-menu.png); 295 304 padding: 4px 0; 296 305 display: block; 297 306 } ··· 313 322 314 323 .device-desktop .phabricator-search-menu { 315 324 float: right; 316 - margin-right: 116px; 317 325 } 318 326 319 327 .device .phabricator-search-menu-expanded .phabricator-search-menu { ··· 333 341 } 334 342 335 343 .device-desktop .phabricator-application-menu { 336 - position: absolute; 337 - right: 0; 338 - top: 0; 339 - vertical-align: top; 344 + float: right; 340 345 } 341 346 342 - .device-desktop .phabricator-application-menu a.phui-list-item-view, 343 - .device-desktop .phabricator-application-menu .phui-list-item-name { 347 + .device-desktop .phabricator-application-menu .phui-list-item-view, 348 + .device-desktop .phabricator-application-menu .phui-list-item-name { 344 349 display: none; 345 350 } 346 351 347 - .device-desktop .phabricator-application-menu 348 - a.phui-list-item-view.phabricator-core-menu-item { 352 + .device-desktop .phabricator-application-menu .phui-list-item-view.core-menu-item { 349 353 display: block; 350 354 } 351 355 352 356 .device-desktop .phabricator-application-menu 353 - a.phui-list-item-view.phabricator-core-menu-item:hover { 357 + .core-menu-item.phui-list-item-view:hover { 354 358 background-color: #1e2225; 355 359 } 356 360 357 361 .device-desktop .phabricator-application-menu .phui-list-item-view { 358 - display: block; 359 362 float: left; 360 363 position: relative; 361 364 min-width: 40px; 362 365 height: 44px; 363 - } 364 - 365 - .device-desktop .phabricator-application-menu .phabricator-core-item-device { 366 - display: none; 367 366 } 368 367 369 368 .device-desktop .phabricator-core-menu-icon {