diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 0275dcbb03..92439af49b 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,8 +7,8 @@ return array( 'names' => array( - 'core.pkg.css' => 'baca3efb', - 'core.pkg.js' => '29e9786d', + 'core.pkg.css' => 'd9c53a92', + 'core.pkg.js' => 'b6689fe1', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '4a93db37', 'differential.pkg.js' => 'eca39a2c', @@ -105,7 +105,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' => '80c3a48c', + 'rsrc/css/core/remarkup.css' => 'b510c359', 'rsrc/css/core/syntax.css' => '3c18c1cb', 'rsrc/css/core/z-index.css' => 'efb673ac', 'rsrc/css/diviner/diviner-shared.css' => '38813222', @@ -157,7 +157,6 @@ return array( 'rsrc/css/sprite-minicons.css' => 'df4f76fe', 'rsrc/css/sprite-payments.css' => 'cc085d44', 'rsrc/css/sprite-projects.css' => '7578fa56', - 'rsrc/css/sprite-remarkup.css' => '5c396a57', 'rsrc/css/sprite-tokens.css' => '1706b943', 'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '1cab0752', 'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '2ff84fd2', @@ -324,8 +323,6 @@ return array( 'rsrc/image/sprite-payments.png' => 'd8576309', 'rsrc/image/sprite-projects-X2.png' => '218fdc8b', 'rsrc/image/sprite-projects.png' => '631ff9a7', - 'rsrc/image/sprite-remarkup-X2.png' => '7ee1dc28', - 'rsrc/image/sprite-remarkup.png' => 'b4421f07', 'rsrc/image/sprite-tokens-X2.png' => 'b4776580', 'rsrc/image/sprite-tokens.png' => '25b75533', 'rsrc/image/texture/card-gradient.png' => '815f26e8', @@ -462,7 +459,7 @@ return array( 'rsrc/js/core/behavior-object-selector.js' => 'e6f67523', 'rsrc/js/core/behavior-oncopy.js' => 'c3e218fe', 'rsrc/js/core/behavior-phabricator-nav.js' => 'b5842a5e', - 'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'ddee74db', + 'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'ba22863c', 'rsrc/js/core/behavior-refresh-csrf.js' => '7814b593', 'rsrc/js/core/behavior-remarkup-preview.js' => 'f7379f45', 'rsrc/js/core/behavior-reorder-applications.js' => 'a8e3795d', @@ -605,7 +602,7 @@ return array( 'javelin-behavior-phabricator-notification-example' => 'c51a6616', 'javelin-behavior-phabricator-object-selector' => 'e6f67523', 'javelin-behavior-phabricator-oncopy' => 'c3e218fe', - 'javelin-behavior-phabricator-remarkup-assist' => 'ddee74db', + 'javelin-behavior-phabricator-remarkup-assist' => 'ba22863c', 'javelin-behavior-phabricator-reveal-content' => '8f24abfc', 'javelin-behavior-phabricator-search-typeahead' => '86549ee3', 'javelin-behavior-phabricator-show-all-transactions' => '7c273581', @@ -718,7 +715,7 @@ return array( 'phabricator-prefab' => '41ed7994', 'phabricator-profile-css' => '33e6f703', 'phabricator-project-tag-css' => '095c9404', - 'phabricator-remarkup-css' => '80c3a48c', + 'phabricator-remarkup-css' => 'b510c359', 'phabricator-search-results-css' => 'f240504c', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-side-menu-view-css' => 'a2ccd7bd', @@ -806,7 +803,6 @@ return array( 'sprite-minicons-css' => 'df4f76fe', 'sprite-payments-css' => 'cc085d44', 'sprite-projects-css' => '7578fa56', - 'sprite-remarkup-css' => '5c396a57', 'sprite-tokens-css' => '1706b943', 'subscribers-list-css' => '5bb30c78', 'syntax-highlighting-css' => '3c18c1cb', @@ -1692,6 +1688,16 @@ return array( 0 => 'javelin-install', 1 => 'javelin-dom', ), + 'ba22863c' => + array( + 0 => 'javelin-behavior', + 1 => 'javelin-stratcom', + 2 => 'javelin-dom', + 3 => 'phabricator-phtize', + 4 => 'phabricator-textareautils', + 5 => 'javelin-workflow', + 6 => 'javelin-vector', + ), 'bc75da74' => array( 0 => 'javelin-behavior', @@ -1905,16 +1911,6 @@ return array( 1 => 'javelin-dom', 2 => 'phabricator-prefab', ), - 'ddee74db' => - array( - 0 => 'javelin-behavior', - 1 => 'javelin-stratcom', - 2 => 'javelin-dom', - 3 => 'phabricator-phtize', - 4 => 'phabricator-textareautils', - 5 => 'javelin-workflow', - 6 => 'javelin-vector', - ), 'e1ff79b1' => array( 0 => 'javelin-behavior', @@ -2132,39 +2128,38 @@ return array( 15 => 'aphront-tooltip-css', 16 => 'phabricator-flag-css', 17 => 'aphront-error-view-css', - 18 => 'sprite-remarkup-css', - 19 => 'sprite-gradient-css', - 20 => 'sprite-menu-css', - 21 => 'sprite-apps-css', - 22 => 'sprite-apps-large-css', - 23 => 'phabricator-main-menu-view', - 24 => 'phabricator-notification-css', - 25 => 'phabricator-notification-menu-css', - 26 => 'lightbox-attachment-css', - 27 => 'phui-header-view-css', - 28 => 'phabricator-filetree-view-css', - 29 => 'phabricator-nav-view-css', - 30 => 'phabricator-side-menu-view-css', - 31 => 'phabricator-crumbs-view-css', - 32 => 'phui-object-item-list-view-css', - 33 => 'global-drag-and-drop-css', - 34 => 'phui-spacing-css', - 35 => 'phui-form-css', - 36 => 'phui-icon-view-css', - 37 => 'phabricator-application-launch-view-css', - 38 => 'phabricator-action-list-view-css', - 39 => 'phui-property-list-view-css', - 40 => 'phui-tag-view-css', - 41 => 'phui-list-view-css', - 42 => 'font-fontawesome', - 43 => 'phui-font-icon-base-css', - 44 => 'sprite-main-header-css', - 45 => 'phui-box-css', - 46 => 'phui-object-box-css', - 47 => 'phui-timeline-view-css', - 48 => 'sprite-tokens-css', - 49 => 'tokens-css', - 50 => 'phui-status-list-view-css', + 18 => 'sprite-gradient-css', + 19 => 'sprite-menu-css', + 20 => 'sprite-apps-css', + 21 => 'sprite-apps-large-css', + 22 => 'phabricator-main-menu-view', + 23 => 'phabricator-notification-css', + 24 => 'phabricator-notification-menu-css', + 25 => 'lightbox-attachment-css', + 26 => 'phui-header-view-css', + 27 => 'phabricator-filetree-view-css', + 28 => 'phabricator-nav-view-css', + 29 => 'phabricator-side-menu-view-css', + 30 => 'phabricator-crumbs-view-css', + 31 => 'phui-object-item-list-view-css', + 32 => 'global-drag-and-drop-css', + 33 => 'phui-spacing-css', + 34 => 'phui-form-css', + 35 => 'phui-icon-view-css', + 36 => 'phabricator-application-launch-view-css', + 37 => 'phabricator-action-list-view-css', + 38 => 'phui-property-list-view-css', + 39 => 'phui-tag-view-css', + 40 => 'phui-list-view-css', + 41 => 'font-fontawesome', + 42 => 'phui-font-icon-base-css', + 43 => 'sprite-main-header-css', + 44 => 'phui-box-css', + 45 => 'phui-object-box-css', + 46 => 'phui-timeline-view-css', + 47 => 'sprite-tokens-css', + 48 => 'tokens-css', + 49 => 'phui-status-list-view-css', ), 'core.pkg.js' => array( diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php index 32c9479f65..bf4b902d64 100644 --- a/resources/celerity/packages.php +++ b/resources/celerity/packages.php @@ -91,7 +91,6 @@ return array( 'phabricator-flag-css', 'aphront-error-view-css', - 'sprite-remarkup-css', 'sprite-gradient-css', 'sprite-menu-css', 'sprite-apps-css', diff --git a/resources/sprite/manifest/remarkup.json b/resources/sprite/manifest/remarkup.json deleted file mode 100644 index b2e98a46c0..0000000000 --- a/resources/sprite/manifest/remarkup.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "version" : 1, - "sprites" : { - "remarkup-assist-none" : { - "name" : "remarkup-assist-none", - "rule" : ".remarkup-assist-", - "hash" : "a7a394dbf21494f2279cc3d528aeb40b" - }, - "remarkup-assist-text_b" : { - "name" : "remarkup-assist-text_b", - "rule" : ".remarkup-assist-b", - "hash" : "ba8a8f8928f2f90e7acd024df8bdee3b" - }, - "remarkup-assist-text_code" : { - "name" : "remarkup-assist-text_code", - "rule" : ".remarkup-assist-code", - "hash" : "b8a03a1004074f0582e77eb4f916b00b" - }, - "remarkup-assist-text_fullscreen" : { - "name" : "remarkup-assist-text_fullscreen", - "rule" : ".remarkup-assist-fullscreen", - "hash" : "63254d9cbe6eadee87d1a28c1d246f9d" - }, - "remarkup-assist-text_fullscreen_off" : { - "name" : "remarkup-assist-text_fullscreen_off", - "rule" : ".remarkup-control-fullscreen-mode .remarkup-assist-fullscreen", - "hash" : "cdcdca0556b6f16b0628684470fc1251" - }, - "remarkup-assist-text_help" : { - "name" : "remarkup-assist-text_help", - "rule" : ".remarkup-assist-help", - "hash" : "106f56bad2932f523cbf1a62ab12b681" - }, - "remarkup-assist-text_i" : { - "name" : "remarkup-assist-text_i", - "rule" : ".remarkup-assist-i", - "hash" : "d9b1a0629d40edd5d32d3e6e21ec1574" - }, - "remarkup-assist-text_image" : { - "name" : "remarkup-assist-text_image", - "rule" : ".remarkup-assist-image", - "hash" : "3e84bf38ccb50c9109dfd78b1711dbb6" - }, - "remarkup-assist-text_larger" : { - "name" : "remarkup-assist-text_larger", - "rule" : ".remarkup-assist-larger", - "hash" : "05909067a2513b9b664b313974643ce3" - }, - "remarkup-assist-text_link" : { - "name" : "remarkup-assist-text_link", - "rule" : ".remarkup-assist-link", - "hash" : "3a6575ca85ddfaa63103d5a8ab80fc09" - }, - "remarkup-assist-text_meme" : { - "name" : "remarkup-assist-text_meme", - "rule" : ".remarkup-assist-meme", - "hash" : "3fa5e69cfc12cd5eba038b48f1efb6c5" - }, - "remarkup-assist-text_ol" : { - "name" : "remarkup-assist-text_ol", - "rule" : ".remarkup-assist-ol", - "hash" : "b1964f62cb2c3cd6ed12bb04522a22c7" - }, - "remarkup-assist-text_table" : { - "name" : "remarkup-assist-text_table", - "rule" : ".remarkup-assist-table", - "hash" : "95fffc501412b323fbdccc98f5bb595c" - }, - "remarkup-assist-text_tag" : { - "name" : "remarkup-assist-text_tag", - "rule" : ".remarkup-assist-tag", - "hash" : "49ed577b1081dd44f60325795468c8ad" - }, - "remarkup-assist-text_tt" : { - "name" : "remarkup-assist-text_tt", - "rule" : ".remarkup-assist-tt", - "hash" : "3c8753b5df23a2a48348cb4ef86b3c02" - }, - "remarkup-assist-text_ul" : { - "name" : "remarkup-assist-text_ul", - "rule" : ".remarkup-assist-ul", - "hash" : "6b1add427c45ed676b9b7f220f16513a" - } - }, - "scales" : [ - 1, - 2 - ], - "header" : "\/**\n * @provides sprite-remarkup-css\n * @generated\n *\/\n\n.sprite-remarkup {\n background-image: url(\/rsrc\/image\/sprite-remarkup.png);\n background-repeat: no-repeat;\n}\n\n@media\nonly screen and (min-device-pixel-ratio: 1.5),\nonly screen and (-webkit-min-device-pixel-ratio: 1.5) {\n .sprite-remarkup {\n background-image: url(\/rsrc\/image\/sprite-remarkup-X2.png);\n background-size: {X}px {Y}px;\n }\n}\n", - "type" : "standard" -} diff --git a/scripts/celerity/generate_sprites.php b/scripts/celerity/generate_sprites.php index b5de26d3b6..63749028d9 100755 --- a/scripts/celerity/generate_sprites.php +++ b/scripts/celerity/generate_sprites.php @@ -27,7 +27,6 @@ $webroot = Filesystem::readablePath($webroot); $generator = new CeleritySpriteGenerator(); $sheets = array( - 'remarkup' => $generator->buildRemarkupSheet(), 'menu' => $generator->buildMenuSheet(), 'apps' => $generator->buildAppsSheet(), 'minicons' => $generator->buildMiniconsSheet(), diff --git a/src/infrastructure/celerity/CeleritySpriteGenerator.php b/src/infrastructure/celerity/CeleritySpriteGenerator.php index 4f82f4b49f..93ade5e33c 100644 --- a/src/infrastructure/celerity/CeleritySpriteGenerator.php +++ b/src/infrastructure/celerity/CeleritySpriteGenerator.php @@ -2,50 +2,6 @@ final class CeleritySpriteGenerator { - public function buildRemarkupSheet() { - - $scales = array( - '1x' => 1, - '2x' => 2, - ); - $sprites = array(); - - $template = id(new PhutilSprite()) - ->setSourceSize(14, 14); - - $remarkup_icons = $this->getDirectoryList('remarkup_1x'); - foreach ($remarkup_icons as $icon) { - $prefix = 'remarkup_'; - - // Strip 'text_' from these file names. - $class_name = substr($icon, 5); - - if ($class_name == 'fullscreen_off') { - $tcss = '.remarkup-control-fullscreen-mode .remarkup-assist-fullscreen'; - } else { - $tcss = '.remarkup-assist-'.$class_name; - } - - $sprite = id(clone $template) - ->setName('remarkup-assist-'.$icon) - ->setTargetCSS($tcss); - - foreach ($scales as $scale_key => $scale) { - $path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png'); - $sprite->setSourceFile($path, $scale); - } - $sprites[] = $sprite; - } - - $sheet = $this->buildSheet('remarkup', true); - $sheet->setScales($scales); - foreach ($sprites as $sprite) { - $sheet->addSprite($sprite); - } - - return $sheet; - } - public function buildMiniconsSheet() { $icons = $this->getDirectoryList('minicons_white_1x'); diff --git a/src/view/form/control/PhabricatorRemarkupControl.php b/src/view/form/control/PhabricatorRemarkupControl.php index 35e49d80e7..ff550299f0 100644 --- a/src/view/form/control/PhabricatorRemarkupControl.php +++ b/src/view/form/control/PhabricatorRemarkupControl.php @@ -43,34 +43,34 @@ final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl { Javelin::initBehavior('phabricator-tooltips', array()); $actions = array( - 'b' => array( + 'fa-bold' => array( 'tip' => pht('Bold'), ), - 'i' => array( + 'fa-italic' => array( 'tip' => pht('Italics'), ), - 'tt' => array( + 'fa-text-width' => array( 'tip' => pht('Monospaced'), ), - 'link' => array( + 'fa-link' => array( 'tip' => pht('Link'), ), array( 'spacer' => true, ), - 'ul' => array( + 'fa-list-ul' => array( 'tip' => pht('Bulleted List'), ), - 'ol' => array( + 'fa-list-ol' => array( 'tip' => pht('Numbered List'), ), - 'code' => array( + 'fa-code' => array( 'tip' => pht('Code Block'), ), - 'table' => array( + 'fa-table' => array( 'tip' => pht('Table'), ), - 'image' => array( + 'fa-cloud-upload' => array( 'tip' => pht('Upload File'), ), ); @@ -79,12 +79,12 @@ final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl { $actions[] = array( 'spacer' => true, ); - $actions['meme'] = array( + $actions['fa-meh-o'] = array( 'tip' => pht('Meme'), ); } - $actions['help'] = array( + $actions['fa-life-bouy'] = array( 'tip' => pht('Help'), 'align' => 'right', 'href' => PhabricatorEnv::getDoclink('Remarkup Reference'), @@ -95,7 +95,7 @@ final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl { 'align' => 'right', ); - $actions['fullscreen'] = array( + $actions['fa-arrows-alt'] = array( 'tip' => pht('Fullscreen Mode'), 'align' => 'right', ); @@ -146,9 +146,6 @@ final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl { $tip); } - require_celerity_resource('sprite-remarkup-css'); - - $buttons[] = javelin_tag( 'a', array( @@ -164,7 +161,7 @@ final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl { 'div', array( 'class' => - 'remarkup-assist sprite-remarkup remarkup-assist-'.$action, + 'remarkup-assist phui-icon-view phui-font-fa bluegrey '.$action, ), $content)); } diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index 7a4c439ea8..53878931bf 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -314,7 +314,7 @@ border-left-color: {$blueborder}; border-right-color: {$blueborder}; border-bottom-color: {$blueborder}; - border-top-color: {$lightblueborder}; + border-top-color: {$thinblueborder}; border-radius: 0; /* Prevent Safari and Chrome users from dragging the textarea any wider, @@ -327,9 +327,7 @@ } .remarkup-assist-bar { - height: 27px; - padding: 0 2px; - + height: 26px; border-width: 1px 1px 0; border-style: solid; border-top-color: {$blueborder}; @@ -342,24 +340,20 @@ .remarkup-assist-button { display: block; - padding: 3px; - margin: 2px 1px; + padding: 5px; float: left; - - border: 1px solid transparent; - border-radius: 2px; } .remarkup-assist-button:hover { - background: #f7f7f7; - border-color: #c6c6c6; - box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.10); + background-color: rgba(100,100,100,.15); +} + +.remarkup-assist-button:hover .phui-icon-view.phui-font-fa { + color: {$darkbluetext}; } .remarkup-assist-button:active { outline: none; - background: #f3f3f3; - box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.10); } .remarkup-assist-button:focus { @@ -392,10 +386,11 @@ } .remarkup-assist { - display: block; width: 14px; height: 14px; overflow: hidden; + text-align: center; + vertical-align: middle; } .remarkup-assist-right { @@ -422,7 +417,7 @@ .remarkup-control-fullscreen-mode textarea.remarkup-assist-textarea { position: absolute; - top: 26px; + top: 27px; left: 0; right: 0; bottom: 0; diff --git a/webroot/rsrc/css/sprite-remarkup.css b/webroot/rsrc/css/sprite-remarkup.css deleted file mode 100644 index 00f6a01354..0000000000 --- a/webroot/rsrc/css/sprite-remarkup.css +++ /dev/null @@ -1,83 +0,0 @@ -/** - * @provides sprite-remarkup-css - * @generated - */ - -.sprite-remarkup { - background-image: url(/rsrc/image/sprite-remarkup.png); - background-repeat: no-repeat; -} - -@media -only screen and (min-device-pixel-ratio: 1.5), -only screen and (-webkit-min-device-pixel-ratio: 1.5) { - .sprite-remarkup { - background-image: url(/rsrc/image/sprite-remarkup-X2.png); - background-size: 60px 60px; - } -} - - -.remarkup-assist- { - background-position: 0px 0px; -} - -.remarkup-assist-b { - background-position: -15px 0px; -} - -.remarkup-assist-code { - background-position: -30px 0px; -} - -.remarkup-assist-fullscreen { - background-position: -45px 0px; -} - -.remarkup-control-fullscreen-mode .remarkup-assist-fullscreen { - background-position: 0px -15px; -} - -.remarkup-assist-help { - background-position: -15px -15px; -} - -.remarkup-assist-i { - background-position: -30px -15px; -} - -.remarkup-assist-image { - background-position: -45px -15px; -} - -.remarkup-assist-larger { - background-position: 0px -30px; -} - -.remarkup-assist-link { - background-position: -15px -30px; -} - -.remarkup-assist-meme { - background-position: -30px -30px; -} - -.remarkup-assist-ol { - background-position: -45px -30px; -} - -.remarkup-assist-table { - background-position: 0px -45px; -} - -.remarkup-assist-tag { - background-position: -15px -45px; -} - -.remarkup-assist-tt { - background-position: -30px -45px; -} - -.remarkup-assist-ul { - background-position: -45px -45px; -} diff --git a/webroot/rsrc/image/sprite-remarkup-X2.png b/webroot/rsrc/image/sprite-remarkup-X2.png deleted file mode 100644 index 5c7065589b550af41ad45ccfe465d12ec933136d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4847 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 U#D!Q<1_lNOPgg&ebxsLQ0OEv91ONa4 diff --git a/webroot/rsrc/image/sprite-remarkup.png b/webroot/rsrc/image/sprite-remarkup.png deleted file mode 100644 index 6cf87b1c6c73db5f688ccaff37e7f7dd87fc59ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2176 zcme7R@N?(olHy`uVBq!ia0y~yV6XvU4rY*ulBNR#1Jm~apAc6D1_o|!?*IS)v$3(U zv$Om9`u_j_zo(~%nVFf5jg5zgM@&rY|Ns9S9321u|7T@oWn*LGCz<&3ybsT&;S4b-`Cfdlao_GKtMu50%GQ>RjVW< zBqSvz7cN}*|NsBm+S=-*cI}Z;J#1?sZc@-5Ei0x`>YUbwV`}gk;4i26m@7}X#&)&UzH8eEN zoH=v#>Qz2IJ|Q8Y`uci^OaA}=FC!xp5D@U;!-tO_KYsf3Nl{Vp;lqcfrl#}f&o?zS zO-f3ttE+Q$b^ZVUzmk#?M3;hsf|{C|wY7CnP*8DkvA@5+i;GKYYHD6yUUG7BdwY99 zL4lv2-{;StWn^SzWo6~$f z%gZY$C@3i@si>%^s;a7~si~{0YiMX_YHDg}X=!U~>*(m{>gww0>FMk18yFZE8ylOL zn3$THnwy(jSXfwET3T6ISzBA%*x1uIyyNyIXgSMxVX5wy1Kc! zxx2f2czAeud3k$#`}p|y`uh6&`v(LB1O^5M1qB5M2Zx7;M@B|QMMcHN#wH{rq^GB6 zW@ct*XXoYR6%-T{7Z;b5l+@MLH8wW3w6t_}b#-@l_xJZtoH%jPq)C$}Po6bv*5bvB zmn~biV#SIzYu4=FzyIXPlV{GHIe-5A#fuj&UAlDn^5wgC?>>9>>>mTee}@16>lyz4 zXZ-*F|9gp9gm- z4!R5iSFc{be*5;_`}ZF{eEb{)UcP?)`t95IA3uJEgRft|e*gXZZ=a_E3j+hod`}n0 z5Rc<$r&iVohYB2b-}o^rP%!$8RKDw;eAhspw^jGe=RF8y)oFiJ`=HjuqpQo^;A)hK zME2#Z%L1N<)Fv*;%!n^OnJSpmp}t6oztLJLE*)I#=NVxvs_MX_ZkEQ->Gw!_IJjGM`+r}T4Z|}R> zF3I-I&i;p3I^XPf-qD&2r)GWgl~>E#k&wA7Z^=#unarY!Y4?xK4Bm6ns>^uAt|jGN zJ06~S|H@6wOI0}i{~y(&|9&@mT*U*P%)io<(PRG2iuW>WG^s!achzfPxQAdX-(Q*bgp2|Gf#%e1(({Buiuu`Kjl=c-c=(R z{dae#%Bfv>Vh7fghS?SRtorbEwXpnH3xQmv`;jcV|ysjaJ&ueQjy{8V{A-HS*?K``4}c zw`|(f=-p9MKP+x+X3h4qX>DE9`0efb#0+P8pdx{~_Qt?7H%_ga)`6i6$3?EBX9IUt@b)bj%$XP?{C^@Z}$TU%2F zlWyv+7RhZfFi42N^boI;)X+p>gL&RH4NGT&vVx7P~u3l^q1n*}4j_cfGv7F(RU z7`%L1O#eBi8+wP$`1&60csol*@P^}@$ro}ec_}bY;*n=SA4F{=>mP@MXR%`<~QHe|G>>O=e;}&+k@FvGP^DY z1P8ZHDX_cWANuFaAH{Qy>!o?c7oL$dnsZ)wm;8^C>~l6&B2v0+j!!S_(GEznQ$1Lz zYO?{b5Z{dvlkdE-PYYOopy@={2EQ9!dy?n=y|k^GRg5J>@Y{i)zvhqn0`^<~-@u)B z_{SsJ)p?%fn*Sfn+N66y{KM{Z+7~u{`(^v8b^6uG-D*?0Cb5UVO?`d#b+wh<^o-Ku z+je^2JvE(k3J1HBd25xB(b{(rbCN^PW7#Fi1+sw z+VAdqdV^U`?-^;~J73o>N{x`-wk*U*wld+v2GgaJUbuwqIUrKIczUkuN*Ak*7uQ@i zZ%&C`pjx)@hB^1wL)RJ)&Y7B2W+i4BtM^=~J($m0qjjz3R0nUv>LVJqRf+$3|FSYy X9kg6k@~M@9fq}u()z4*}Q$iB}((dj= diff --git a/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js b/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js index 5341e2f5da..600568e5cf 100644 --- a/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js +++ b/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js @@ -22,7 +22,7 @@ JX.behavior('phabricator-remarkup-assist', function(config) { // First, disable any active mode. if (edit_root) { - if (edit_mode == 'fullscreen') { + if (edit_mode == 'fa-arrows-alt') { JX.DOM.alterClass(edit_root, 'remarkup-control-fullscreen-mode', false); JX.DOM.alterClass(document.body, 'remarkup-fullscreen-mode', false); } @@ -33,7 +33,7 @@ JX.behavior('phabricator-remarkup-assist', function(config) { edit_mode = mode; // Now, apply the new mode. - if (mode == 'fullscreen') { + if (mode == 'fa-arrows-alt') { JX.DOM.alterClass(edit_root, 'remarkup-control-fullscreen-mode', true); JX.DOM.alterClass(document.body, 'remarkup-fullscreen-mode', true); resizearea(); @@ -46,7 +46,7 @@ JX.behavior('phabricator-remarkup-assist', function(config) { if (!edit_root) { return; } - if (edit_mode != 'fullscreen') { + if (edit_mode != 'fa-arrows-alt') { return; } @@ -71,7 +71,7 @@ JX.behavior('phabricator-remarkup-assist', function(config) { return; } - if (edit_mode != 'fullscreen') { + if (edit_mode != 'fa-arrows-alt') { return; } @@ -101,13 +101,13 @@ JX.behavior('phabricator-remarkup-assist', function(config) { var r = JX.TextAreaUtils.getSelectionRange(area); switch (action) { - case 'b': + case 'fa-bold': update(area, '**', sel || pht('bold text'), '**'); break; - case 'i': + case 'fa-italic': update(area, '//', sel || pht('italic text'), '//'); break; - case 'link': + case 'fa-link': var name = pht('name'); if (/^https?:/i.test(sel)) { update(area, '[[ ' + sel + ' | ', name, ' ]]'); @@ -115,12 +115,12 @@ JX.behavior('phabricator-remarkup-assist', function(config) { update(area, '[[ ', pht('URL'), ' | ' + (sel || name) + ' ]]'); } break; - case 'tt': + case 'fa-text-width': update(area, '`', sel || pht('monospaced text'), '`'); break; - case 'ul': - case 'ol': - var ch = (action == 'ol') ? ' # ' : ' - '; + case 'fa-list-ul': + case 'fa-list-ol': + var ch = (action == 'fa-list-ol') ? ' # ' : ' - '; if (sel) { sel = sel.split("\n"); } else { @@ -129,16 +129,16 @@ JX.behavior('phabricator-remarkup-assist', function(config) { sel = sel.join("\n" + ch); update(area, ((r.start === 0) ? "" : "\n\n") + ch, sel, "\n\n"); break; - case 'code': + case 'fa-code': sel = sel || "foreach ($list as $item) {\n work_miracles($item);\n}"; var prefix = (r.start === 0) ? "" : "\n"; update(area, prefix + "```\n", sel, "\n```"); break; - case 'table': + case 'fa-table': var prefix = (r.start === 0 ? '' : '\n\n'); update(area, prefix + '| ', sel || pht('data'), ' |'); break; - case 'meme': + case 'fa-meh-o': new JX.Workflow('/macro/meme/create/') .setHandler(function(response) { update( @@ -149,14 +149,14 @@ JX.behavior('phabricator-remarkup-assist', function(config) { }) .start(); break; - case 'image': + case 'fa-cloud-upload': new JX.Workflow('/file/uploaddialog/').start(); break; - case 'fullscreen': - if (edit_mode == 'fullscreen') { + case 'fa-arrows-alt': + if (edit_mode == 'fa-arrows-alt') { set_edit_mode(root, 'normal'); } else { - set_edit_mode(root, 'fullscreen'); + set_edit_mode(root, 'fa-arrows-alt'); } break; }