From a3c8fcded2193bd9dfd1c05370d1fa0fc0ec73e4 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 29 Jun 2015 11:06:09 -0700
Subject: [PATCH] [Redesign] Give a default line height on codeblocks

Summary: Ref T8099, Gives a default line height to codeblocks, slight background color to pastes.

Test Plan: Tested diffs, pastes, codeblocks in remarkup

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T8099

Differential Revision: https://secure.phabricator.com/D13470
---
 resources/celerity/map.php                             | 10 +++++-----
 webroot/rsrc/css/core/remarkup.css                     |  4 ++--
 .../rsrc/css/layout/phabricator-source-code-view.css   |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 7a5069a185..805e9ac82a 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'b8d31fec',
+    'core.pkg.css' => '5c21bf06',
     'core.pkg.js' => 'a590b451',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '1b36e899',
@@ -108,7 +108,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' => '359cd31c',
+    'rsrc/css/core/remarkup.css' => 'cb0aa7d6',
     'rsrc/css/core/syntax.css' => '9fd11da8',
     'rsrc/css/core/z-index.css' => '63689f49',
     'rsrc/css/diviner/diviner-shared.css' => '5a337049',
@@ -119,7 +119,7 @@ return array(
     'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
     'rsrc/css/layout/phabricator-hovercard-view.css' => '3a8553e7',
     'rsrc/css/layout/phabricator-side-menu-view.css' => '8d13687d',
-    'rsrc/css/layout/phabricator-source-code-view.css' => '098e9b75',
+    'rsrc/css/layout/phabricator-source-code-view.css' => '5e0178de',
     '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',
@@ -732,12 +732,12 @@ return array(
     'phabricator-object-selector-css' => '029a133d',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '6920d200',
-    'phabricator-remarkup-css' => '359cd31c',
+    'phabricator-remarkup-css' => 'cb0aa7d6',
     'phabricator-search-results-css' => '7dea472c',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => '8d13687d',
     'phabricator-slowvote-css' => '7c27f0f9',
-    'phabricator-source-code-view-css' => '098e9b75',
+    'phabricator-source-code-view-css' => '5e0178de',
     'phabricator-standard-page-view' => 'def344d6',
     'phabricator-textareautils' => '5c93c52c',
     'phabricator-title' => 'df5e11d2',
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index 58f129aab4..3e97f74863 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -12,12 +12,12 @@
 
 .PhabricatorMonospaced,
 .phabricator-remarkup .remarkup-code-block .remarkup-code {
-  font: 10px "Menlo", "Consolas", "Monaco", monospace;
+  font: 10px/13px "Menlo", "Consolas", "Monaco", monospace;
 }
 
 .platform-windows .PhabricatorMonospaced,
 .platform-windows .phabricator-remarkup .remarkup-code-block .remarkup-code {
-  font: 11px "Menlo", "Consolas", "Monaco", monospace;
+  font: 11px/13px "Menlo", "Consolas", "Monaco", monospace;
 }
 
 .phabricator-remarkup .remarkup-code-block {
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index fc30024047..047a30459e 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -8,6 +8,7 @@
   overflow-y: hidden;
   border: 1px solid {$sh-lightyellowborder};
   border-radius: 3px;
+  background-color: #FCFBF7;
 }
 
 .phui-object-item .phabricator-source-code-container {