diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -77,7 +77,7 @@ 'rsrc/css/application/maniphest/task-summary.css' => 'ab2fc691', 'rsrc/css/application/objectselector/object-selector.css' => '029a133d', 'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b', - 'rsrc/css/application/paste/paste.css' => 'aa1767d1', + 'rsrc/css/application/paste/paste.css' => 'eb997ddd', 'rsrc/css/application/people/people-profile.css' => '25970776', 'rsrc/css/application/phame/phame.css' => 'db5682e3', 'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee', @@ -115,7 +115,7 @@ 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-hovercard-view.css' => '893f4783', 'rsrc/css/layout/phabricator-side-menu-view.css' => '7e8c6341', - 'rsrc/css/layout/phabricator-source-code-view.css' => '7d346aa4', + 'rsrc/css/layout/phabricator-source-code-view.css' => '2ceee894', 'rsrc/css/phui/calendar/phui-calendar-day.css' => 'de035c8a', 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59', 'rsrc/css/phui/calendar/phui-calendar-month.css' => 'a92e47d2', @@ -707,7 +707,7 @@ 'multirow-row-manager' => 'b5d57730', 'owners-path-editor' => 'aa1733d0', 'owners-path-editor-css' => '2f00933b', - 'paste-css' => 'aa1767d1', + 'paste-css' => 'eb997ddd', 'path-typeahead' => 'f7fc67ec', 'people-profile-css' => '25970776', 'phabricator-action-list-view-css' => '9ee9910a', @@ -743,7 +743,7 @@ 'phabricator-shaped-request' => '7cbe244b', 'phabricator-side-menu-view-css' => '7e8c6341', 'phabricator-slowvote-css' => '266df6a1', - 'phabricator-source-code-view-css' => '7d346aa4', + 'phabricator-source-code-view-css' => '2ceee894', 'phabricator-standard-page-view' => '926b7e2d', 'phabricator-textareautils' => '5c93c52c', 'phabricator-title' => '5c1c758c', diff --git a/src/applications/paste/view/PasteEmbedView.php b/src/applications/paste/view/PasteEmbedView.php --- a/src/applications/paste/view/PasteEmbedView.php +++ b/src/applications/paste/view/PasteEmbedView.php @@ -5,7 +5,7 @@ private $paste; private $handle; private $highlights = array(); - private $lines = 30; + private $lines = 24; public function setPaste(PhabricatorPaste $paste) { $this->paste = $paste; diff --git a/webroot/rsrc/css/application/paste/paste.css b/webroot/rsrc/css/application/paste/paste.css --- a/webroot/rsrc/css/application/paste/paste.css +++ b/webroot/rsrc/css/application/paste/paste.css @@ -3,18 +3,18 @@ */ .paste-embed { - padding: 5px; - background: #f7f7f7; - border: 1px solid #dbdbdb; + background: {$lightbluebackground}; + border: 1px solid {$lightblueborder}; + border-bottom: 1px solid {$blueborder}; } .paste-embed-head { - border-bottom: 1px solid #dbdbdb; - margin:2px; + border-bottom: 1px solid {$thinblueborder}; + padding: 6px 10px; } .paste-embed-head a { - color: #282828; + color: {$darkbluetext}; font-weight: bold; } diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css --- a/webroot/rsrc/css/layout/phabricator-source-code-view.css +++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css @@ -30,10 +30,8 @@ .phabricator-source-line { text-align: right; padding: 2px 6px 1px 12px; - - border-right: 1px solid #dbdbdb; - font-weight: bold; - color: #555555; + border-right: 1px solid {$thinblueborder}; + color: {$darkbluetext}; /* When the user selects rows of source, don't visibly select the line numbers beside them. We use JS to strip the line numbers out when the user @@ -45,8 +43,16 @@ user-select: none; } +th.phabricator-source-line a { + color: {$darkbluetext}; +} + +th.phabricator-source-line:hover { + background-color: {$greybackground}; +} + .phabricator-source-highlight { - background: #ff0; + background: {$lightyellow}; } .phabricator-source-code-summary {