From 8fb227d352024cdcd0efb45d447bcd821d42e103 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Fri, 21 Mar 2014 21:42:39 -0700
Subject: [PATCH] Update Remarkup Note Styles

Summary: Update notes, important, and warnings to look different than codeblocks.

Test Plan: test in diviner and legalpad

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin, chad, avivey

Differential Revision: https://secure.phabricator.com/D8592
---
 resources/celerity/map.php                     |  8 +++-----
 .../LegalpadDocumentSignController.php         |  1 -
 .../LegalpadDocumentViewController.php         |  1 -
 .../application/legalpad/legalpad-document.css | 15 ---------------
 webroot/rsrc/css/core/remarkup.css             | 18 +++++++++---------
 5 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 webroot/rsrc/css/application/legalpad/legalpad-document.css

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index b3f5d68c67..47a6ddb65e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
 return array(
   'names' =>
   array(
-    'core.pkg.css' => '4d72eb6e',
+    'core.pkg.css' => '5b87dcb0',
     'core.pkg.js' => '264721e1',
     'darkconsole.pkg.js' => 'ca8671ce',
     'differential.pkg.css' => 'cb97e095',
@@ -72,7 +72,6 @@ return array(
     'rsrc/css/application/flag/flag.css' => '5337623f',
     'rsrc/css/application/herald/herald-test.css' => '2b7d0f54',
     'rsrc/css/application/herald/herald.css' => '59d48f01',
-    'rsrc/css/application/legalpad/legalpad-document.css' => 'cd275275',
     'rsrc/css/application/maniphest/batch-editor.css' => '8f380ebc',
     'rsrc/css/application/maniphest/report.css' => '6fc16517',
     'rsrc/css/application/maniphest/task-edit.css' => '8e23031b',
@@ -112,7 +111,7 @@ return array(
     'rsrc/css/application/tokens/tokens.css' => 'fb286311',
     'rsrc/css/application/uiexample/example.css' => '4741b891',
     'rsrc/css/core/core.css' => 'da26ddb2',
-    'rsrc/css/core/remarkup.css' => 'c2bfa678',
+    'rsrc/css/core/remarkup.css' => 'b4407c57',
     'rsrc/css/core/syntax.css' => '3c18c1cb',
     'rsrc/css/core/z-index.css' => '0fd29d49',
     'rsrc/css/diviner/diviner-shared.css' => '38813222',
@@ -664,7 +663,6 @@ return array(
     'javelin-view-renderer' => '6c2b09a2',
     'javelin-view-visitor' => 'efe49472',
     'javelin-workflow' => 'f28bf201',
-    'legalpad-document-css' => 'cd275275',
     'lightbox-attachment-css' => '7acac05d',
     'maniphest-batch-editor' => '8f380ebc',
     'maniphest-report-css' => '6fc16517',
@@ -709,7 +707,7 @@ return array(
     'phabricator-prefab' => '0326e5d0',
     'phabricator-profile-css' => '9bdb9804',
     'phabricator-project-tag-css' => '095c9404',
-    'phabricator-remarkup-css' => 'c2bfa678',
+    'phabricator-remarkup-css' => 'b4407c57',
     'phabricator-search-results-css' => 'f240504c',
     'phabricator-settings-css' => 'ea8f5915',
     'phabricator-shaped-request' => 'dfa181a4',
diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
index 16361a84f7..e84662f6a9 100644
--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
@@ -204,7 +204,6 @@ final class LegalpadDocumentSignController extends LegalpadController {
     PhabricatorMarkupEngine $engine,
     LegalpadDocumentBody $body) {
 
-    $this->requireResource('legalpad-document-css');
     return id(new PHUIDocumentView())
       ->addClass('legalpad')
       ->setHeader($header)
diff --git a/src/applications/legalpad/controller/LegalpadDocumentViewController.php b/src/applications/legalpad/controller/LegalpadDocumentViewController.php
index 9a6ce73ab3..d07522055b 100644
--- a/src/applications/legalpad/controller/LegalpadDocumentViewController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentViewController.php
@@ -110,7 +110,6 @@ final class LegalpadDocumentViewController extends LegalpadController {
     PhabricatorMarkupEngine
     $engine, LegalpadDocumentBody $body) {
 
-    $this->requireResource('legalpad-document-css');
     $view = new PHUIPropertyListView();
     $view->addClass('legalpad');
     $view->addSectionHeader(pht('Document'));
diff --git a/webroot/rsrc/css/application/legalpad/legalpad-document.css b/webroot/rsrc/css/application/legalpad/legalpad-document.css
deleted file mode 100644
index 3b2f32a32c..0000000000
--- a/webroot/rsrc/css/application/legalpad/legalpad-document.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @provides legalpad-document-css
- */
-
-.legalpad .phabricator-remarkup .remarkup-note {
-  border-radius: 15px;
-}
-
-.legalpad .phabricator-remarkup .remarkup-warning {
-  border-radius: 15px;
-}
-
-.legalpad .phabricator-remarkup .remarkup-important {
-  border-radius: 15px;
-}
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index c6c617d771..9533e4d6a7 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -178,23 +178,23 @@
 }
 
 .phabricator-remarkup .remarkup-note {
-  margin: 12px 24px;
-  padding: 8px;
-  border: 1px solid {$blue};
+  margin: 16px 0;
+  padding: 12px;
+  border-left: 3px solid {$blue};
   background: {$lightblue};
 }
 
 .phabricator-remarkup .remarkup-warning {
-  margin: 12px 24px;
-  padding: 8px;
-  border: 1px solid {$yellow};
+  margin: 16px 0;
+  padding: 12px;
+  border-left: 3px solid {$yellow};
   background: {$lightyellow};
 }
 
 .phabricator-remarkup .remarkup-important {
-  margin: 12px 24px;
-  padding: 8px;
-  border: 1px solid {$red};
+  margin: 16px 0;
+  padding: 12px;
+  border-left: 3px solid {$red};
   background: {$lightred};
 }