@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Allow buttons to just be icons

Summary: Let's buttons just be an icon, no pressure to also have text.

Test Plan: UIExamples, Search, Home, Policy Controls... Probably 99% of them.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18056

+52 -30
+14 -14
resources/celerity/map.php
··· 9 9 'names' => array( 10 10 'conpherence.pkg.css' => 'ff161f2d', 11 11 'conpherence.pkg.js' => 'b5b51108', 12 - 'core.pkg.css' => '0c6e11ed', 12 + 'core.pkg.css' => 'eb39b754', 13 13 'core.pkg.js' => '1475bd91', 14 14 'darkconsole.pkg.js' => '1f9a31bc', 15 15 'differential.pkg.css' => 'a2755617', ··· 39 39 'rsrc/css/aphront/typeahead.css' => '8a84cc7d', 40 40 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 41 41 'rsrc/css/application/auth/auth.css' => '0877ed6e', 42 - 'rsrc/css/application/base/main-menu-view.css' => 'de9fe8c4', 42 + 'rsrc/css/application/base/main-menu-view.css' => '16053029', 43 43 'rsrc/css/application/base/notification-menu.css' => '6a697e43', 44 44 'rsrc/css/application/base/phui-theme.css' => '9f261c6b', 45 45 'rsrc/css/application/base/standard-page-view.css' => 'eb5b80c5', ··· 140 140 'rsrc/css/phui/phui-basic-nav-view.css' => 'a0705f53', 141 141 'rsrc/css/phui/phui-big-info-view.css' => 'bd903741', 142 142 'rsrc/css/phui/phui-box.css' => '269cbc99', 143 - 'rsrc/css/phui/phui-button.css' => 'e14854c3', 143 + 'rsrc/css/phui/phui-button.css' => '7ffbeee7', 144 144 'rsrc/css/phui/phui-chart.css' => '6bf6f78e', 145 145 'rsrc/css/phui/phui-cms.css' => '504b4b23', 146 146 'rsrc/css/phui/phui-comment-form.css' => '57af2e14', ··· 524 524 'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8', 525 525 'rsrc/js/phuix/PHUIXActionView.js' => 'b3465b9b', 526 526 'rsrc/js/phuix/PHUIXAutocomplete.js' => 'f6699267', 527 - 'rsrc/js/phuix/PHUIXButtonView.js' => 'da1c2a6b', 527 + 'rsrc/js/phuix/PHUIXButtonView.js' => '0f13520b', 528 528 'rsrc/js/phuix/PHUIXDropdownMenu.js' => '8018ee50', 529 529 'rsrc/js/phuix/PHUIXExample.js' => '68af71ca', 530 530 'rsrc/js/phuix/PHUIXFormControl.js' => '83e03671', ··· 783 783 'phabricator-flag-css' => 'bba8f811', 784 784 'phabricator-keyboard-shortcut' => '1ae869f2', 785 785 'phabricator-keyboard-shortcut-manager' => 'c19dd9b9', 786 - 'phabricator-main-menu-view' => 'de9fe8c4', 786 + 'phabricator-main-menu-view' => '16053029', 787 787 'phabricator-nav-view-css' => 'faf6a6fc', 788 788 'phabricator-notification' => 'ccf1cbf8', 789 789 'phabricator-notification-css' => '3f6c89c9', ··· 817 817 'phui-basic-nav-view-css' => 'a0705f53', 818 818 'phui-big-info-view-css' => 'bd903741', 819 819 'phui-box-css' => '269cbc99', 820 - 'phui-button-css' => 'e14854c3', 820 + 'phui-button-css' => '7ffbeee7', 821 821 'phui-calendar-css' => '477acfaa', 822 822 'phui-calendar-day-css' => '572b1893', 823 823 'phui-calendar-list-css' => '576be600', ··· 874 874 'phuix-action-list-view' => 'b5c256b8', 875 875 'phuix-action-view' => 'b3465b9b', 876 876 'phuix-autocomplete' => 'f6699267', 877 - 'phuix-button-view' => 'da1c2a6b', 877 + 'phuix-button-view' => '0f13520b', 878 878 'phuix-dropdown-menu' => '8018ee50', 879 879 'phuix-form-control-view' => '83e03671', 880 880 'phuix-icon-view' => 'bff6884b', ··· 953 953 'javelin-dom', 954 954 'javelin-router', 955 955 ), 956 + '0f13520b' => array( 957 + 'javelin-install', 958 + 'javelin-dom', 959 + ), 956 960 '0f764c35' => array( 957 961 'javelin-install', 958 962 'javelin-util', ··· 968 972 'javelin-stratcom', 969 973 'javelin-dom', 970 974 'javelin-history', 975 + ), 976 + 16053029 => array( 977 + 'phui-theme-css', 971 978 ), 972 979 '17bb8539' => array( 973 980 'javelin-behavior', ··· 2004 2011 'javelin-util', 2005 2012 'phabricator-shaped-request', 2006 2013 ), 2007 - 'da1c2a6b' => array( 2008 - 'javelin-install', 2009 - 'javelin-dom', 2010 - ), 2011 2014 'de2e896f' => array( 2012 2015 'javelin-behavior', 2013 2016 'javelin-dom', 2014 2017 'javelin-typeahead', 2015 2018 'javelin-typeahead-ondemand-source', 2016 2019 'javelin-dom', 2017 - ), 2018 - 'de9fe8c4' => array( 2019 - 'phui-theme-css', 2020 2020 ), 2021 2021 'e0ec7f2f' => array( 2022 2022 'javelin-behavior',
+12
src/applications/uiexample/examples/PHUIButtonExample.php
··· 123 123 'icon' => 'fa-exclamation-triangle', 124 124 ), 125 125 array( 126 + 'icon' => 'fa-rocket', 127 + ), 128 + array( 129 + 'icon' => 'fa-clipboard', 130 + ), 131 + array( 132 + 'icon' => 'fa-upload', 133 + ), 134 + array( 135 + 'icon' => 'fa-street-view', 136 + ), 137 + array( 126 138 'text' => pht('Copy "Quack" to Clipboard'), 127 139 'icon' => 'fa-clipboard', 128 140 'copy' => pht('Quack'),
+1 -1
src/view/form/control/AphrontFormPolicyControl.php
··· 324 324 javelin_tag( 325 325 'a', 326 326 array( 327 - 'class' => 'grey button dropdown has-icon policy-control', 327 + 'class' => 'grey button dropdown has-icon has-text policy-control', 328 328 'href' => '#', 329 329 'mustcapture' => true, 330 330 'sigil' => 'policy-control',
+21 -3
src/view/phui/PHUIButtonView.php
··· 174 174 $classes[] = 'has-icon'; 175 175 } 176 176 177 + if (strlen($this->text)) { 178 + $classes[] = 'has-text'; 179 + } 180 + 177 181 if ($this->iconFirst == false) { 178 182 $classes[] = 'icon-last'; 179 183 } ··· 226 230 $subtext = null; 227 231 if ($this->subtext) { 228 232 $subtext = phutil_tag( 229 - 'div', array('class' => 'phui-button-subtext'), $this->subtext); 233 + 'div', 234 + array( 235 + 'class' => 'phui-button-subtext', 236 + ), 237 + $this->subtext); 230 238 } 231 - $text = phutil_tag( 232 - 'div', array('class' => 'phui-button-text'), array($text, $subtext)); 239 + 240 + if (strlen($this->text)) { 241 + $text = phutil_tag( 242 + 'div', 243 + array( 244 + 'class' => 'phui-button-text', 245 + ), 246 + array( 247 + $text, 248 + $subtext, 249 + )); 250 + } 233 251 } 234 252 235 253 $caret = null;
+1
webroot/rsrc/css/application/base/main-menu-view.css
··· 247 247 font-size: 15px; 248 248 top: 4px; 249 249 left: 8px; 250 + position: absolute; 250 251 } 251 252 252 253 .phabricator-main-menu-search-dropdown .caret {
+2 -12
webroot/rsrc/css/phui/phui-button.css
··· 41 41 font-weight: bold; 42 42 font-size: {$normalfontsize}; 43 43 display: inline-block; 44 - padding: 4px 16px 5px; 44 + padding: 4px 14px 5px; 45 45 text-align: center; 46 46 white-space: nowrap; 47 47 border-radius: 3px; ··· 301 301 position: relative; 302 302 } 303 303 304 - .button .phui-icon-view { 304 + .button.has-text .phui-icon-view { 305 305 display: inline-block; 306 306 position: absolute; 307 307 top: 7px; ··· 311 311 .button.icon-last .phui-icon-view { 312 312 left: auto; 313 313 right: 10px; 314 - } 315 - 316 - .phui-button-bar .button .phui-icon-view { 317 - left: 14px; 318 314 } 319 315 320 316 .button.has-icon .phui-button-text { ··· 372 368 373 369 .phui-button-bar-borderless .button { 374 370 border: 0; 375 - } 376 - 377 - .phui-button-bar a.button.has-icon { 378 - display: inline-block; 379 - height: 18px; 380 - width: 6px; 381 371 } 382 372 383 373 .phui-button-bar .phui-button-bar-first {
+1
webroot/rsrc/js/phuix/PHUIXButtonView.js
··· 102 102 } 103 103 104 104 JX.DOM.alterClass(node, 'has-icon', !!icon); 105 + JX.DOM.alterClass(node, 'has-text', !!text); 105 106 JX.DOM.setContent(node, content); 106 107 } 107 108 }