From cbf1b1a9fafd12c1c6e0b7fc148ad4313c1a3852 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Wed, 3 Jun 2015 20:44:33 -0700 Subject: [PATCH] [Redesign] Misc cleanup Summary: Ref T8099, random bug fixes in headers, PHUIDocumentView, soften Oswald colors. Test Plan: browse and test each change. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T8099 Differential Revision: https://secure.phabricator.com/D13147 --- resources/celerity/map.php | 10 +++++----- src/view/phui/PHUIDocumentView.php | 4 +++- webroot/rsrc/css/phui/phui-header-view.css | 13 +++++++------ .../rsrc/css/phui/phui-object-item-list-view.css | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index bc1f03471c..8a862aa84c 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '996cd7ca', + 'core.pkg.css' => 'bd23b77d', 'core.pkg.js' => '125d168c', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'f89b49b6', @@ -134,14 +134,14 @@ return array( 'rsrc/css/phui/phui-fontkit.css' => '0ce97d82', 'rsrc/css/phui/phui-form-view.css' => 'a0e8f168', 'rsrc/css/phui/phui-form.css' => 'f535f938', - 'rsrc/css/phui/phui-header-view.css' => '7faae760', + 'rsrc/css/phui/phui-header-view.css' => 'fa61bab0', 'rsrc/css/phui/phui-icon.css' => '88ba9081', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-info-view.css' => '33e54618', 'rsrc/css/phui/phui-list.css' => 'e448b6ba', 'rsrc/css/phui/phui-object-box.css' => '1ba354f4', - 'rsrc/css/phui/phui-object-item-list-view.css' => '29ded459', + 'rsrc/css/phui/phui-object-item-list-view.css' => '57bd9953', 'rsrc/css/phui/phui-pager.css' => 'bea33d23', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', 'rsrc/css/phui/phui-property-list-view.css' => '1baf23eb', @@ -777,7 +777,7 @@ return array( 'phui-fontkit-css' => '0ce97d82', 'phui-form-css' => 'f535f938', 'phui-form-view-css' => 'a0e8f168', - 'phui-header-view-css' => '7faae760', + 'phui-header-view-css' => 'fa61bab0', 'phui-icon-view-css' => '88ba9081', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', @@ -785,7 +785,7 @@ return array( 'phui-inline-comment-view-css' => 'aa16f165', 'phui-list-view-css' => 'e448b6ba', 'phui-object-box-css' => '1ba354f4', - 'phui-object-item-list-view-css' => '29ded459', + 'phui-object-item-list-view-css' => '57bd9953', 'phui-pager-css' => 'bea33d23', 'phui-pinboard-view-css' => '2495140e', 'phui-property-list-view-css' => '1baf23eb', diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php index 4bbd824264..2aa8950c03 100644 --- a/src/view/phui/PHUIDocumentView.php +++ b/src/view/phui/PHUIDocumentView.php @@ -146,7 +146,9 @@ final class PHUIDocumentView extends AphrontTagView { $main_content = $this->renderChildren(); } - $this->header->setSubheader($book); + if ($book) { + $this->header->setSubheader($book); + } $content_inner = phutil_tag( 'div', array( diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css index abebc5a837..462ac49b71 100644 --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -72,11 +72,7 @@ body .phui-header-shell.phui-bleed-header font-size: 18px; font-weight: 500; line-height: 24px; - color: #000; -} - -.device-phone .phui-header-header { - font-size: 14px; + color: {$darkbluetext}; } .phui-object-box .phui-header-tall .phui-header-header, @@ -85,7 +81,12 @@ body .phui-header-shell.phui-bleed-header } .phui-header-view .phui-header-header a { - color: #000; + color: {$darkbluetext}; +} + +.device-desktop .phui-header-view .phui-header-header a:hover { + text-decoration: none; + color: {$fire}; } .phui-header-view .phui-header-action-links { diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css index 7cbcceebf2..08f0269c56 100644 --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -92,7 +92,7 @@ ul.phui-object-item-list-view { } .phui-object-item-objname { - color: {$darkbluetext}; + color: #000; cursor: text; font-weight: bold; }