From e42e8aa61875f02d46b099f6b4ab41f53bb91735 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 27 Jun 2014 09:39:13 -0700
Subject: [PATCH] Tighten Remarkup and Fontkit CSS rules in Phabricator

Summary: Fixes T5497. Scope these down a little bit so they don't bleed into `{W...}` embeds and such.

Test Plan:
  - Viewed a Legalpad document with headers, monospaced stuff, and lists. Looked the same before/after.
  - Viewed a comment with headers, monospace, and lists. Looked the same before/after.
  - Viewed a `{W..}` embed, now looks sane.

{F171052}

Reviewers: chad

Reviewed By: chad

Subscribers: epriestley

Maniphest Tasks: T5497

Differential Revision: https://secure.phabricator.com/D9757
---
 resources/celerity/map.php                    | 14 ++---
 .../markup/PhabricatorMarkupEngine.php        |  2 +-
 webroot/rsrc/css/core/remarkup.css            | 52 +++++++++----------
 webroot/rsrc/css/phui/phui-fontkit.css        | 10 ++--
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index d33c30ec4e..135ebd868b 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
 return array(
   'names' =>
   array(
-    'core.pkg.css' => '2151ff22',
+    'core.pkg.css' => 'a18bafdb',
     'core.pkg.js' => '834b4eda',
     'darkconsole.pkg.js' => 'df001cab',
     'differential.pkg.css' => '4a93db37',
@@ -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' => '40151074',
-    'rsrc/css/core/remarkup.css' => '864d4f5e',
+    'rsrc/css/core/remarkup.css' => 'cc2d4ed8',
     'rsrc/css/core/syntax.css' => '3c18c1cb',
     'rsrc/css/core/z-index.css' => 'd1c137f2',
     'rsrc/css/diviner/diviner-shared.css' => '38813222',
@@ -126,7 +126,7 @@ return array(
     'rsrc/css/phui/phui-button.css' => 'c7412aa1',
     'rsrc/css/phui/phui-document.css' => 'a5615198',
     'rsrc/css/phui/phui-feed-story.css' => 'e2c9bc83',
-    'rsrc/css/phui/phui-fontkit.css' => '8246e56e',
+    'rsrc/css/phui/phui-fontkit.css' => '5d40a16b',
     'rsrc/css/phui/phui-form-view.css' => 'ebac1b1d',
     'rsrc/css/phui/phui-form.css' => 'b78ec020',
     'rsrc/css/phui/phui-header-view.css' => '39594ac0',
@@ -136,7 +136,7 @@ return array(
     'rsrc/css/phui/phui-list.css' => '43ed2d93',
     'rsrc/css/phui/phui-object-box.css' => 'e9f7e938',
     'rsrc/css/phui/phui-object-item-list-view.css' => '7ac40b5a',
-    'rsrc/css/phui/phui-pinboard-view.css' => '41e17476',
+    'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269',
     'rsrc/css/phui/phui-property-list-view.css' => '2f7199e8',
     'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -732,7 +732,7 @@ return array(
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '41ed7994',
     'phabricator-profile-css' => 'b459416e',
-    'phabricator-remarkup-css' => '864d4f5e',
+    'phabricator-remarkup-css' => 'cc2d4ed8',
     'phabricator-search-results-css' => 'f240504c',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => 'a2ccd7bd',
@@ -772,7 +772,7 @@ return array(
     'phui-document-view-css' => 'a5615198',
     'phui-feed-story-css' => 'e2c9bc83',
     'phui-font-icon-base-css' => 'eb84f033',
-    'phui-fontkit-css' => '8246e56e',
+    'phui-fontkit-css' => '5d40a16b',
     'phui-form-css' => 'b78ec020',
     'phui-form-view-css' => 'ebac1b1d',
     'phui-header-view-css' => '39594ac0',
@@ -782,7 +782,7 @@ return array(
     'phui-list-view-css' => '43ed2d93',
     'phui-object-box-css' => 'e9f7e938',
     'phui-object-item-list-view-css' => '7ac40b5a',
-    'phui-pinboard-view-css' => '41e17476',
+    'phui-pinboard-view-css' => '3dd4a269',
     'phui-property-list-view-css' => '2f7199e8',
     'phui-remarkup-preview-css' => '19ad512b',
     'phui-spacing-css' => '042804d6',
diff --git a/src/infrastructure/markup/PhabricatorMarkupEngine.php b/src/infrastructure/markup/PhabricatorMarkupEngine.php
index 2f6a030014..d4d41890b0 100644
--- a/src/infrastructure/markup/PhabricatorMarkupEngine.php
+++ b/src/infrastructure/markup/PhabricatorMarkupEngine.php
@@ -41,7 +41,7 @@ final class PhabricatorMarkupEngine {
 
   private $objects = array();
   private $viewer;
-  private $version = 8;
+  private $version = 9;
 
 
 /* -(  Markup Pipeline  )---------------------------------------------------- */
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index b076ff4301..41bf2817f1 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -48,7 +48,7 @@
   background-color: {$lightred};
 }
 
-.phabricator-remarkup tt {
+.phabricator-remarkup tt.remarkup-monospaced {
   color: #333333;
   background: #ebebeb;
   padding: 0 4px;
@@ -57,16 +57,16 @@
 
 /* NOTE: You can currently produce this with [[link | `name`]]. Restore the
    link color. */
-.phabricator-remarkup a tt {
+.phabricator-remarkup a tt.remarkup-monospaced {
   color: #18559d;
 }
 
-.phabricator-remarkup ul {
+.phabricator-remarkup ul.remarkup-list {
   list-style: disc;
   margin: 12px 0 12px 30px;
 }
 
-.phabricator-remarkup ol {
+.phabricator-remarkup ol.remarkup-list {
   list-style: decimal;
   margin: 12px 0 12px 30px;
 }
@@ -84,10 +84,10 @@
   color: {$greytext};
 }
 
-.phabricator-remarkup ul ol,
-.phabricator-remarkup ul ul,
-.phabricator-remarkup ol ol,
-.phabricator-remarkup ol ul {
+.phabricator-remarkup ul.remarkup-list ol.remarkup-list,
+.phabricator-remarkup ul.remarkup-list ul.remarkup-list,
+.phabricator-remarkup ol.remarkup-list ol.remarkup-list,
+.phabricator-remarkup ol.remarkup-list ul.remarkup-list {
   margin: 4px 0 4px 24px;
 }
 
@@ -96,55 +96,55 @@
   list-style-type: none;
 }
 
-.phabricator-remarkup h1:first-child,
-.phabricator-remarkup h2:first-child,
-.phabricator-remarkup h3:first-child,
-.phabricator-remarkup h4:first-child,
-.phabricator-remarkup h5:first-child,
-.phabricator-remarkup h6:first-child {
+.phabricator-remarkup h1.remarkup-header:first-child,
+.phabricator-remarkup h2.remarkup-header:first-child,
+.phabricator-remarkup h3.remarkup-header:first-child,
+.phabricator-remarkup h4.remarkup-header:first-child,
+.phabricator-remarkup h5.remarkup-header:first-child,
+.phabricator-remarkup h6.remarkup-header:first-child {
   margin-top: 0;
 }
 
-.phabricator-remarkup h1:last-child,
-.phabricator-remarkup h2:last-child,
-.phabricator-remarkup h3:last-child,
-.phabricator-remarkup h4:last-child,
-.phabricator-remarkup h5:last-child,
-.phabricator-remarkup h6:last-child {
+.phabricator-remarkup h1.remarkup-header:last-child,
+.phabricator-remarkup h2.remarkup-header:last-child,
+.phabricator-remarkup h3.remarkup-header:last-child,
+.phabricator-remarkup h4.remarkup-header:last-child,
+.phabricator-remarkup h5.remarkup-header:last-child,
+.phabricator-remarkup h6.remarkup-header:last-child {
   margin-bottom: 0;
 }
 
-.phabricator-remarkup h1 {
+.phabricator-remarkup h1.remarkup-header {
   font-size: 1.625em;
   line-height: 1.625em;
   margin: 8px 0;
 }
 
-.phabricator-remarkup h2 {
+.phabricator-remarkup h2.remarkup-header {
   font-size: 1.5em;
   line-height: 1.5em;
   margin: 8px 0;
 }
 
-.phabricator-remarkup h3 {
+.phabricator-remarkup h3.remarkup-header {
   font-size: 1.375em;
   line-height: 1.375em;
   margin: 8px 0;
 }
 
-.phabricator-remarkup h4 {
+.phabricator-remarkup h4.remarkup-header {
   font-size: 1.25em;
   line-height: 1.25em;
   margin: 8px 0;
 }
 
-.phabricator-remarkup h5 {
+.phabricator-remarkup h5.remarkup-header {
   font-size: 1.125em;
   line-height: 1.125em;
   margin: 4px 0;
 }
 
-.phabricator-remarkup h6 {
+.phabricator-remarkup h6.remarkup-header {
   font-size: 1em;
   line-height: 1em;
   margin: 4px 0;
diff --git a/webroot/rsrc/css/phui/phui-fontkit.css b/webroot/rsrc/css/phui/phui-fontkit.css
index 7505f00c94..546bf15756 100644
--- a/webroot/rsrc/css/phui/phui-fontkit.css
+++ b/webroot/rsrc/css/phui/phui-fontkit.css
@@ -9,7 +9,7 @@
   line-height: 20px;
 }
 
-.phui-font-source-sans .phabricator-remarkup h2 {
+.phui-font-source-sans .phabricator-remarkup h2.remarkup-header {
   padding: 8px 24px 8px 0;
   border-bottom: 1px solid {$thinblueborder};
   font-size: 20px;
@@ -18,12 +18,12 @@
   margin: 0 0 16px;
 }
 
-.phui-font-source-sans .phabricator-remarkup ol li,
-.phui-font-source-sans .phabricator-remarkup ul li {
+.phui-font-source-sans .phabricator-remarkup ol li.remarkup-list-item,
+.phui-font-source-sans .phabricator-remarkup ul li.remarkup-list-item {
   margin-bottom: 4px;
 }
 
-.phui-font-source-sans .phabricator-remarkup tt {
+.phui-font-source-sans .phabricator-remarkup tt.remarkup-monospaced {
   font-size: 13px;
   padding: 1px 3px 2px;
 }
@@ -38,7 +38,7 @@
   padding-bottom: 6px;
 }
 
-.phui-font-source-sans a {
+.phui-font-source-sans a.remarkup-link {
   color: {$blue};
 }