diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 5105d48939..4ff24278f2 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ return array( 'names' => array( - 'core.pkg.css' => '4877abce', + 'core.pkg.css' => '5e574aa1', 'core.pkg.js' => '264721e1', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => 'cb97e095', @@ -111,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' => 'b4407c57', + 'rsrc/css/core/remarkup.css' => '0923dbd6', 'rsrc/css/core/syntax.css' => '3c18c1cb', 'rsrc/css/core/z-index.css' => '0fd29d49', 'rsrc/css/diviner/diviner-shared.css' => '38813222', @@ -707,7 +707,7 @@ return array( 'phabricator-prefab' => '0326e5d0', 'phabricator-profile-css' => '9bdb9804', 'phabricator-project-tag-css' => '095c9404', - 'phabricator-remarkup-css' => 'b4407c57', + 'phabricator-remarkup-css' => '0923dbd6', 'phabricator-search-results-css' => 'f240504c', 'phabricator-settings-css' => 'ea8f5915', 'phabricator-shaped-request' => 'dfa181a4', diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 646aec1a71..c7bd2a75f7 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -1890,6 +1890,7 @@ phutil_register_library_map(array( 'PhabricatorRemarkupControl' => 'view/form/control/PhabricatorRemarkupControl.php', 'PhabricatorRemarkupCustomBlockRule' => 'infrastructure/markup/rule/PhabricatorRemarkupCustomBlockRule.php', 'PhabricatorRemarkupCustomInlineRule' => 'infrastructure/markup/rule/PhabricatorRemarkupCustomInlineRule.php', + 'PhabricatorRemarkupExample' => 'applications/uiexample/examples/PhabricatorRemarkupExample.php', 'PhabricatorRemarkupRuleEmbedFile' => 'applications/files/remarkup/PhabricatorRemarkupRuleEmbedFile.php', 'PhabricatorRemarkupRuleImageMacro' => 'applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php', 'PhabricatorRemarkupRuleMeme' => 'applications/macro/remarkup/PhabricatorRemarkupRuleMeme.php', @@ -4682,6 +4683,7 @@ phutil_register_library_map(array( 'PhabricatorRemarkupControl' => 'AphrontFormTextAreaControl', 'PhabricatorRemarkupCustomBlockRule' => 'PhutilRemarkupEngineBlockRule', 'PhabricatorRemarkupCustomInlineRule' => 'PhutilRemarkupRule', + 'PhabricatorRemarkupExample' => 'PhabricatorUIExample', 'PhabricatorRemarkupRuleEmbedFile' => 'PhabricatorRemarkupRuleObject', 'PhabricatorRemarkupRuleImageMacro' => 'PhutilRemarkupRule', 'PhabricatorRemarkupRuleMeme' => 'PhutilRemarkupRule', diff --git a/src/applications/uiexample/examples/PhabricatorRemarkupExample.php b/src/applications/uiexample/examples/PhabricatorRemarkupExample.php new file mode 100644 index 0000000000..8ad5b9d6e9 --- /dev/null +++ b/src/applications/uiexample/examples/PhabricatorRemarkupExample.php @@ -0,0 +1,57 @@ +getRequest()->getUser(); + + $content = pht(<<setContent($content), + 'default', + $viewer); + + $frame = id(new PHUIBoxView()) + ->addPadding(PHUI::PADDING_LARGE) + ->appendChild($remarkup); + + return id(new PHUIObjectBoxView()) + ->setHeaderText(pht('Remarkup Example')) + ->appendChild($frame); + } + +} diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index 9533e4d6a7..a68c41ed48 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -198,6 +198,11 @@ background: {$lightred}; } +.phabricator-remarkup .remarkup-note-word { + font-weight: bold; + color: {$darkbluetext}; +} + .phabricator-remarkup-toc { float: right; border: 1px solid {$lightblueborder};