recaptime.dev / phorge
@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.

Separate button CSS classes

Summary: Try to dis-ambiguate various button types and colors. Moves `simple` to `phui-button-simple` and moves colors to `button-color`.

Test Plan: Grep for buttons still inline, UIExamples, PHUIX, Herald, and Email Preferences.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

authored by

Chad Little and committed by
chad d3c464a6 9773dc0e

+146 -200
+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' => '5284a0e0', 12 + 'core.pkg.css' => '1a935531', 13 13 'core.pkg.js' => '1475bd91', 14 14 'darkconsole.pkg.js' => '1f9a31bc', 15 15 'differential.pkg.css' => '1ccbf3a9', ··· 125 125 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 126 126 'rsrc/css/layout/phabricator-source-code-view.css' => '4383192f', 127 127 'rsrc/css/phui/button/phui-button-bar.css' => '39fe680c', 128 - 'rsrc/css/phui/button/phui-button-simple.css' => '081cfeea', 129 - 'rsrc/css/phui/button/phui-button.css' => '9f13ddcc', 128 + 'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68', 129 + 'rsrc/css/phui/button/phui-button.css' => '022581b4', 130 130 'rsrc/css/phui/calendar/phui-calendar-day.css' => '572b1893', 131 131 'rsrc/css/phui/calendar/phui-calendar-list.css' => '576be600', 132 132 'rsrc/css/phui/calendar/phui-calendar-month.css' => '8e10e92c', ··· 526 526 'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8', 527 527 'rsrc/js/phuix/PHUIXActionView.js' => 'b3465b9b', 528 528 'rsrc/js/phuix/PHUIXAutocomplete.js' => 'f6699267', 529 - 'rsrc/js/phuix/PHUIXButtonView.js' => 'b3c515be', 529 + 'rsrc/js/phuix/PHUIXButtonView.js' => 'a37126bd', 530 530 'rsrc/js/phuix/PHUIXDropdownMenu.js' => '8018ee50', 531 531 'rsrc/js/phuix/PHUIXExample.js' => '68af71ca', 532 532 'rsrc/js/phuix/PHUIXFormControl.js' => '83e03671', ··· 820 820 'phui-big-info-view-css' => 'bd903741', 821 821 'phui-box-css' => '269cbc99', 822 822 'phui-button-bar-css' => '39fe680c', 823 - 'phui-button-css' => '9f13ddcc', 824 - 'phui-button-simple-css' => '081cfeea', 823 + 'phui-button-css' => '022581b4', 824 + 'phui-button-simple-css' => '8e1baf68', 825 825 'phui-calendar-css' => '477acfaa', 826 826 'phui-calendar-day-css' => '572b1893', 827 827 'phui-calendar-list-css' => '576be600', ··· 878 878 'phuix-action-list-view' => 'b5c256b8', 879 879 'phuix-action-view' => 'b3465b9b', 880 880 'phuix-autocomplete' => 'f6699267', 881 - 'phuix-button-view' => 'b3c515be', 881 + 'phuix-button-view' => 'a37126bd', 882 882 'phuix-dropdown-menu' => '8018ee50', 883 883 'phuix-form-control-view' => '83e03671', 884 884 'phuix-icon-view' => 'bff6884b', ··· 936 936 'javelin-stratcom', 937 937 'javelin-workflow', 938 938 ), 939 - '081cfeea' => array( 940 - 'phui-button-css', 941 - ), 942 939 '0825c27a' => array( 943 940 'javelin-behavior', 944 941 'javelin-dom', ··· 1561 1558 'javelin-stratcom', 1562 1559 'javelin-install', 1563 1560 ), 1561 + '8e1baf68' => array( 1562 + 'phui-button-css', 1563 + ), 1564 1564 '8ff5e24c' => array( 1565 1565 'javelin-behavior', 1566 1566 'javelin-stratcom', ··· 1650 1650 'javelin-workflow', 1651 1651 'javelin-util', 1652 1652 'phabricator-keyboard-shortcut', 1653 + ), 1654 + 'a37126bd' => array( 1655 + 'javelin-install', 1656 + 'javelin-dom', 1653 1657 ), 1654 1658 'a3a63478' => array( 1655 1659 'phui-workcard-view-css', ··· 1767 1771 'b3a4b884' => array( 1768 1772 'javelin-behavior', 1769 1773 'phabricator-prefab', 1770 - ), 1771 - 'b3c515be' => array( 1772 - 'javelin-install', 1773 - 'javelin-dom', 1774 1774 ), 1775 1775 'b3e7d692' => array( 1776 1776 'javelin-install',
+2 -2
src/applications/almanac/controller/AlmanacController.php
··· 84 84 'a', 85 85 array( 86 86 'class' => ($can_edit 87 - ? 'button grey small' 88 - : 'button grey small disabled'), 87 + ? 'button button-grey small' 88 + : 'button button-grey small disabled'), 89 89 'sigil' => 'workflow', 90 90 'href' => $delete_uri, 91 91 ),
+1 -1
src/applications/almanac/view/AlmanacBindingTableView.php
··· 77 77 phutil_tag( 78 78 'a', 79 79 array( 80 - 'class' => 'small grey button', 80 + 'class' => 'small button button-grey', 81 81 'href' => '/almanac/binding/'.$binding->getID().'/', 82 82 ), 83 83 pht('Details')),
+2 -2
src/applications/almanac/view/AlmanacInterfaceTableView.php
··· 30 30 $can_edit = $this->getCanEdit(); 31 31 32 32 if ($can_edit) { 33 - $button_class = 'small grey button'; 33 + $button_class = 'small button button-grey'; 34 34 } else { 35 - $button_class = 'small grey button disabled'; 35 + $button_class = 'small button button-grey disabled'; 36 36 } 37 37 38 38 $handles = $viewer->loadHandles(mpull($interfaces, 'getNetworkPHID'));
+1 -1
src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
··· 60 60 javelin_tag( 61 61 'a', 62 62 array( 63 - 'class' => 'button small grey', 63 + 'class' => 'button small button-grey', 64 64 'href' => '/conduit/token/terminate/'.$token->getID().'/', 65 65 'sigil' => 'workflow', 66 66 ),
+3 -3
src/applications/config/view/PhabricatorSetupIssueView.php
··· 129 129 array( 130 130 'href' => '/config/unignore/'.$issue->getIssueKey().'/', 131 131 'sigil' => 'workflow', 132 - 'class' => 'button grey', 132 + 'class' => 'button button-grey', 133 133 ), 134 134 pht('Unignore Setup Issue')); 135 135 } else { ··· 138 138 array( 139 139 'href' => '/config/ignore/'.$issue->getIssueKey().'/', 140 140 'sigil' => 'workflow', 141 - 'class' => 'button grey', 141 + 'class' => 'button button-grey', 142 142 ), 143 143 pht('Ignore Setup Issue')); 144 144 } ··· 147 147 'a', 148 148 array( 149 149 'href' => '/config/issue/'.$issue->getIssueKey().'/', 150 - 'class' => 'button grey', 150 + 'class' => 'button button-grey', 151 151 'style' => 'float: right', 152 152 ), 153 153 pht('Reload Page'));
+1 -1
src/applications/conpherence/controller/ConpherenceController.php
··· 140 140 'button', 141 141 array( 142 142 'type' => 'SUBMIT', 143 - 'class' => 'button green mlr', 143 + 'class' => 'button button-green mlr', 144 144 ), 145 145 pht('Join Room')); 146 146
+1 -1
src/applications/conpherence/view/ConpherenceDurableColumnView.php
··· 404 404 'a', 405 405 array( 406 406 'href' => '/conpherence/search/', 407 - 'class' => 'button grey', 407 + 'class' => 'button button-grey', 408 408 ), 409 409 pht('Find Rooms')), 410 410 );
+2 -1
src/applications/console/plugin/DarkConsoleServicesPlugin.php
··· 170 170 'a', 171 171 array( 172 172 'href' => $data['analyzeURI'], 173 - 'class' => $data['didAnalyze'] ? 'disabled button' : 'green button', 173 + 'class' => $data['didAnalyze'] ? 174 + 'disabled button' : 'button button-green', 174 175 ), 175 176 pht('Analyze Query Plans')), 176 177 phutil_tag('h1', array(), pht('Calls to External Services')),
+1 -1
src/applications/console/plugin/DarkConsoleXHProfPlugin.php
··· 67 67 'a', 68 68 array( 69 69 'href' => $profile_uri, 70 - 'class' => $run ? 'disabled button' : 'green button', 70 + 'class' => $run ? 'disabled button' : 'button button-green', 71 71 ), 72 72 pht('Profile Page')), 73 73 phutil_tag('h1', array(), pht('XHProf Profiler')),
+1 -1
src/applications/daemon/view/PhabricatorDaemonTasksTableView.php
··· 41 41 'a', 42 42 array( 43 43 'href' => '/daemon/task/'.$task->getID().'/', 44 - 'class' => 'button small grey', 44 + 'class' => 'button small button-grey', 45 45 ), 46 46 pht('View Task')), 47 47 );
+1 -1
src/applications/differential/controller/DifferentialRevisionViewController.php
··· 156 156 phutil_tag( 157 157 'a', 158 158 array( 159 - 'class' => 'button grey', 159 + 'class' => 'button button-grey', 160 160 'href' => $request_uri 161 161 ->alter('large', 'true') 162 162 ->setFragment('toc'),
+1 -1
src/applications/differential/view/DifferentialChangesetListView.php
··· 174 174 $load = javelin_tag( 175 175 'a', 176 176 array( 177 - 'class' => 'button grey', 177 + 'class' => 'button button-grey', 178 178 'href' => '#'.$uniq_id, 179 179 'sigil' => 'differential-load', 180 180 'meta' => array(
+1 -1
src/applications/files/controller/PhabricatorFileTransformListController.php
··· 68 68 $view_link = phutil_tag( 69 69 'a', 70 70 array( 71 - 'class' => 'small grey button', 71 + 'class' => 'small button button-grey', 72 72 'href' => $view_href, 73 73 ), 74 74 $view_text);
+2 -2
src/applications/herald/controller/HeraldRuleController.php
··· 191 191 'a', 192 192 array( 193 193 'href' => '#', 194 - 'class' => 'button green', 194 + 'class' => 'button button-green', 195 195 'sigil' => 'create-condition', 196 196 'mustcapture' => true, 197 197 ), ··· 212 212 'a', 213 213 array( 214 214 'href' => '#', 215 - 'class' => 'button green', 215 + 'class' => 'button button-green', 216 216 'sigil' => 'create-action', 217 217 'mustcapture' => true, 218 218 ),
+1 -1
src/applications/maniphest/controller/ManiphestBatchEditController.php
··· 173 173 'a', 174 174 array( 175 175 'href' => '#', 176 - 'class' => 'button green', 176 + 'class' => 'button button-green', 177 177 'sigil' => 'add-action', 178 178 'mustcapture' => true, 179 179 ),
+3 -3
src/applications/maniphest/view/ManiphestTaskResultListView.php
··· 196 196 array( 197 197 'href' => '#', 198 198 'mustcapture' => true, 199 - 'class' => 'grey button', 199 + 'class' => 'button button-grey', 200 200 'id' => 'batch-select-all', 201 201 ), 202 202 pht('Select All')); ··· 206 206 array( 207 207 'href' => '#', 208 208 'mustcapture' => true, 209 - 'class' => 'grey button', 209 + 'class' => 'button button-grey', 210 210 'id' => 'batch-select-none', 211 211 ), 212 212 pht('Clear Selection')); ··· 224 224 'a', 225 225 array( 226 226 'href' => '/maniphest/export/'.$saved_query->getQueryKey().'/', 227 - 'class' => 'grey button', 227 + 'class' => 'button button-grey', 228 228 ), 229 229 pht('Export to Excel')); 230 230
+2 -2
src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
··· 341 341 $button_edit = javelin_tag( 342 342 'a', 343 343 array( 344 - 'class' => 'button small grey', 344 + 'class' => 'button small button-grey', 345 345 'href' => $uri->alter('edit', $email->getID()), 346 346 'sigil' => 'workflow', 347 347 ), ··· 350 350 $button_remove = javelin_tag( 351 351 'a', 352 352 array( 353 - 'class' => 'button small grey', 353 + 'class' => 'button small button-grey', 354 354 'href' => $uri->alter('delete', $email->getID()), 355 355 'sigil' => 'workflow', 356 356 ),
+1 -1
src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
··· 87 87 'a', 88 88 array( 89 89 'href' => $this->getPanelURI('?revoke='.$authorization->getID()), 90 - 'class' => 'small grey button', 90 + 'class' => 'small button button-grey', 91 91 'sigil' => 'workflow', 92 92 ), 93 93 pht('Revoke'));
+1 -1
src/applications/owners/controller/PhabricatorOwnersPathsController.php
··· 124 124 'a', 125 125 array( 126 126 'href' => '#', 127 - 'class' => 'button green', 127 + 'class' => 'button button-green', 128 128 'sigil' => 'addpath', 129 129 'mustcapture' => true, 130 130 ),
+1 -1
src/applications/passphrase/view/PassphraseCredentialControl.php
··· 113 113 'a', 114 114 array( 115 115 'href' => '#', 116 - 'class' => 'button grey', 116 + 'class' => 'button button-grey', 117 117 'sigil' => 'passphrase-credential-add', 118 118 'mustcapture' => true, 119 119 ),
+1 -1
src/applications/pholio/view/PholioUploadedImageView.php
··· 120 120 return javelin_tag( 121 121 'a', 122 122 array( 123 - 'class' => 'button grey', 123 + 'class' => 'button button-grey', 124 124 'sigil' => 'pholio-drop-remove', 125 125 ), 126 126 'X');
+1 -1
src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
··· 152 152 $new_method = javelin_tag( 153 153 'a', 154 154 array( 155 - 'class' => 'button grey', 155 + 'class' => 'button button-grey', 156 156 'href' => $payment_method_uri, 157 157 ), 158 158 pht('Add New Payment Method'));
+1 -1
src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
··· 123 123 'a', 124 124 array( 125 125 'href' => $uri, 126 - 'class' => 'button grey', 126 + 'class' => 'button button-grey', 127 127 ), 128 128 pht('Add Payment Method...')); 129 129
+1 -1
src/applications/phortune/view/PhortuneOrderTableView.php
··· 101 101 'a', 102 102 array( 103 103 'href' => $cart->getCheckoutURI(), 104 - 'class' => 'small green button', 104 + 'class' => 'small button button-green', 105 105 ), 106 106 pht('Pay Now')), 107 107 );
+6 -6
src/applications/phriction/controller/PhrictionDiffController.php
··· 103 103 'a', 104 104 array( 105 105 'href' => $uri->alter('l', $l - 1)->alter('r', $r - 1), 106 - 'class' => 'button grey', 106 + 'class' => 'button button-grey', 107 107 ), 108 108 pht("\xC2\xAB Previous Change")); 109 109 } else { ··· 111 111 'a', 112 112 array( 113 113 'href' => '#', 114 - 'class' => 'button grey disabled', 114 + 'class' => 'button button-grey disabled', 115 115 ), 116 116 pht('Original Change')); 117 117 } ··· 122 122 'a', 123 123 array( 124 124 'href' => $uri->alter('l', $l + 1)->alter('r', $r + 1), 125 - 'class' => 'button grey', 125 + 'class' => 'button button-grey', 126 126 ), 127 127 pht("Next Change \xC2\xBB")); 128 128 } else { ··· 130 130 'a', 131 131 array( 132 132 'href' => '#', 133 - 'class' => 'button grey disabled', 133 + 'class' => 'button button-grey disabled', 134 134 ), 135 135 pht('Most Recent Change')); 136 136 } ··· 200 200 'a', 201 201 array( 202 202 'href' => '/phriction/edit/'.$document_id.'/', 203 - 'class' => 'button grey', 203 + 'class' => 'button button-grey', 204 204 ), 205 205 pht('Edit Current Version')); 206 206 } ··· 210 210 'a', 211 211 array( 212 212 'href' => '/phriction/edit/'.$document_id.'/?revert='.$version, 213 - 'class' => 'button grey', 213 + 'class' => 'button button-grey', 214 214 ), 215 215 pht('Revert to Version %s...', $version)); 216 216 }
+1 -1
src/applications/policy/controller/PhabricatorPolicyEditController.php
··· 199 199 'a', 200 200 array( 201 201 'href' => '#', 202 - 'class' => 'button green', 202 + 'class' => 'button button-green', 203 203 'sigil' => 'create-rule', 204 204 'mustcapture' => true, 205 205 ),
+3 -3
src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
··· 63 63 $button_verify = javelin_tag( 64 64 'a', 65 65 array( 66 - 'class' => 'button small grey', 66 + 'class' => 'button small button-grey', 67 67 'href' => $uri->alter('verify', $email->getID()), 68 68 'sigil' => 'workflow', 69 69 ), ··· 72 72 $button_make_primary = javelin_tag( 73 73 'a', 74 74 array( 75 - 'class' => 'button small grey', 75 + 'class' => 'button small button-grey', 76 76 'href' => $uri->alter('primary', $email->getID()), 77 77 'sigil' => 'workflow', 78 78 ), ··· 81 81 $button_remove = javelin_tag( 82 82 'a', 83 83 array( 84 - 'class' => 'button small grey', 84 + 'class' => 'button small button-grey', 85 85 'href' => $uri->alter('delete', $email->getID()), 86 86 'sigil' => 'workflow', 87 87 ),
+1 -1
src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
··· 69 69 array( 70 70 'href' => $this->getPanelURI('?delete='.$factor->getID()), 71 71 'sigil' => 'workflow', 72 - 'class' => 'small grey button', 72 + 'class' => 'small button button-grey', 73 73 ), 74 74 pht('Remove')), 75 75 );
+2 -2
src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
··· 58 58 $button = phutil_tag( 59 59 'a', 60 60 array( 61 - 'class' => 'small grey button disabled', 61 + 'class' => 'small button button-grey disabled', 62 62 ), 63 63 pht('Current')); 64 64 } else { ··· 67 67 'a', 68 68 array( 69 69 'href' => '/auth/session/terminate/'.$session->getID().'/', 70 - 'class' => 'small grey button', 70 + 'class' => 'small button button-grey', 71 71 'sigil' => 'workflow', 72 72 ), 73 73 pht('Terminate'));
+2 -2
src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
··· 30 30 'a', 31 31 array( 32 32 'href' => '/auth/token/revoke/'.$token->getID().'/', 33 - 'class' => 'small grey button', 33 + 'class' => 'small button button-grey', 34 34 'sigil' => 'workflow', 35 35 ), 36 36 pht('Revoke')); ··· 38 38 $button = javelin_tag( 39 39 'a', 40 40 array( 41 - 'class' => 'small grey button disabled', 41 + 'class' => 'small button button-grey disabled', 42 42 ), 43 43 pht('Revoke')); 44 44 }
+8 -65
src/applications/uiexample/examples/PHUIButtonExample.php
··· 16 16 $request = $this->getRequest(); 17 17 $user = $request->getUser(); 18 18 19 - $colors = array('', 'green', 'grey', 'disabled'); 20 - $sizes = array('', 'small'); 21 - $tags = array('a', 'button'); 22 - 23 - // phutil_tag 24 - 25 - $column = array(); 26 - foreach ($tags as $tag) { 27 - foreach ($colors as $color) { 28 - foreach ($sizes as $key => $size) { 29 - $class = implode(' ', array($color, $size)); 30 - 31 - if ($tag == 'a') { 32 - $class .= ' button'; 33 - } 34 - 35 - $column[$key][] = phutil_tag( 36 - $tag, 37 - array( 38 - 'class' => $class, 39 - ), 40 - phutil_utf8_ucwords($size.' '.$color.' '.$tag)); 41 - 42 - $column[$key][] = hsprintf('<br /><br />'); 43 - } 44 - } 45 - } 46 - 47 - $column3 = array(); 48 - foreach ($colors as $color) { 49 - $caret = phutil_tag('span', array('class' => 'caret'), ''); 50 - $column3[] = phutil_tag( 51 - 'a', 52 - array( 53 - 'class' => $color.' button dropdown', 54 - ), 55 - array( 56 - phutil_utf8_ucwords($color.' Dropdown'), 57 - $caret, 58 - )); 59 - $column3[] = hsprintf('<br /><br />'); 60 - } 61 - 62 - $layout1 = id(new AphrontMultiColumnView()) 63 - ->addColumn($column[0]) 64 - ->addColumn($column[1]) 65 - ->addColumn($column3) 66 - ->setFluidLayout(true) 67 - ->setGutter(AphrontMultiColumnView::GUTTER_MEDIUM); 68 - 69 19 // PHUIButtonView 70 - 71 20 $colors = array( 72 21 null, 73 22 PHUIButtonView::GREEN, 74 23 PHUIButtonView::GREY, 75 - PHUIButtonView::DISABLED, 76 24 ); 77 25 $sizes = array(null, PHUIButtonView::SMALL); 78 26 $column = array(); ··· 223 171 224 172 // Set it and forget it 225 173 226 - $head1 = id(new PHUIHeaderView()) 227 - ->setHeader('phutil_tag'); 228 - 229 174 $head2 = id(new PHUIHeaderView()) 230 - ->setHeader('PHUIButtonView'); 175 + ->setHeader('PHUIButtonView') 176 + ->addClass('ml'); 231 177 232 178 $head3 = id(new PHUIHeaderView()) 233 - ->setHeader(pht('Icon Buttons')); 179 + ->setHeader(pht('Icon Buttons')) 180 + ->addClass('ml'); 234 181 235 182 $head4 = id(new PHUIHeaderView()) 236 - ->setHeader(pht('Simple Buttons')); 183 + ->setHeader(pht('Simple Buttons')) 184 + ->addClass('ml'); 237 185 238 186 $head5 = id(new PHUIHeaderView()) 239 - ->setHeader(pht('Big Icon Buttons')); 240 - 241 - $wrap1 = id(new PHUIBoxView()) 242 - ->appendChild($layout1) 243 - ->addMargin(PHUI::MARGIN_LARGE); 187 + ->setHeader(pht('Big Icon Buttons')) 188 + ->addClass('ml'); 244 189 245 190 $wrap2 = id(new PHUIBoxView()) 246 191 ->appendChild($layout2) ··· 259 204 ->addMargin(PHUI::MARGIN_LARGE); 260 205 261 206 return array( 262 - $head1, 263 - $wrap1, 264 207 $head2, 265 208 $wrap2, 266 209 $head3,
+1 -1
src/applications/uiexample/examples/PHUIColorPalletteExample.php
··· 101 101 'a', 102 102 array( 103 103 'href' => 'http://color.hailpixel.com/#'.implode(',', $url), 104 - 'class' => 'button grey mlb', 104 + 'class' => 'button button-grey mlb', 105 105 ), 106 106 pht('Color Palette')); 107 107
+1 -1
src/applications/uiexample/examples/PhabricatorNotificationUIExample.php
··· 24 24 'a', 25 25 array( 26 26 'sigil' => 'notification-example', 27 - 'class' => 'button green', 27 + 'class' => 'button button-green', 28 28 ), 29 29 pht('Show Notification')); 30 30
+1 -1
src/view/AphrontDialogView.php
··· 248 248 'a', 249 249 array( 250 250 'href' => $this->cancelURI, 251 - 'class' => 'button grey', 251 + 'class' => 'button button-grey', 252 252 'name' => '__cancel__', 253 253 'sigil' => 'jx-workflow-button', 254 254 'meta' => $meta,
+2 -1
src/view/form/control/AphrontFormPolicyControl.php
··· 324 324 javelin_tag( 325 325 'a', 326 326 array( 327 - 'class' => 'grey button dropdown has-icon has-text policy-control', 327 + 'class' => 'button button-grey dropdown has-icon has-text '. 328 + 'policy-control', 328 329 'href' => '#', 329 330 'mustcapture' => true, 330 331 'sigil' => 'policy-control',
+1 -1
src/view/form/control/PHUIFormIconSetControl.php
··· 30 30 31 31 $classes = array(); 32 32 $classes[] = 'button'; 33 - $classes[] = 'grey'; 33 + $classes[] = 'button-grey'; 34 34 35 35 if ($is_disabled) { 36 36 $classes[] = 'disabled';
+2 -2
src/view/layout/AphrontListFilterView.php
··· 44 44 $hide_action = javelin_tag( 45 45 'a', 46 46 array( 47 - 'class' => 'button grey', 47 + 'class' => 'button button-grey', 48 48 'sigil' => 'reveal-content', 49 49 'id' => $hide_action_id, 50 50 'href' => $this->showHideHref, ··· 65 65 $show_action = javelin_tag( 66 66 'a', 67 67 array( 68 - 'class' => 'button grey', 68 + 'class' => 'button button-grey', 69 69 'sigil' => 'reveal-content', 70 70 'style' => 'display: none;', 71 71 'href' => '#',
+4 -3
src/view/phui/PHUIButtonView.php
··· 4 4 5 5 const GREEN = 'green'; 6 6 const GREY = 'grey'; 7 + const BLUE = 'blue'; 7 8 const DISABLED = 'disabled'; 8 9 9 10 const SMALL = 'small'; ··· 159 160 $classes[] = 'button'; 160 161 161 162 if ($this->color) { 162 - $classes[] = $this->color; 163 + $classes[] = 'button-'.$this->color; 163 164 } 164 165 165 166 if ($this->size) { ··· 188 189 189 190 switch ($this->getButtonType()) { 190 191 case self::BUTTONTYPE_DEFAULT: 191 - // Nothing special for default buttons. 192 + $classes[] = 'phui-button-default'; 192 193 break; 193 194 case self::BUTTONTYPE_SIMPLE: 194 - $classes[] = 'simple'; 195 + $classes[] = 'phui-button-simple'; 195 196 break; 196 197 } 197 198
+1 -1
src/view/phui/PHUIHovercardView.php
··· 173 173 174 174 foreach ($this->actions as $action) { 175 175 $options = array( 176 - 'class' => 'button grey', 176 + 'class' => 'button button-grey', 177 177 'href' => $action['uri'], 178 178 ); 179 179
+44 -44
webroot/rsrc/css/phui/button/phui-button-simple.css
··· 6 6 7 7 /* - Basic -------------------------------------------------------------------*/ 8 8 9 - button.simple, 10 - input[type="submit"].simple, 11 - a.simple, 12 - a.simple:visited { 9 + button.phui-button-simple, 10 + input[type="submit"].phui-button-simple, 11 + a.phui-button-simple, 12 + a.phui-button-simple:visited { 13 13 background: #fff; 14 14 color: {$bluetext}; 15 15 border: 1px solid {$lightblueborder}; 16 16 } 17 17 18 - button.simple .phui-icon-view, 19 - input[type="submit"].simple .phui-icon-view, 20 - a.simple .phui-icon-view, 21 - a.simple:visited .phui-icon-view { 18 + button.phui-button-simple .phui-icon-view, 19 + input[type="submit"].phui-button-simple .phui-icon-view, 20 + a.phui-button-simple .phui-icon-view, 21 + a.phui-button-simple:visited .phui-icon-view { 22 22 color: {$lightbluetext}; 23 23 } 24 24 25 - a.button.simple:hover, 26 - button.simple:hover { 25 + a.button.phui-button-simple:hover, 26 + button.phui-button-simple:hover { 27 27 border-color: {$blueborder}; 28 28 background-image: none; 29 29 background-color: #fff; 30 30 transition: 0s; 31 31 } 32 32 33 - a.simple.current { 33 + a.phui-button-simple.current { 34 34 background: {$lightblue}; 35 35 } 36 36 37 37 38 38 /* - Red --------------------------------------------------------------------*/ 39 39 40 - button.simple.red, 41 - input[type="submit"].simple.red, 42 - a.simple.red, 43 - a.simple.red:visited { 40 + button.phui-button-simple.button-red, 41 + input[type="submit"].phui-button-simple.button-red, 42 + a.phui-button-simple.button-red, 43 + a.phui-button-simple.button-red:visited { 44 44 background: {$sh-redbackground}; 45 45 color: {$redtext}; 46 46 border: 1px solid {$sh-redborder}; 47 47 } 48 48 49 - button.simple.red .phui-icon-view, 50 - input[type="submit"].simple.red .phui-icon-view, 51 - a.simple.red .phui-icon-view, 52 - a.simple.red:visited .phui-icon-view { 49 + button.phui-button-simple.button-red .phui-icon-view, 50 + input[type="submit"].phui-button-simple.button-red .phui-icon-view, 51 + a.phui-button-simple.button-red .phui-icon-view, 52 + a.phui-button-simple.button-red:visited .phui-icon-view { 53 53 color: {$redtext}; 54 54 } 55 55 56 - a.button.simple.red:hover, 57 - button.simple.red:hover { 56 + a.button.phui-button-simple.button-red:hover, 57 + button.phui-button-simple.button-red:hover { 58 58 border-color: {$sh-redtext}; 59 59 background-image: none; 60 60 background-color: {$sh-redbackground}; ··· 63 63 64 64 /* - Green ------------------------------------------------------------------*/ 65 65 66 - button.simple.green, 67 - input[type="submit"].simple.green, 68 - a.simple.green, 69 - a.simple.green:visited { 66 + button.phui-button-simple.button-green, 67 + input[type="submit"].phui-button-simple.button-green, 68 + a.phui-button-simple.button-green, 69 + a.phui-button-simple.button-green:visited { 70 70 background: {$sh-greenbackground}; 71 71 color: {$greentext}; 72 72 border: 1px solid {$sh-greenborder}; 73 73 } 74 74 75 - button.simple.green .phui-icon-view, 76 - input[type="submit"].simple.green .phui-icon-view, 77 - a.simple.green .phui-icon-view, 78 - a.simple.green:visited .phui-icon-view { 75 + button.phui-button-simple.button-green .phui-icon-view, 76 + input[type="submit"].phui-button-simple.button-green .phui-icon-view, 77 + a.phui-button-simple.button-green .phui-icon-view, 78 + a.phui-button-simple.button-green:visited .phui-icon-view { 79 79 color: {$greentext}; 80 80 } 81 81 82 - a.button.simple.green:hover, 83 - button.simple.green:hover { 82 + a.button.phui-button-simple.button-green:hover, 83 + button.phui-button-simple.button-green:hover { 84 84 border-color: {$sh-greentext}; 85 85 background-image: none; 86 86 background-color: {$sh-greenbackground}; ··· 89 89 90 90 /* - Yellow -----------------------------------------------------------------*/ 91 91 92 - button.simple.yellow, 93 - input[type="submit"].simple.yellow, 94 - a.simple.yellow, 95 - a.simple.yellow:visited { 92 + button.phui-button-simple.button-yellow, 93 + input[type="submit"].phui-button-simple.button-yellow, 94 + a.phui-button-simple.button-yellow, 95 + a.phui-button-simple.button-yellow:visited { 96 96 background-color: {$sh-yellowbackground}; 97 97 color: {$sh-yellowtext}; 98 98 border: 1px solid {$sh-yellowborder}; 99 99 } 100 100 101 - button.simple.yellow .phui-icon-view, 102 - input[type="submit"].simple.yellow .phui-icon-view, 103 - a.simple.yellow .phui-icon-view, 104 - a.simple.yellow:visited .phui-icon-view { 101 + button.phui-button-simple.button-yellow .phui-icon-view, 102 + input[type="submit"].phui-button-simple.button-yellow .phui-icon-view, 103 + a.phui-button-simple.button-yellow .phui-icon-view, 104 + a.phui-button-simple.button-yellow:visited .phui-icon-view { 105 105 color: {$sh-yellowicon}; 106 106 } 107 107 108 - a.button.simple.yellow:hover, 109 - button.simple.yellow:hover { 108 + a.button.phui-button-simple.button-yellow:hover, 109 + button.phui-button-simple.button-yellow:hover { 110 110 border-color: {$sh-yellowtext}; 111 111 background-image: none; 112 112 background-color: {$sh-yellowbackground}; ··· 116 116 117 117 /* - Misc -------------------------------------------------------------------*/ 118 118 119 - a.button.simple .phui-icon-view { 119 + a.button.phui-button-simple .phui-icon-view { 120 120 border: none; 121 121 } 122 122 123 - a.button.simple.phuix-dropdown-open { 123 + a.button.phui-button-simple.phuix-dropdown-open { 124 124 background-color: #fff; 125 125 color: {$blue}; 126 126 box-shadow: none; 127 127 } 128 128 129 - a.button.simple.phuix-dropdown-open:hover .phui-icon-view { 129 + a.button.phui-button-simple.phuix-dropdown-open:hover .phui-icon-view { 130 130 color: {$blue}; 131 131 }
+16 -16
webroot/rsrc/css/phui/button/phui-button.css
··· 49 49 50 50 button .phui-icon-view, 51 51 a.button .phui-icon-view, 52 - button.green .phui-icon-view, 53 - a.button.green .phui-icon-view { 52 + button.button-green .phui-icon-view, 53 + a.button.button-green .phui-icon-view { 54 54 color: white; 55 55 } 56 56 57 - button.grey .phui-icon-view, 58 - a.button.grey .phui-icon-view { 57 + button.button-grey .phui-icon-view, 58 + a.button.button-grey .phui-icon-view { 59 59 color: {$darkbluetext}; 60 60 } 61 61 ··· 68 68 text-indent: 29px; 69 69 } 70 70 71 - button.green, 72 - a.green.button, 73 - a.green.button:visited { 71 + button.button-green, 72 + a.button-green.button, 73 + a.button-green.button:visited { 74 74 background-color: {$green}; 75 75 border-color: {$green}; 76 76 background-image: linear-gradient(to bottom, #23BB5B, #139543); 77 77 } 78 78 79 - button.grey, 80 - input[type="submit"].grey, 81 - a.grey, 82 - a.grey:visited { 79 + button.button-grey, 80 + input[type="submit"].button-grey, 81 + a.button-grey, 82 + a.button-grey:visited { 83 83 background-color: #F7F7F9; 84 84 background-image: linear-gradient(to bottom, #ffffff, #f1f0f1); 85 85 border: 1px solid rgba({$alphablue}, 0.3); ··· 108 108 transition: 0.1s; 109 109 } 110 110 111 - a.button.grey:hover, 112 - button.grey:hover { 111 + a.button.button-grey:hover, 112 + button.button-grey:hover { 113 113 background-image: linear-gradient(to bottom, #ffffff, #eeebec); 114 114 border-color: rgba({$alphablue}, 0.4); 115 115 transition: 0.1s; 116 116 } 117 117 118 - a.button.green:hover, 119 - button.green:hover { 118 + a.button.button-green:hover, 119 + button.button-green:hover { 120 120 border-color: #127336; 121 121 background-color: #0DAD48; 122 122 background-image: linear-gradient(to bottom, #23BB5B, #178841); ··· 244 244 margin-top: 6px; 245 245 } 246 246 247 - .grey.dropdown .caret { 247 + .button-grey.dropdown .caret { 248 248 border-top-color: #000; 249 249 } 250 250
+3 -3
webroot/rsrc/js/phuix/PHUIXButtonView.js
··· 35 35 var node = this.getNode(); 36 36 37 37 if (this._color) { 38 - JX.DOM.alterClass(node, this._color, false); 38 + JX.DOM.alterClass(node, 'button-' + this._color, false); 39 39 } 40 40 this._color = color; 41 - JX.DOM.alterClass(node, this._color, true); 41 + JX.DOM.alterClass(node, 'button-' + this._color, true); 42 42 43 43 return this; 44 44 }, ··· 50 50 var node = this.getNode(); 51 51 52 52 var is_simple = (this._buttonType == self.BUTTONTYPE_SIMPLE); 53 - JX.DOM.alterClass(node, 'simple', is_simple); 53 + JX.DOM.alterClass(node, 'phui-button-simple', is_simple); 54 54 55 55 return this; 56 56 },