From ce7aa92c67783d8eae0be53bb315cb03313e8abc Mon Sep 17 00:00:00 2001 From: Chad Little Date: Thu, 17 Sep 2015 08:23:22 -0700 Subject: [PATCH] Normalize Paste, Remarkup code embed colors Summary: These currently use different yellows, and more importantly when pygmentized, is hard to read. This lightens up code embeds and pastes. Test Plan: Review Diviner docs, Pastes, and normal code embeds. {F820471} Reviewers: epriestley Reviewed By: epriestley Subscribers: tycho.tatitscheff, Korvin Differential Revision: https://secure.phabricator.com/D14123 --- resources/celerity/map.php | 10 +++++----- webroot/rsrc/css/core/remarkup.css | 6 +++--- .../rsrc/css/layout/phabricator-source-code-view.css | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 640f94f24a..f1a20bf002 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'a2cf2f6c', + 'core.pkg.css' => '5eabac59', 'core.pkg.js' => '47dc9ebb', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '2de124c9', @@ -104,7 +104,7 @@ return array( 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', 'rsrc/css/core/core.css' => 'a76cefc9', - 'rsrc/css/core/remarkup.css' => '1c4ac273', + 'rsrc/css/core/remarkup.css' => 'e27a26b2', 'rsrc/css/core/syntax.css' => '9fd11da8', 'rsrc/css/core/z-index.css' => '57ddcaa2', 'rsrc/css/diviner/diviner-shared.css' => '5a337049', @@ -115,7 +115,7 @@ return array( 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-hovercard-view.css' => '1239cd52', 'rsrc/css/layout/phabricator-side-menu-view.css' => 'bec2458e', - 'rsrc/css/layout/phabricator-source-code-view.css' => '5e0178de', + 'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983', 'rsrc/css/phui/calendar/phui-calendar-day.css' => 'd1cf6f93', 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1c7f338', 'rsrc/css/phui/calendar/phui-calendar-month.css' => '476be7e0', @@ -733,12 +733,12 @@ return array( 'phabricator-object-selector-css' => '85ee8ce6', 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => '6920d200', - 'phabricator-remarkup-css' => '1c4ac273', + 'phabricator-remarkup-css' => 'e27a26b2', 'phabricator-search-results-css' => '7dea472c', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-side-menu-view-css' => 'bec2458e', 'phabricator-slowvote-css' => '475b4bd2', - 'phabricator-source-code-view-css' => '5e0178de', + 'phabricator-source-code-view-css' => 'cbeef983', 'phabricator-standard-page-view' => '1f53d056', 'phabricator-textareautils' => '5c93c52c', 'phabricator-title' => 'df5e11d2', diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index 9a3906f3b8..98dad91a26 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -39,12 +39,12 @@ } .phabricator-remarkup .remarkup-code-block pre { - background: {$sh-yellowbackground}; + background: #FFFEF5; border: 1px solid {$sh-lightyellowborder}; display: block; - color: #000000; + color: #000; overflow: auto; - padding: 12px 8px; + padding: 8px; } .phabricator-remarkup pre.remarkup-counterexample { diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css index 047a30459e..4bd57fcfcb 100644 --- a/webroot/rsrc/css/layout/phabricator-source-code-view.css +++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css @@ -3,12 +3,11 @@ */ .phabricator-source-code-container { - background: #fff; overflow-x: auto; overflow-y: hidden; border: 1px solid {$sh-lightyellowborder}; border-radius: 3px; - background-color: #FCFBF7; + background-color: #FFFEF5; } .phui-object-item .phabricator-source-code-container { @@ -44,6 +43,7 @@ -webkit-user-select: none; -ms-user-select: none; user-select: none; + white-space: nowrap; } th.phabricator-source-line a {