From c8b9418ebcbf4ac9e939dcd35e8e5095ba6ed766 Mon Sep 17 00:00:00 2001 From: epriestley Date: Sun, 19 Feb 2012 09:06:47 -0800 Subject: [PATCH] Update documentation and CSS for nested and enumerated lists Summary: Update Phabricator for Remarkup changes in D1638. Test Plan: Looked at various sorts of nested, enumerated, and phantom-item lists. Reviewers: btrahan, jungejason Reviewed By: jungejason CC: aran, epriestley Maniphest Tasks: T885 Differential Revision: https://secure.phabricator.com/D1639 --- src/__celerity_resource_map__.php | 82 ++++++++++++++--------------- src/docs/userguide/remarkup.diviner | 24 ++++++++- webroot/rsrc/css/core/remarkup.css | 17 ++++++ 3 files changed, 81 insertions(+), 42 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index f692d638f2..5d3a0110b5 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -1332,7 +1332,7 @@ celerity_register_resource_map(array( ), 'phabricator-chatlog-css' => array( - 'uri' => '/res/a5aa9eef/rsrc/css/application/chatlog/chatlog.css', + 'uri' => '/res/f674f526/rsrc/css/application/chatlog/chatlog.css', 'type' => 'css', 'requires' => array( @@ -1510,7 +1510,7 @@ celerity_register_resource_map(array( ), 'phabricator-remarkup-css' => array( - 'uri' => '/res/39f358b8/rsrc/css/core/remarkup.css', + 'uri' => '/res/02e0f11a/rsrc/css/core/remarkup.css', 'type' => 'css', 'requires' => array( @@ -1758,30 +1758,6 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/03ef179e/diffusion.pkg.css', 'type' => 'css', ), - '2729c1c6' => - array( - 'name' => 'core.pkg.css', - 'symbols' => - array( - 0 => 'phabricator-core-css', - 1 => 'phabricator-core-buttons-css', - 2 => 'phabricator-standard-page-view', - 3 => 'aphront-dialog-view-css', - 4 => 'aphront-form-view-css', - 5 => 'aphront-panel-view-css', - 6 => 'aphront-side-nav-view-css', - 7 => 'aphront-table-view-css', - 8 => 'aphront-crumbs-view-css', - 9 => 'aphront-tokenizer-control-css', - 10 => 'aphront-typeahead-control-css', - 11 => 'aphront-list-filter-view-css', - 12 => 'phabricator-directory-css', - 13 => 'phabricator-remarkup-css', - 14 => 'syntax-highlighting-css', - ), - 'uri' => '/res/pkg/2729c1c6/core.pkg.css', - 'type' => 'css', - ), '46547a92' => array( 'name' => 'core.pkg.js', @@ -1856,6 +1832,30 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/b164acea/javelin.pkg.js', 'type' => 'js', ), + 'da9f8734' => + array( + 'name' => 'core.pkg.css', + 'symbols' => + array( + 0 => 'phabricator-core-css', + 1 => 'phabricator-core-buttons-css', + 2 => 'phabricator-standard-page-view', + 3 => 'aphront-dialog-view-css', + 4 => 'aphront-form-view-css', + 5 => 'aphront-panel-view-css', + 6 => 'aphront-side-nav-view-css', + 7 => 'aphront-table-view-css', + 8 => 'aphront-crumbs-view-css', + 9 => 'aphront-tokenizer-control-css', + 10 => 'aphront-typeahead-control-css', + 11 => 'aphront-list-filter-view-css', + 12 => 'phabricator-directory-css', + 13 => 'phabricator-remarkup-css', + 14 => 'syntax-highlighting-css', + ), + 'uri' => '/res/pkg/da9f8734/core.pkg.css', + 'type' => 'css', + ), 'ef420ead' => array( 'name' => 'differential.pkg.js', @@ -1883,16 +1883,16 @@ celerity_register_resource_map(array( ), 'reverse' => array( - 'aphront-crumbs-view-css' => '2729c1c6', - 'aphront-dialog-view-css' => '2729c1c6', - 'aphront-form-view-css' => '2729c1c6', + 'aphront-crumbs-view-css' => 'da9f8734', + 'aphront-dialog-view-css' => 'da9f8734', + 'aphront-form-view-css' => 'da9f8734', 'aphront-headsup-action-list-view-css' => '80580cea', - 'aphront-list-filter-view-css' => '2729c1c6', - 'aphront-panel-view-css' => '2729c1c6', - 'aphront-side-nav-view-css' => '2729c1c6', - 'aphront-table-view-css' => '2729c1c6', - 'aphront-tokenizer-control-css' => '2729c1c6', - 'aphront-typeahead-control-css' => '2729c1c6', + 'aphront-list-filter-view-css' => 'da9f8734', + 'aphront-panel-view-css' => 'da9f8734', + 'aphront-side-nav-view-css' => 'da9f8734', + 'aphront-table-view-css' => 'da9f8734', + 'aphront-tokenizer-control-css' => 'da9f8734', + 'aphront-typeahead-control-css' => 'da9f8734', 'differential-changeset-view-css' => '80580cea', 'differential-core-view-css' => '80580cea', 'differential-inline-comment-editor' => 'ef420ead', @@ -1941,16 +1941,16 @@ celerity_register_resource_map(array( 'javelin-vector' => 'b164acea', 'javelin-workflow' => '46547a92', 'phabricator-content-source-view-css' => '80580cea', - 'phabricator-core-buttons-css' => '2729c1c6', - 'phabricator-core-css' => '2729c1c6', - 'phabricator-directory-css' => '2729c1c6', + 'phabricator-core-buttons-css' => 'da9f8734', + 'phabricator-core-css' => 'da9f8734', + 'phabricator-directory-css' => 'da9f8734', 'phabricator-drag-and-drop-file-upload' => 'ef420ead', 'phabricator-keyboard-shortcut' => '46547a92', 'phabricator-keyboard-shortcut-manager' => '46547a92', 'phabricator-object-selector-css' => '80580cea', - 'phabricator-remarkup-css' => '2729c1c6', + 'phabricator-remarkup-css' => 'da9f8734', 'phabricator-shaped-request' => 'ef420ead', - 'phabricator-standard-page-view' => '2729c1c6', - 'syntax-highlighting-css' => '2729c1c6', + 'phabricator-standard-page-view' => 'da9f8734', + 'syntax-highlighting-css' => 'da9f8734', ), )); diff --git a/src/docs/userguide/remarkup.diviner b/src/docs/userguide/remarkup.diviner index 64c747deb7..47d258dc89 100644 --- a/src/docs/userguide/remarkup.diviner +++ b/src/docs/userguide/remarkup.diviner @@ -35,7 +35,7 @@ empty lines: = Large Header = == Smaller Header == > Quoted Text - Use "- " or "* " for list items. + Use "- " or "* " for bulleted lists, and "# " for numbered lists. Use ``` or indent two spaces for code. Use %%% for a literal block. @@ -88,6 +88,28 @@ This produces a list like this: (Note that you need to put a space after the "-" or "*".) +You can make numbered lists with a "#" instead of "-" or "*": + + # Articuno + # Zapdos + # Moltres + +You can also nest lists: + + - Body + - Head + - Arm + - Elbow + - Hand + # Thumb + # Index + # Middle + # Ring + # Pinkie + - Leg + - Knee + - Foot + Make **code blocks** by indenting two spaces: f(x, y); diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index d31e33c693..9926aaaeff 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -53,6 +53,23 @@ margin: 1em 0 1em 3em; } +.phabricator-remarkup ol { + list-style: decimal; + margin: 1em 0 1em 3em; +} + +.phabricator-remarkup ul ol, +.phabricator-remarkup ul ul, +.phabricator-remarkup ol ol, +.phabricator-remarkup ol ul { + margin: .25em 0 .25em 2em; +} + +.phabricator-remarkup li.phantom-item, +.phabricator-remarkup li.phantom-item { + list-style-type: none; +} + .phabricator-remarkup h1:first-child, .phabricator-remarkup h2:first-child, .phabricator-remarkup h3:first-child,