Page MenuHomePhabricator

D16346.id39309.diff
No OneTemporary

D16346.id39309.diff

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => '8b87d014',
+ 'core.pkg.css' => 'a4f65f08',
'core.pkg.js' => '13c7e56a',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '3fb7f532',
@@ -24,7 +24,7 @@
'rsrc/css/aphront/multi-column.css' => 'fd18389d',
'rsrc/css/aphront/notification.css' => '3f6c89c9',
'rsrc/css/aphront/panel-view.css' => '8427b78d',
- 'rsrc/css/aphront/phabricator-nav-view.css' => 'ac79a758',
+ 'rsrc/css/aphront/phabricator-nav-view.css' => 'a52acb7b',
'rsrc/css/aphront/table-view.css' => '832656fd',
'rsrc/css/aphront/tokenizer.css' => '056da01b',
'rsrc/css/aphront/tooltip.css' => '1a07aea8',
@@ -99,6 +99,7 @@
'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae',
+ 'rsrc/css/application/search/application-search-view.css' => '9e3f6e4d',
'rsrc/css/application/search/search-results.css' => '7dea472c',
'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230',
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
@@ -113,7 +114,6 @@
'rsrc/css/font/font-lato.css' => 'c7ccd872',
'rsrc/css/font/phui-font-icon-base.css' => '6449bce8',
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
- 'rsrc/css/layout/phabricator-side-menu-view.css' => 'dd849797',
'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983',
'rsrc/css/phui/calendar/phui-calendar-day.css' => '572b1893',
'rsrc/css/phui/calendar/phui-calendar-list.css' => 'fcc9fb41',
@@ -122,11 +122,12 @@
'rsrc/css/phui/phui-action-list.css' => 'c5eba19d',
'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
'rsrc/css/phui/phui-badge.css' => '3baef8db',
+ 'rsrc/css/phui/phui-basic-nav-view.css' => '9a0804ab',
'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
'rsrc/css/phui/phui-box.css' => '5c8387cf',
'rsrc/css/phui/phui-button.css' => '4a5fbe3d',
'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
- 'rsrc/css/phui/phui-crumbs-view.css' => 'b4fa5755',
+ 'rsrc/css/phui/phui-crumbs-view.css' => '9dac418c',
'rsrc/css/phui/phui-curtain-view.css' => '7148ae25',
'rsrc/css/phui/phui-document-pro.css' => 'a3730b94',
'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
@@ -136,7 +137,7 @@
'rsrc/css/phui/phui-form-view.css' => 'fab0a10f',
'rsrc/css/phui/phui-form.css' => 'aac1d51d',
'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
- 'rsrc/css/phui/phui-header-view.css' => '4c7dd8f5',
+ 'rsrc/css/phui/phui-header-view.css' => '06385974',
'rsrc/css/phui/phui-hovercard.css' => 'de1a2119',
'rsrc/css/phui/phui-icon-set-selector.css' => '1ab67aad',
'rsrc/css/phui/phui-icon.css' => 'd0534b71',
@@ -148,7 +149,7 @@
'rsrc/css/phui/phui-object-item-list-view.css' => '8d99e42b',
'rsrc/css/phui/phui-pager.css' => 'bea33d23',
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
- 'rsrc/css/phui/phui-profile-menu.css' => 'c8557f33',
+ 'rsrc/css/phui/phui-profile-menu.css' => '8a3fc181',
'rsrc/css/phui/phui-property-list-view.css' => '6d8e58ac',
'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
'rsrc/css/phui/phui-segment-bar-view.css' => '46342871',
@@ -541,6 +542,7 @@
'aphront-tokenizer-control-css' => '056da01b',
'aphront-tooltip-css' => '1a07aea8',
'aphront-typeahead-control-css' => 'd4f16145',
+ 'application-search-view-css' => '9e3f6e4d',
'auth-css' => '0877ed6e',
'bulk-job-css' => 'df9c1d4a',
'changeset-view-manager' => 'a2828756',
@@ -784,7 +786,7 @@
'phabricator-keyboard-shortcut' => '1ae869f2',
'phabricator-keyboard-shortcut-manager' => '4a021c10',
'phabricator-main-menu-view' => 'b623169f',
- 'phabricator-nav-view-css' => 'ac79a758',
+ 'phabricator-nav-view-css' => 'a52acb7b',
'phabricator-notification' => 'ccf1cbf8',
'phabricator-notification-css' => '3f6c89c9',
'phabricator-notification-menu-css' => 'f31c0bde',
@@ -794,7 +796,6 @@
'phabricator-remarkup-css' => '523d34bb',
'phabricator-search-results-css' => '7dea472c',
'phabricator-shaped-request' => '7cbe244b',
- 'phabricator-side-menu-view-css' => 'dd849797',
'phabricator-slowvote-css' => 'a94b7230',
'phabricator-source-code-view-css' => 'cbeef983',
'phabricator-standard-page-view' => 'e709f6d0',
@@ -824,6 +825,7 @@
'phriction-document-css' => '4282e4ad',
'phui-action-panel-css' => '91c7b835',
'phui-badge-view-css' => '3baef8db',
+ 'phui-basic-nav-view-css' => '9a0804ab',
'phui-big-info-view-css' => 'bd903741',
'phui-box-css' => '5c8387cf',
'phui-button-css' => '4a5fbe3d',
@@ -832,7 +834,7 @@
'phui-calendar-list-css' => 'fcc9fb41',
'phui-calendar-month-css' => '8e10e92c',
'phui-chart-css' => '6bf6f78e',
- 'phui-crumbs-view-css' => 'b4fa5755',
+ 'phui-crumbs-view-css' => '9dac418c',
'phui-curtain-view-css' => '7148ae25',
'phui-document-summary-view-css' => '9ca48bdf',
'phui-document-view-css' => '715aedfb',
@@ -843,7 +845,7 @@
'phui-form-css' => 'aac1d51d',
'phui-form-view-css' => 'fab0a10f',
'phui-head-thing-view-css' => 'fd311e5f',
- 'phui-header-view-css' => '4c7dd8f5',
+ 'phui-header-view-css' => '06385974',
'phui-hovercard' => '1bd28176',
'phui-hovercard-view-css' => 'de1a2119',
'phui-icon-set-selector-css' => '1ab67aad',
@@ -857,7 +859,7 @@
'phui-object-item-list-view-css' => '8d99e42b',
'phui-pager-css' => 'bea33d23',
'phui-pinboard-view-css' => '2495140e',
- 'phui-profile-menu-css' => 'c8557f33',
+ 'phui-profile-menu-css' => '8a3fc181',
'phui-property-list-view-css' => '6d8e58ac',
'phui-remarkup-preview-css' => '1a8f2591',
'phui-segment-bar-view-css' => '46342871',
@@ -2252,7 +2254,7 @@
'phui-header-view-css',
'phabricator-filetree-view-css',
'phabricator-nav-view-css',
- 'phabricator-side-menu-view-css',
+ 'phui-basic-nav-view-css',
'phui-crumbs-view-css',
'phui-object-item-list-view-css',
'global-drag-and-drop-css',
diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php
--- a/resources/celerity/packages.php
+++ b/resources/celerity/packages.php
@@ -113,7 +113,7 @@
'phui-header-view-css',
'phabricator-filetree-view-css',
'phabricator-nav-view-css',
- 'phabricator-side-menu-view-css',
+ 'phui-basic-nav-view-css',
'phui-crumbs-view-css',
'phui-object-item-list-view-css',
'global-drag-and-drop-css',
diff --git a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
--- a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
+++ b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
@@ -194,6 +194,7 @@
// Background color for "most" themes.
'page.background' => '#f8f8fb',
+ 'page.sidenav' => '#f0f0f2',
'menu.profile.text' => 'rgba(255,255,255,.8)',
'menu.profile.text.selected' => 'rgba(255,255,255,1)',
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -193,10 +193,12 @@
}
$header = id(new PHUIHeaderView())
- ->setHeader($title);
+ ->setHeader($title)
+ ->setProfileHeader(true);
$box = id(new PHUIObjectBoxView())
- ->setHeader($header);
+ ->setHeader($header)
+ ->addClass('application-search-results');
if ($run_query || $named_query) {
$box->setShowHide(
@@ -308,7 +310,8 @@
}
$crumbs = $parent
- ->buildApplicationCrumbs();
+ ->buildApplicationCrumbs()
+ ->setBorder(true);
if ($more_crumbs) {
$query_uri = $engine->getQueryResultsPageURI($saved_query->getQueryKey());
@@ -321,12 +324,15 @@
$crumbs->addTextCrumb($title);
}
+ require_celerity_resource('application-search-view-css');
+
return $this->newPage()
->setApplicationMenu($this->buildApplicationMenu())
->setTitle(pht('Query: %s', $title))
->setCrumbs($crumbs)
->setNavigation($nav)
- ->appendChild($body);
+ ->appendChild($body)
+ ->addClass('application-search-view');
}
private function processEditRequest() {
@@ -403,19 +409,28 @@
$crumbs = $parent
->buildApplicationCrumbs()
- ->addTextCrumb(pht('Saved Queries'), $engine->getQueryManagementURI());
+ ->addTextCrumb(pht('Saved Queries'), $engine->getQueryManagementURI())
+ ->setBorder(true);
$nav->selectFilter('query/edit');
+ $header = id(new PHUIHeaderView())
+ ->setHeader(pht('Saved Queries'))
+ ->setProfileHeader(true);
+
$box = id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Saved Queries'))
- ->setObjectList($list);
+ ->setHeader($header)
+ ->setObjectList($list)
+ ->addClass('application-search-results');
+
+ require_celerity_resource('application-search-view-css');
return $this->newPage()
->setApplicationMenu($this->buildApplicationMenu())
->setTitle(pht('Saved Queries'))
->setCrumbs($crumbs)
->setNavigation($nav)
+ ->addClass('application-search-view')
->appendChild($box);
}
diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
--- a/src/view/layout/AphrontSideNavFilterView.php
+++ b/src/view/layout/AphrontSideNavFilterView.php
@@ -193,24 +193,18 @@
}
}
- require_celerity_resource('phabricator-side-menu-view-css');
+ require_celerity_resource('phui-basic-nav-view-css');
return $this->renderFlexNav();
}
private function renderFlexNav() {
require_celerity_resource('phabricator-nav-view-css');
+ require_celerity_resource('phui-profile-menu-css');
$nav_classes = array();
$nav_classes[] = 'phabricator-nav';
- if ($this->getIsProfileMenu()) {
- require_celerity_resource('phui-profile-menu-css');
- // No class, we're going to put it on the shell instead.
- } else {
- $nav_classes[] = 'phabricator-basic-nav';
- }
-
$nav_id = null;
$drag_id = null;
$content_id = celerity_generate_unique_node_id();
@@ -284,16 +278,6 @@
$nav_classes = array_merge($nav_classes, $this->classes);
- $footer = $this->footer;
-
- if ($this->getIsProfileMenu()) {
- $internal_footer = $footer;
- $external_footer = null;
- } else {
- $internal_footer = null;
- $external_footer = $footer;
- }
-
$menu = phutil_tag(
'div',
array(
@@ -312,26 +296,28 @@
array(
$crumbs,
$this->renderChildren(),
- $internal_footer,
+ $this->footer,
)),
));
+ $classes = array();
+ $classes[] = 'phui-navigation-shell';
+
if ($this->getIsProfileMenu()) {
- $shell = phutil_tag(
- 'div',
- array(
- 'class' => 'phui-navigation-shell phui-profile-menu',
- ),
- array(
- $menu,
- ));
+ $classes[] = 'phui-profile-menu';
} else {
- $shell = array(
- $menu,
- $external_footer,
- );
+ $classes[] = 'phui-basic-nav';
}
+ $shell = phutil_tag(
+ 'div',
+ array(
+ 'class' => implode(' ', $classes),
+ ),
+ array(
+ $menu,
+ ));
+
return $shell;
}
diff --git a/webroot/rsrc/css/aphront/phabricator-nav-view.css b/webroot/rsrc/css/aphront/phabricator-nav-view.css
--- a/webroot/rsrc/css/aphront/phabricator-nav-view.css
+++ b/webroot/rsrc/css/aphront/phabricator-nav-view.css
@@ -20,23 +20,13 @@
display: block;
}
-.device-desktop .phabricator-side-menu-home .phabricator-nav-content,
-.device-tablet .phabricator-side-menu-home .phabricator-nav-content {
- margin-left: 205px;
-}
-
-.phabricator-nav-local {
- width: 205px;
- position: absolute;
- left: 0;
- white-space: nowrap;
- overflow-x: hidden;
- overflow-y: auto;
- margin-top: 8px;
-}
-
-.phabricator-side-menu-home .phabricator-nav-local {
- margin-top: 16px;
+/* Home Sidenav */
+.phui-basic-nav.phui-navigation-shell
+ .phabricator-side-menu-home .phabricator-nav-local {
+ padding-top: 16px;
+ padding-right: 0;
+ background-color: transparent;
+ width: 205px;
}
.phabricator-nav-drag {
@@ -69,7 +59,7 @@
}
.device-desktop .has-local-nav .phabricator-nav-content {
- margin-left: 205px;
+
}
.device-phone .phabricator-side-menu-home .phabricator-nav-content {
diff --git a/webroot/rsrc/css/application/search/application-search-view.css b/webroot/rsrc/css/application/search/application-search-view.css
new file mode 100644
--- /dev/null
+++ b/webroot/rsrc/css/application/search/application-search-view.css
@@ -0,0 +1,26 @@
+/**
+ * @provides application-search-view-css
+ */
+
+.application-search-view {
+ background-color: #fff;
+}
+
+.application-search-view .application-search-results.phui-object-box {
+ margin: 0;
+ padding: 0 16px 24px;
+}
+
+.application-search-view .application-search-results .phui-profile-header {
+ padding: 16px 8px;
+ border-bottom: 1px solid {$thinblueborder};
+}
+
+.application-search-results
+ .phui-profile-header.phui-header-shell .phui-header-header {
+ font-size: 20px;
+}
+
+.application-search-view .phui-box-border {
+ border: none;
+}
diff --git a/webroot/rsrc/css/layout/phabricator-side-menu-view.css b/webroot/rsrc/css/layout/phabricator-side-menu-view.css
deleted file mode 100644
--- a/webroot/rsrc/css/layout/phabricator-side-menu-view.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @provides phabricator-side-menu-view-css
- */
-
-.phabricator-basic-nav .phabricator-side-menu .phui-list-item-view {
- display: block;
- white-space: nowrap;
- text-decoration: none;
- font-size: 13px;
- -webkit-font-smoothing: antialiased;
-}
-
-.phabricator-basic-nav .phabricator-side-menu .phui-list-item-href {
- display: block;
- padding: 6px 8px 6px 24px;
- color: {$darkbluetext};
- border-top-right-radius: 3px;
- border-bottom-right-radius: 3px;
-}
-
-.phabricator-basic-nav .phabricator-side-menu .phui-list-item-icon {
- margin-left: -12px;
- text-align: center;
- width: 24px;
-}
-
-.phabricator-basic-nav .phabricator-side-menu .phui-list-item-selected {
- background-color: rgba({$alphablack},.05);
- border-left: 4px solid {$sky};
- border-top-right-radius: 3px;
- border-bottom-right-radius: 3px;
- font-weight: bold;
-}
-
-.device-desktop .phabricator-basic-nav .phabricator-side-menu
- .phui-list-item-selected
- a.phui-list-item-href:hover {
- background-color: rgba({$alphablack},.05);
-}
-
-.phabricator-basic-nav .phabricator-side-menu .phui-list-item-selected
- .phui-list-item-href {
- padding-left: 20px;
-}
-
-.phabricator-basic-nav .phabricator-side-menu .phui-list-item-type-label {
- padding: 6px 8px 4px 12px;
- color: {$darkbluetext};
- text-transform: uppercase;
- font-size: 12px;
- font-weight: bold;
- border-style: solid;
-}
-
-.device-desktop .phabricator-basic-nav .phabricator-side-menu
- a.phui-list-item-href:hover {
- text-decoration: none;
- background-color: rgba({$alphablack},.07);
-}
diff --git a/webroot/rsrc/css/phui/phui-basic-nav-view.css b/webroot/rsrc/css/phui/phui-basic-nav-view.css
new file mode 100644
--- /dev/null
+++ b/webroot/rsrc/css/phui/phui-basic-nav-view.css
@@ -0,0 +1,105 @@
+/**
+ * @provides phui-basic-nav-view-css
+ */
+
+.device-desktop .phui-navigation-shell {
+ display: table;
+ width: 100%;
+ height: calc(100vh - {$menu.main.height});
+}
+
+.device-desktop .phui-navigation-shell .phabricator-nav {
+ display: table-row;
+}
+
+.device-desktop .phui-navigation-shell .phabricator-nav-local {
+ display: table-cell;
+ position: relative;
+ vertical-align: top;
+ width: {$menu.profile.width};
+ max-width: {$menu.profile.width};
+ margin-top: 0;
+ overflow: hidden;
+}
+
+.phui-basic-nav.phui-navigation-shell .phabricator-nav-local {
+ width: 205px;
+ padding-top: 4px;
+ padding-right: 8px;
+}
+
+.phui-basic-nav .phabricator-side-menu {
+ background-color: {$page.sidenav};
+}
+
+.phui-two-column-view .phui-basic-nav.phui-navigation-shell
+ .phabricator-nav-local {
+ width: {$menu.profile.width};
+ max-width: {$menu.profile.width};
+ padding-right: 0;
+ padding-top: 0;
+}
+
+.phui-two-column-view .phui-basic-nav .phabricator-side-menu {
+ background-color: #fff;
+}
+
+.phui-basic-nav .phabricator-side-menu {
+ background-color: {$page.sidenav};
+}
+
+.phui-basic-nav .phabricator-side-menu .phui-list-item-view {
+ display: block;
+ white-space: nowrap;
+ text-decoration: none;
+ font-size: 13px;
+ -webkit-font-smoothing: antialiased;
+}
+
+.phui-basic-nav .phabricator-side-menu .phui-list-item-href {
+ display: block;
+ padding: 6px 8px 6px 24px;
+ color: {$darkbluetext};
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+}
+
+.phui-basic-nav .phabricator-side-menu .phui-list-item-icon {
+ margin-left: -12px;
+ text-align: center;
+ width: 24px;
+}
+
+.phui-basic-nav .phabricator-side-menu .phui-list-item-selected {
+ background-color: rgba({$alphablack},.05);
+ border-left: 4px solid {$sky};
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+ font-weight: bold;
+}
+
+.device-desktop .phui-basic-nav .phabricator-side-menu
+ .phui-list-item-selected
+ a.phui-list-item-href:hover {
+ background-color: rgba({$alphablack},.05);
+}
+
+.phui-basic-nav .phabricator-side-menu .phui-list-item-selected
+ .phui-list-item-href {
+ padding-left: 20px;
+}
+
+.phui-basic-nav .phabricator-side-menu .phui-list-item-type-label {
+ padding: 6px 8px 4px 12px;
+ color: {$darkbluetext};
+ text-transform: uppercase;
+ font-size: 12px;
+ font-weight: bold;
+ border-style: solid;
+}
+
+.device-desktop .phui-basic-nav .phabricator-side-menu
+ a.phui-list-item-href:hover {
+ text-decoration: none;
+ background-color: rgba({$alphablack},.07);
+}
diff --git a/webroot/rsrc/css/phui/phui-crumbs-view.css b/webroot/rsrc/css/phui/phui-crumbs-view.css
--- a/webroot/rsrc/css/phui/phui-crumbs-view.css
+++ b/webroot/rsrc/css/phui/phui-crumbs-view.css
@@ -5,11 +5,12 @@
.phui-crumbs-view {
overflow: hidden;
vertical-align: top;
- padding: 0 20px 0 28px;
+ padding: 0 12px 0 20px;
/* TODO: Position this over the slider for Differential's file tree view.
Remove this once that gets sorted out. */
position: relative;
-webkit-font-smoothing: antialiased;
+ background-color: {$page.background};
}
.phui-crumbs-view,
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -323,6 +323,7 @@
.phui-profile-header.phui-header-shell .phui-header-header {
font-family: 'Aleo', {$fontfamily};
font-size: 24px;
+ color: #000;
}
.phui-profile-header .phui-header-col3 {
diff --git a/webroot/rsrc/css/phui/phui-profile-menu.css b/webroot/rsrc/css/phui/phui-profile-menu.css
--- a/webroot/rsrc/css/phui/phui-profile-menu.css
+++ b/webroot/rsrc/css/phui/phui-profile-menu.css
@@ -2,26 +2,6 @@
* @provides phui-profile-menu-css
*/
-.device-desktop .phui-navigation-shell.phui-profile-menu {
- display: table;
- width: 100%;
- height: calc(100vh - {$menu.main.height});
-}
-
-.device-desktop .phui-profile-menu .phabricator-nav {
- display: table-row;
-}
-
-.device-desktop .phui-profile-menu .phabricator-nav-local {
- display: table-cell;
- position: relative;
- vertical-align: top;
- width: {$menu.profile.width};
- max-width: {$menu.profile.width};
- margin-top: 0;
- overflow: hidden;
-}
-
.device-desktop .phui-profile-menu-collapsed .phabricator-nav-local {
width: {$menu.profile.width.collapsed};
max-width: {$menu.profile.width.collapsed};
@@ -32,9 +12,12 @@
margin-left: 0;
}
+.phui-profile-menu .phui-basic-nav {
+ width: 205px;
+}
+
.phui-profile-menu .phabricator-side-menu {
background: #525867;
- box-shadow: inset -2px 0 2px rgba({$alphablack}, 0.150);
width: 240px;
}

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 5, 11:13 PM (1 w, 38 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6711576
Default Alt Text
D16346.id39309.diff (20 KB)

Event Timeline