Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13989764
D12762.id30672.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
17 KB
Referenced Files
None
Subscribers
None
D12762.id30672.diff
View Options
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' => '784344e7',
+ 'core.pkg.css' => 'f43f9731',
'core.pkg.js' => '60924527',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => 'bb338e4b',
@@ -20,12 +20,12 @@
'rsrc/css/aphront/dark-console.css' => '6378ef3d',
'rsrc/css/aphront/dialog-view.css' => '9b32db0a',
'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d',
- 'rsrc/css/aphront/list-filter-view.css' => 'b2161041',
+ 'rsrc/css/aphront/list-filter-view.css' => '1fb5cab3',
'rsrc/css/aphront/multi-column.css' => 'fd18389d',
'rsrc/css/aphront/notification.css' => '9c279160',
'rsrc/css/aphront/pager-view.css' => '2e3539af',
'rsrc/css/aphront/panel-view.css' => '8427b78d',
- 'rsrc/css/aphront/phabricator-nav-view.css' => '3e02e410',
+ 'rsrc/css/aphront/phabricator-nav-view.css' => '949b43d9',
'rsrc/css/aphront/table-view.css' => '59e2c0f8',
'rsrc/css/aphront/tokenizer.css' => '86a13f7f',
'rsrc/css/aphront/tooltip.css' => '7672b60f',
@@ -36,7 +36,7 @@
'rsrc/css/application/auth/auth.css' => '1e655982',
'rsrc/css/application/base/main-menu-view.css' => '1766b04d',
'rsrc/css/application/base/notification-menu.css' => '3c9d8aa1',
- 'rsrc/css/application/base/phabricator-application-launch-view.css' => '3fa70b5a',
+ 'rsrc/css/application/base/phabricator-application-launch-view.css' => '132f9d14',
'rsrc/css/application/base/standard-page-view.css' => 'dc14c671',
'rsrc/css/application/chatlog/chatlog.css' => '852140ff',
'rsrc/css/application/config/config-options.css' => '7fedf08b',
@@ -45,8 +45,8 @@
'rsrc/css/application/config/setup-issue.css' => '22270af2',
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
'rsrc/css/application/conpherence/durable-column.css' => '2e68a92f',
- 'rsrc/css/application/conpherence/menu.css' => 'f389e048',
- 'rsrc/css/application/conpherence/message-pane.css' => '3150e2a2',
+ 'rsrc/css/application/conpherence/menu.css' => 'f9f1d143',
+ 'rsrc/css/application/conpherence/message-pane.css' => '73631823',
'rsrc/css/application/conpherence/notification.css' => 'd208f806',
'rsrc/css/application/conpherence/transaction.css' => '25138b7f',
'rsrc/css/application/conpherence/update.css' => '1099a660',
@@ -109,14 +109,14 @@
'rsrc/css/core/core.css' => 'cee2aadb',
'rsrc/css/core/remarkup.css' => '0037bdbf',
'rsrc/css/core/syntax.css' => '6b7b24d9',
- 'rsrc/css/core/z-index.css' => '3b612549',
+ 'rsrc/css/core/z-index.css' => 'ef044fae',
'rsrc/css/diviner/diviner-shared.css' => '38813222',
'rsrc/css/font/font-awesome.css' => 'e2e712fe',
'rsrc/css/font/font-source-sans-pro.css' => '8906c07b',
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
'rsrc/css/layout/phabricator-hovercard-view.css' => '44394670',
- 'rsrc/css/layout/phabricator-side-menu-view.css' => 'c1db9e9c',
+ 'rsrc/css/layout/phabricator-side-menu-view.css' => 'a440478a',
'rsrc/css/layout/phabricator-source-code-view.css' => '2ceee894',
'rsrc/css/phui/calendar/phui-calendar-day.css' => '75b8cc4a',
'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59',
@@ -127,19 +127,19 @@
'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5',
'rsrc/css/phui/phui-box.css' => 'a5bb366d',
'rsrc/css/phui/phui-button.css' => 'de610129',
- 'rsrc/css/phui/phui-crumbs-view.css' => '594d719e',
+ 'rsrc/css/phui/phui-crumbs-view.css' => 'aeff7a21',
'rsrc/css/phui/phui-document.css' => '94d5dcd8',
'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5',
'rsrc/css/phui/phui-fontkit.css' => 'dd8ddf27',
'rsrc/css/phui/phui-form-view.css' => '17eace76',
'rsrc/css/phui/phui-form.css' => 'f535f938',
- 'rsrc/css/phui/phui-header-view.css' => '31868fb6',
+ 'rsrc/css/phui/phui-header-view.css' => '2cb22ba2',
'rsrc/css/phui/phui-icon.css' => 'bc766998',
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
'rsrc/css/phui/phui-info-view.css' => 'c6f0aef8',
'rsrc/css/phui/phui-list.css' => '2e25ebfb',
- 'rsrc/css/phui/phui-object-box.css' => '2d3b3b42',
+ 'rsrc/css/phui/phui-object-box.css' => 'ab4f0f61',
'rsrc/css/phui/phui-object-item-list-view.css' => 'bfe590d4',
'rsrc/css/phui/phui-pinboard-view.css' => 'eaab2b1b',
'rsrc/css/phui/phui-property-list-view.css' => 'da85c07d',
@@ -495,7 +495,7 @@
'aphront-bars' => '231ac33c',
'aphront-dark-console-css' => '6378ef3d',
'aphront-dialog-view-css' => '9b32db0a',
- 'aphront-list-filter-view-css' => 'b2161041',
+ 'aphront-list-filter-view-css' => '1fb5cab3',
'aphront-multi-column-view-css' => 'fd18389d',
'aphront-pager-view-css' => '2e3539af',
'aphront-panel-view-css' => '8427b78d',
@@ -509,8 +509,8 @@
'config-options-css' => '7fedf08b',
'config-welcome-css' => '6abd79be',
'conpherence-durable-column-view' => '2e68a92f',
- 'conpherence-menu-css' => 'f389e048',
- 'conpherence-message-pane-css' => '3150e2a2',
+ 'conpherence-menu-css' => 'f9f1d143',
+ 'conpherence-message-pane-css' => '73631823',
'conpherence-notification-css' => 'd208f806',
'conpherence-thread-manager' => '6709c934',
'conpherence-transaction-css' => '25138b7f',
@@ -708,7 +708,7 @@
'path-typeahead' => 'f7fc67ec',
'people-profile-css' => '25970776',
'phabricator-action-list-view-css' => '4f4d09f2',
- 'phabricator-application-launch-view-css' => '3fa70b5a',
+ 'phabricator-application-launch-view-css' => '132f9d14',
'phabricator-busy' => '59a7976a',
'phabricator-chatlog-css' => '852140ff',
'phabricator-content-source-view-css' => '4b8b05d4',
@@ -727,7 +727,7 @@
'phabricator-keyboard-shortcut' => '1ae869f2',
'phabricator-keyboard-shortcut-manager' => 'c1700f6f',
'phabricator-main-menu-view' => '1766b04d',
- 'phabricator-nav-view-css' => '3e02e410',
+ 'phabricator-nav-view-css' => '949b43d9',
'phabricator-notification' => '0c6946e7',
'phabricator-notification-css' => '9c279160',
'phabricator-notification-menu-css' => '3c9d8aa1',
@@ -738,7 +738,7 @@
'phabricator-remarkup-css' => '0037bdbf',
'phabricator-search-results-css' => '15c71110',
'phabricator-shaped-request' => '7cbe244b',
- 'phabricator-side-menu-view-css' => 'c1db9e9c',
+ 'phabricator-side-menu-view-css' => 'a440478a',
'phabricator-slowvote-css' => '266df6a1',
'phabricator-source-code-view-css' => '2ceee894',
'phabricator-standard-page-view' => 'dc14c671',
@@ -756,7 +756,7 @@
'phabricator-uiexample-reactor-select' => 'a155550f',
'phabricator-uiexample-reactor-sendclass' => '1def2711',
'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
- 'phabricator-zindex-css' => '3b612549',
+ 'phabricator-zindex-css' => 'ef044fae',
'phame-css' => '88bd4705',
'pholio-css' => '95174bdd',
'pholio-edit-css' => '3ad9d1ee',
@@ -774,21 +774,21 @@
'phui-calendar-day-css' => '75b8cc4a',
'phui-calendar-list-css' => 'c1d0ca59',
'phui-calendar-month-css' => 'a92e47d2',
- 'phui-crumbs-view-css' => '594d719e',
+ 'phui-crumbs-view-css' => 'aeff7a21',
'phui-document-view-css' => '94d5dcd8',
'phui-feed-story-css' => 'c9f3a0b5',
'phui-font-icon-base-css' => '3dad2ae3',
'phui-fontkit-css' => 'dd8ddf27',
'phui-form-css' => 'f535f938',
'phui-form-view-css' => '17eace76',
- 'phui-header-view-css' => '31868fb6',
+ 'phui-header-view-css' => '2cb22ba2',
'phui-icon-view-css' => 'bc766998',
'phui-image-mask-css' => '5a8b09c8',
'phui-info-panel-css' => '27ea50a1',
'phui-info-view-css' => 'c6f0aef8',
'phui-inline-comment-view-css' => '2174771a',
'phui-list-view-css' => '2e25ebfb',
- 'phui-object-box-css' => '2d3b3b42',
+ 'phui-object-box-css' => 'ab4f0f61',
'phui-object-item-list-view-css' => 'bfe590d4',
'phui-pinboard-view-css' => 'eaab2b1b',
'phui-property-list-view-css' => 'da85c07d',
diff --git a/src/applications/conpherence/view/ConpherenceLayoutView.php b/src/applications/conpherence/view/ConpherenceLayoutView.php
--- a/src/applications/conpherence/view/ConpherenceLayoutView.php
+++ b/src/applications/conpherence/view/ConpherenceLayoutView.php
@@ -108,13 +108,6 @@
javelin_tag(
'div',
array(
- 'class' => 'phabricator-nav-column-background',
- 'sigil' => 'phabricator-nav-column-background',
- ),
- ''),
- javelin_tag(
- 'div',
- array(
'id' => 'conpherence-menu-pane',
'class' => 'conpherence-menu-pane phabricator-side-menu',
'sigil' => 'conpherence-menu-pane',
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
@@ -253,24 +253,14 @@
$nav_classes[] = 'has-local-nav';
}
- $menu_background = phutil_tag(
- 'div',
- array(
- 'class' => 'phabricator-nav-column-background',
- 'id' => $background_id,
- ),
- '');
-
- $local_menu = array(
- $menu_background,
+ $local_menu =
phutil_tag(
'div',
array(
'class' => 'phabricator-nav-local phabricator-side-menu',
'id' => $local_id,
),
- $this->menu->setID($this->getMenuID())),
- );
+ $this->menu->setID($this->getMenuID()));
}
$crumbs = null;
diff --git a/webroot/rsrc/css/aphront/list-filter-view.css b/webroot/rsrc/css/aphront/list-filter-view.css
--- a/webroot/rsrc/css/aphront/list-filter-view.css
+++ b/webroot/rsrc/css/aphront/list-filter-view.css
@@ -3,14 +3,13 @@
*/
.aphront-list-filter-wrap {
- border-left: 1px solid {$lightblueborder};
- border-right: 1px solid {$lightblueborder};
- border-bottom: 1px solid {$blueborder};
+ border: 1px solid {$lightblueborder};
margin: 0 16px;
+ background: #fff;
+ border-radius: 3px;
}
.aphront-list-filter-view {
- background: #fff;
padding: 0;
}
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
@@ -6,40 +6,16 @@
cursor: col-resize;
}
-.phabricator-nav {
- /* Force top margins in page content not to collapse with the top margin of
- the navigation container by giving it padding. Then put it in the right
- position by undoing the padding with a margin. */
- padding-top: 1px;
- margin-top: -1px;
-}
-
-.phabricator-nav-column-background {
- position: fixed;
- top: 0;
- left: 0;
- /* On the iPhone, scrolling down causes the revealed area to fill with white,
- then draw with the texture after the action completes. Just make the
- element extend off the bottom of the screen to prevent this. */
- bottom: -480px;
- width: 204px;
- background: #fff;
- border-right: 1px solid {$hovergrey};
-}
-
-.phabricator-nav-column-background,
.phabricator-nav-local,
.phabricator-nav-drag {
display: none;
}
-.device-desktop .has-local-nav .phabricator-nav-column-background,
.device-desktop .has-local-nav .phabricator-nav-local,
.device-desktop .has-local-nav .phabricator-nav-drag {
display: block;
}
-.device .phabricator-side-menu-home .phabricator-nav-column-background,
.device .phabricator-side-menu-home .phabricator-nav-local {
display: block;
}
@@ -91,7 +67,6 @@
display: none;
}
-.device-phone .phabricator-side-menu-home .phabricator-nav-column-background,
.device-phone .phabricator-side-menu-home .phabricator-nav-local {
width: 100%;
}
diff --git a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css
--- a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css
+++ b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css
@@ -30,7 +30,8 @@
text-decoration: none;
width: 100%;
height: 44px;
- border-bottom: 1px solid {$thinblueborder};
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
}
.device-phone div.phabricator-application-launch-container {
@@ -46,7 +47,6 @@
font-size: 20px;
text-align: center;
vertical-align: bottom;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
color: {$darkbluetext};
}
@@ -61,14 +61,17 @@
color: {$darkbluetext};
font-size: 13px;
margin: 6px 0 2px 38px;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
+}
+
+.device-desktop a.phabricator-application-launch-container:hover
+ .phui-icon-view {
+ color: {$sky};
}
.phabricator-application-launch-description {
- color: {$darkbluetext};
+ color: {$bluetext};
font-size: 11px;
margin-left: 38px;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
text-overflow: ellipsis;
width: 150px;
overflow: hidden;
@@ -83,7 +86,6 @@
color: {$darkbluetext};
font-weight: bold;
font-size: 12px;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
}
.phabricator-application-attention-count {
diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css
--- a/webroot/rsrc/css/application/conpherence/menu.css
+++ b/webroot/rsrc/css/application/conpherence/menu.css
@@ -43,8 +43,8 @@
overflow-y: auto;
top: 0;
bottom: 0;
- background: #dbdde0;
- border-right: 1px solid {$hovergrey}
+ background: #f7f7f7;
+ border-right: 1px solid {$lightblueborder}
}
.conpherence-menu-pane .phui-list-item-view.hidden {
@@ -88,16 +88,7 @@
-webkit-overflow-scrolling: touch;
}
-.conpherence-layout .phabricator-nav-column-background {
- display: block;
-}
-
-.device .phabricator-nav-column-background {
- top: 44px;
-}
-
-.device .conpherence-role-thread .conpherence-menu-pane,
-.device .conpherence-role-thread .phabricator-nav-column-background {
+.device .conpherence-role-thread .conpherence-menu-pane {
display: none;
}
@@ -126,7 +117,7 @@
}
.conpherence-menu .conpherence-selected {
- background: {$hovergrey};
+ background: rgba(0,0,0,0.05);
border-left: 3px solid {$sky};
}
@@ -136,7 +127,7 @@
.device-desktop .conpherence-menu
.conpherence-selected.conpherence-menu-item-view:hover {
- background-color: {$hoverselectedgrey};
+ background-color: rgba(0,0,0,0.05);
}
.conpherence-menu .loading {
@@ -144,7 +135,7 @@
}
.device-desktop .conpherence-menu .conpherence-menu-item-view:hover {
- background-color: {$hovergrey};
+ background-color: rgba(0,0,0,0.05);
}
.conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-image {
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -34,7 +34,7 @@
.conpherence-layout .phui-crumbs-view {
padding: 0 0 0 8px;
- background: #EBECEE;
+ background: #f7f7f7;
}
.conpherence-show-more-messages {
diff --git a/webroot/rsrc/css/core/z-index.css b/webroot/rsrc/css/core/z-index.css
--- a/webroot/rsrc/css/core/z-index.css
+++ b/webroot/rsrc/css/core/z-index.css
@@ -2,10 +2,6 @@
* @provides phabricator-zindex-css
*/
-.phabricator-nav-column-background {
- z-index: -1;
-}
-
.keyboard-focus-focus-reticle {
z-index: 1;
}
diff --git a/webroot/rsrc/css/layout/phabricator-side-menu-view.css b/webroot/rsrc/css/layout/phabricator-side-menu-view.css
--- a/webroot/rsrc/css/layout/phabricator-side-menu-view.css
+++ b/webroot/rsrc/css/layout/phabricator-side-menu-view.css
@@ -14,16 +14,20 @@
display: block;
padding: 6px 8px 6px 24px;
color: {$darkbluetext};
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
}
.phabricator-side-menu .phui-list-item-selected {
- background-color: {$hovergrey};
+ background-color: rgba(0,0,0,.05);
border-left: 4px solid {$sky};
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
}
.device-desktop .phabricator-side-menu .phui-list-item-selected
a.phui-list-item-href:hover {
- background-color: {$hoverselectedgrey};
+ background-color: rgba(0,0,0,.05);
}
.phabricator-side-menu .phui-list-item-selected .phui-list-item-href {
@@ -41,10 +45,9 @@
.device-desktop .phabricator-side-menu a.phui-list-item-href:hover {
text-decoration: none;
- background-color: {$hovergrey};
+ background-color: rgba(0,0,0,.05);
}
-.device-desktop .phabricator-icon-nav .phabricator-nav-column-background,
.device-desktop .phabricator-icon-nav .phabricator-nav-local {
width: 40px;
}
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
@@ -101,10 +101,6 @@
margin: 2px 8px;
}
-.phui-crumbs-view.phui-crumbs-border {
- border-bottom: 1px solid rgba(205, 207, 211, 1);
-}
-
body .phui-crumbs-view + .phui-object-box {
margin-top: 0;
}
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
@@ -41,7 +41,7 @@
.phui-header-view {
padding: 16px;
- font-size: 16px;
+ font-size: 15px;
color: {$darkbluetext};
position: relative;
}
diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css
--- a/webroot/rsrc/css/phui/phui-object-box.css
+++ b/webroot/rsrc/css/phui/phui-object-box.css
@@ -26,6 +26,10 @@
font-weight: normal;
}
+.phui-object-box .phui-header-tall.phui-header-shell h1 {
+ font-weight: bold;
+}
+
.phui-object-box .phui-header-shell + .phui-info-view {
margin: 0;
border-width: 0;
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Oct 22, 10:54 PM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6715958
Default Alt Text
D12762.id30672.diff (17 KB)
Attached To
Mode
D12762: [Redesign] New Sidenav, Homenav, ConpherenceNav, IconNav
Attached
Detach File
Event Timeline
Log In to Comment