1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-18 19:40:55 +01:00

Remove icon nav entirely

Summary: Ref T10054. People, projects, and instances no longer use icon nav, so we can get rid of it in favor of profile menus.

Test Plan: Grepped for everything, looked through workboards/profiles again.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10054

Differential Revision: https://secure.phabricator.com/D15022
This commit is contained in:
epriestley 2016-01-14 07:17:10 -08:00
parent da5d01e542
commit f4c8cdb39a
7 changed files with 11 additions and 116 deletions

View file

@ -7,7 +7,7 @@
*/ */
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => '97da8581', 'core.pkg.css' => '2a7bdb75',
'core.pkg.js' => '1f5f365a', 'core.pkg.js' => '1f5f365a',
'darkconsole.pkg.js' => 'e7393ebb', 'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '2de124c9', 'differential.pkg.css' => '2de124c9',
@ -36,7 +36,7 @@ return array(
'rsrc/css/application/base/notification-menu.css' => 'f31c0bde', 'rsrc/css/application/base/notification-menu.css' => 'f31c0bde',
'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601',
'rsrc/css/application/base/phui-theme.css' => '6b451f24', 'rsrc/css/application/base/phui-theme.css' => '6b451f24',
'rsrc/css/application/base/standard-page-view.css' => '3c99cdf4', 'rsrc/css/application/base/standard-page-view.css' => '7b0d68d8',
'rsrc/css/application/chatlog/chatlog.css' => 'd295b020', 'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4', 'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
'rsrc/css/application/config/config-options.css' => '0ede4c9b', 'rsrc/css/application/config/config-options.css' => '0ede4c9b',
@ -112,7 +112,7 @@ return array(
'rsrc/css/font/phui-font-icon-base.css' => 'ecbbb4c2', 'rsrc/css/font/phui-font-icon-base.css' => 'ecbbb4c2',
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
'rsrc/css/layout/phabricator-hovercard-view.css' => '1239cd52', 'rsrc/css/layout/phabricator-hovercard-view.css' => '1239cd52',
'rsrc/css/layout/phabricator-side-menu-view.css' => '1ddcb82f', 'rsrc/css/layout/phabricator-side-menu-view.css' => '3a3d9f41',
'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983', 'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983',
'rsrc/css/phui/calendar/phui-calendar-day.css' => 'd1cf6f93', 'rsrc/css/phui/calendar/phui-calendar-day.css' => 'd1cf6f93',
'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1c7f338', 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1c7f338',
@ -143,7 +143,7 @@ return array(
'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f', 'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f',
'rsrc/css/phui/phui-pager.css' => 'bea33d23', 'rsrc/css/phui/phui-pager.css' => 'bea33d23',
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
'rsrc/css/phui/phui-profile-menu.css' => '213398e6', 'rsrc/css/phui/phui-profile-menu.css' => '6123de4e',
'rsrc/css/phui/phui-property-list-view.css' => '27b2849e', 'rsrc/css/phui/phui-property-list-view.css' => '27b2849e',
'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591', 'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
'rsrc/css/phui/phui-spacing.css' => '042804d6', 'rsrc/css/phui/phui-spacing.css' => '042804d6',
@ -152,7 +152,7 @@ return array(
'rsrc/css/phui/phui-text.css' => 'cf019f54', 'rsrc/css/phui/phui-text.css' => 'cf019f54',
'rsrc/css/phui/phui-timeline-view.css' => '2efceff8', 'rsrc/css/phui/phui-timeline-view.css' => '2efceff8',
'rsrc/css/phui/phui-two-column-view.css' => '39ecafb1', 'rsrc/css/phui/phui-two-column-view.css' => '39ecafb1',
'rsrc/css/phui/phui-workboard-view.css' => '24fe2a66', 'rsrc/css/phui/phui-workboard-view.css' => '95a54f74',
'rsrc/css/phui/phui-workpanel-view.css' => 'adec7699', 'rsrc/css/phui/phui-workpanel-view.css' => 'adec7699',
'rsrc/css/sprite-login.css' => '60e8560e', 'rsrc/css/sprite-login.css' => '60e8560e',
'rsrc/css/sprite-main-header.css' => 'f07bbb87', 'rsrc/css/sprite-main-header.css' => 'f07bbb87',
@ -764,10 +764,10 @@ return array(
'phabricator-remarkup-css' => 'b748dc17', 'phabricator-remarkup-css' => 'b748dc17',
'phabricator-search-results-css' => '7dea472c', 'phabricator-search-results-css' => '7dea472c',
'phabricator-shaped-request' => '7cbe244b', 'phabricator-shaped-request' => '7cbe244b',
'phabricator-side-menu-view-css' => '1ddcb82f', 'phabricator-side-menu-view-css' => '3a3d9f41',
'phabricator-slowvote-css' => 'da0afb1b', 'phabricator-slowvote-css' => 'da0afb1b',
'phabricator-source-code-view-css' => 'cbeef983', 'phabricator-source-code-view-css' => 'cbeef983',
'phabricator-standard-page-view' => '3c99cdf4', 'phabricator-standard-page-view' => '7b0d68d8',
'phabricator-textareautils' => '9e54692d', 'phabricator-textareautils' => '9e54692d',
'phabricator-title' => 'df5e11d2', 'phabricator-title' => 'df5e11d2',
'phabricator-tooltip' => '1d298e3a', 'phabricator-tooltip' => '1d298e3a',
@ -822,7 +822,7 @@ return array(
'phui-object-item-list-view-css' => '26c30d3f', 'phui-object-item-list-view-css' => '26c30d3f',
'phui-pager-css' => 'bea33d23', 'phui-pager-css' => 'bea33d23',
'phui-pinboard-view-css' => '2495140e', 'phui-pinboard-view-css' => '2495140e',
'phui-profile-menu-css' => '213398e6', 'phui-profile-menu-css' => '6123de4e',
'phui-property-list-view-css' => '27b2849e', 'phui-property-list-view-css' => '27b2849e',
'phui-remarkup-preview-css' => '1a8f2591', 'phui-remarkup-preview-css' => '1a8f2591',
'phui-spacing-css' => '042804d6', 'phui-spacing-css' => '042804d6',
@ -832,7 +832,7 @@ return array(
'phui-theme-css' => '6b451f24', 'phui-theme-css' => '6b451f24',
'phui-timeline-view-css' => '2efceff8', 'phui-timeline-view-css' => '2efceff8',
'phui-two-column-view-css' => '39ecafb1', 'phui-two-column-view-css' => '39ecafb1',
'phui-workboard-view-css' => '24fe2a66', 'phui-workboard-view-css' => '95a54f74',
'phui-workpanel-view-css' => 'adec7699', 'phui-workpanel-view-css' => 'adec7699',
'phuix-action-list-view' => 'b5c256b8', 'phuix-action-list-view' => 'b5c256b8',
'phuix-action-view' => '8cf6d262', 'phuix-action-view' => '8cf6d262',

View file

@ -27,7 +27,6 @@ final class AphrontSideNavFilterView extends AphrontView {
private $crumbs; private $crumbs;
private $classes = array(); private $classes = array();
private $menuID; private $menuID;
private $iconNav;
private $isProfileMenu; private $isProfileMenu;
private $footer = array(); private $footer = array();
@ -67,11 +66,6 @@ final class AphrontSideNavFilterView extends AphrontView {
return $this->isProfileMenu; return $this->isProfileMenu;
} }
public function setIconNav($nav) {
$this->iconNav = $nav;
return $this;
}
public function setActive($active) { public function setActive($active) {
$this->active = $active; $this->active = $active;
return $this; return $this;
@ -105,26 +99,6 @@ final class AphrontSideNavFilterView extends AphrontView {
$key, $name, $uri, PHUIListItemView::TYPE_LINK); $key, $name, $uri, PHUIListItemView::TYPE_LINK);
} }
public function addIcon($key, $name, $icon, $image = null, $uri = null) {
if (!$uri) {
$href = clone $this->baseURI;
$href->setPath(rtrim($href->getPath().$key, '/').'/');
$href = (string)$href;
} else {
$href = $uri;
}
$item = id(new PHUIListItemView())
->setKey($key)
->setRenderNameAsTooltip(true)
->setType(PHUIListItemView::TYPE_ICON_NAV)
->setIcon($icon)
->setHref($href)
->setName($name)
->setProfileImage($image);
return $this->addMenuItem($item);
}
public function addButton($key, $name, $uri = null) { public function addButton($key, $name, $uri = null) {
return $this->addThing( return $this->addThing(
$key, $name, $uri, PHUIListItemView::TYPE_BUTTON); $key, $name, $uri, PHUIListItemView::TYPE_BUTTON);
@ -228,13 +202,10 @@ final class AphrontSideNavFilterView extends AphrontView {
if ($this->getIsProfileMenu()) { if ($this->getIsProfileMenu()) {
require_celerity_resource('phui-profile-menu-css'); require_celerity_resource('phui-profile-menu-css');
// No class, we're going to put it on the shell instead. // No class, we're going to put it on the shell instead.
} else if ($this->iconNav) {
$nav_classes[] = 'phabricator-icon-nav';
} else { } else {
$nav_classes[] = 'phabricator-basic-nav'; $nav_classes[] = 'phabricator-basic-nav';
} }
$nav_id = null; $nav_id = null;
$drag_id = null; $drag_id = null;
$content_id = celerity_generate_unique_node_id(); $content_id = celerity_generate_unique_node_id();

View file

@ -9,7 +9,6 @@ final class PHUIListItemView extends AphrontTagView {
const TYPE_CUSTOM = 'type-custom'; const TYPE_CUSTOM = 'type-custom';
const TYPE_DIVIDER = 'type-divider'; const TYPE_DIVIDER = 'type-divider';
const TYPE_ICON = 'type-icon'; const TYPE_ICON = 'type-icon';
const TYPE_ICON_NAV = 'type-icon-nav';
const STATUS_WARN = 'phui-list-item-warn'; const STATUS_WARN = 'phui-list-item-warn';
const STATUS_FAIL = 'phui-list-item-fail'; const STATUS_FAIL = 'phui-list-item-fail';

View file

@ -37,10 +37,6 @@
margin-left: 221px; margin-left: 221px;
} }
.device-desktop div.phabricator-icon-nav + .phabricator-standard-page-footer {
margin-left: 58px;
}
.device .phabricator-side-menu-home + .phabricator-standard-page-footer { .device .phabricator-side-menu-home + .phabricator-standard-page-footer {
display: none; display: none;
} }

View file

@ -26,10 +26,6 @@
font-weight: bold; font-weight: bold;
} }
.phabricator-icon-nav .phabricator-side-menu .phui-list-item-selected {
background-color: rgba(0,0,0,.1);
}
.device-desktop .phabricator-basic-nav .phabricator-side-menu .device-desktop .phabricator-basic-nav .phabricator-side-menu
.phui-list-item-selected .phui-list-item-selected
a.phui-list-item-href:hover { a.phui-list-item-href:hover {
@ -55,61 +51,3 @@
text-decoration: none; text-decoration: none;
background-color: rgba(0,0,0,.07); background-color: rgba(0,0,0,.07);
} }
.device-desktop .phabricator-icon-nav a.phui-list-item-href:hover
.phui-list-item-icon {
color: {$darkbluetext};
}
.device-desktop .phabricator-icon-nav .phabricator-nav-local {
width: 40px;
margin-top: 16px;
border-color: {$lightblueborder};
border-width: 1px 1px 1px 0;
border-style: solid;
background-color: #fff;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
.device-desktop .phabricator-icon-nav .phabricator-nav-content {
margin-left: 41px;
}
.phabricator-icon-nav .phabricator-side-menu .phui-list-item-href {
height: 40px;
width: 40px;
padding: 0;
}
.phabricator-icon-nav .phabricator-side-menu .phui-list-item-icon {
font-size: 20px;
width: 40px;
line-height: 38px;
text-align: center;
vertical-align: bottom;
text-shadow: {$whitetextshadow};
color: {$blue};
}
.phabricator-icon-nav .phabricator-side-menu .phui-list-item-icon.grey {
color: {$lightgreyborder};
}
.phabricator-icon-nav .phabricator-side-menu .phui-list-item-selected {
border: none;
}
.phabricator-icon-nav .phabricator-side-menu .phui-list-item-selected
.phui-icon-view {
color: {$darkbluetext};
}
.phabricator-icon-nav .phui-icon-view.phuihead-small {
height: 24px;
width: 24px;
border: 1px solid #fff;
background-size: 24px;
display: inline-block;
margin: 7px;
}

View file

@ -4,6 +4,7 @@
.device-desktop .phui-navigation-shell.phui-profile-menu { .device-desktop .phui-navigation-shell.phui-profile-menu {
display: table; display: table;
width: 100%;
height: calc(100vh - {$menu.main.height}); height: calc(100vh - {$menu.main.height});
} }

View file

@ -38,7 +38,7 @@
} }
.device-desktop .project-board-wrapper .phui-workboard-view-shadow { .device-desktop .project-board-wrapper .phui-workboard-view-shadow {
left: 53px; left: 253px;
} }
.device-desktop .phui-workboard-view .aphront-multi-column-fixed .device-desktop .phui-workboard-view .aphront-multi-column-fixed
@ -86,13 +86,3 @@
margin: 8px 0 2px 0; margin: 8px 0 2px 0;
padding: 0; padding: 0;
} }
.device-desktop .phabricator-icon-nav.project-board-nav
.phabricator-nav-local {
margin-top: 64px;
}
.device-desktop .phabricator-icon-nav.project-board-nav
.phabricator-nav-content {
margin: 0;
}