@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.

Move simple buttons, bar to own CSS file

Summary:
- Add a simple green button... maybe don't need
- Fix tokenizer search icon
- Splite simple and button-bar into own files

Test Plan: uiexamples, various pages with buttons, diffusion

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

+191 -133
+21 -9
resources/celerity/map.php
··· 9 9 'names' => array( 10 10 'conpherence.pkg.css' => 'ff161f2d', 11 11 'conpherence.pkg.js' => 'b5b51108', 12 - 'core.pkg.css' => '38689e09', 12 + 'core.pkg.css' => 'e8d63571', 13 13 'core.pkg.js' => '1475bd91', 14 14 'darkconsole.pkg.js' => '1f9a31bc', 15 15 'differential.pkg.css' => 'a2755617', ··· 33 33 'rsrc/css/aphront/panel-view.css' => '8427b78d', 34 34 'rsrc/css/aphront/phabricator-nav-view.css' => 'faf6a6fc', 35 35 'rsrc/css/aphront/table-view.css' => '34cf86b4', 36 - 'rsrc/css/aphront/tokenizer.css' => '9a8cb501', 36 + 'rsrc/css/aphront/tokenizer.css' => '15d5ff71', 37 37 'rsrc/css/aphront/tooltip.css' => '173b9431', 38 38 'rsrc/css/aphront/typeahead-browse.css' => '4f82e510', 39 39 'rsrc/css/aphront/typeahead.css' => '8a84cc7d', ··· 124 124 'rsrc/css/font/phui-font-icon-base.css' => '870a7360', 125 125 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 126 126 'rsrc/css/layout/phabricator-source-code-view.css' => '4383192f', 127 + 'rsrc/css/phui/button/phui-button-bar.css' => '39fe680c', 128 + 'rsrc/css/phui/button/phui-button-simple.css' => 'd410596b', 129 + 'rsrc/css/phui/button/phui-button.css' => '9f13ddcc', 127 130 'rsrc/css/phui/calendar/phui-calendar-day.css' => '572b1893', 128 131 'rsrc/css/phui/calendar/phui-calendar-list.css' => '576be600', 129 132 'rsrc/css/phui/calendar/phui-calendar-month.css' => '8e10e92c', ··· 140 143 'rsrc/css/phui/phui-basic-nav-view.css' => 'a0705f53', 141 144 'rsrc/css/phui/phui-big-info-view.css' => 'bd903741', 142 145 'rsrc/css/phui/phui-box.css' => '269cbc99', 143 - 'rsrc/css/phui/phui-button.css' => '836844c9', 144 146 'rsrc/css/phui/phui-chart.css' => '6bf6f78e', 145 147 'rsrc/css/phui/phui-cms.css' => '504b4b23', 146 148 'rsrc/css/phui/phui-comment-form.css' => '57af2e14', ··· 539 541 'aphront-multi-column-view-css' => '84cc6640', 540 542 'aphront-panel-view-css' => '8427b78d', 541 543 'aphront-table-view-css' => '34cf86b4', 542 - 'aphront-tokenizer-control-css' => '9a8cb501', 544 + 'aphront-tokenizer-control-css' => '15d5ff71', 543 545 'aphront-tooltip-css' => '173b9431', 544 546 'aphront-typeahead-control-css' => '8a84cc7d', 545 547 'application-search-view-css' => '66ee5d46', ··· 817 819 'phui-basic-nav-view-css' => 'a0705f53', 818 820 'phui-big-info-view-css' => 'bd903741', 819 821 'phui-box-css' => '269cbc99', 820 - 'phui-button-css' => '836844c9', 822 + 'phui-button-bar-css' => '39fe680c', 823 + 'phui-button-css' => '9f13ddcc', 824 + 'phui-button-simple-css' => 'd410596b', 821 825 'phui-calendar-css' => '477acfaa', 822 826 'phui-calendar-day-css' => '572b1893', 823 827 'phui-calendar-list-css' => '576be600', ··· 973 977 'javelin-dom', 974 978 'javelin-history', 975 979 ), 980 + '15d5ff71' => array( 981 + 'aphront-typeahead-control-css', 982 + 'phui-tag-view-css', 983 + ), 976 984 16053029 => array( 977 985 'phui-theme-css', 978 986 ), ··· 1101 1109 'javelin-util', 1102 1110 'javelin-dom', 1103 1111 'javelin-vector', 1112 + ), 1113 + '39fe680c' => array( 1114 + 'phui-button-css', 1115 + 'phui-button-simple-css', 1104 1116 ), 1105 1117 '3ab51e2c' => array( 1106 1118 'javelin-behavior', ··· 1618 1630 'phuix-icon-view', 1619 1631 'javelin-behavior-phabricator-gesture', 1620 1632 ), 1621 - '9a8cb501' => array( 1622 - 'aphront-typeahead-control-css', 1623 - 'phui-tag-view-css', 1624 - ), 1625 1633 '9bbf3762' => array( 1626 1634 'javelin-behavior', 1627 1635 'javelin-dom', ··· 1971 1979 'd254d646' => array( 1972 1980 'javelin-util', 1973 1981 ), 1982 + 'd410596b' => array( 1983 + 'phui-button-css', 1984 + ), 1974 1985 'd4505101' => array( 1975 1986 'javelin-stratcom', 1976 1987 'javelin-install', ··· 2177 2188 'phabricator-core-css', 2178 2189 'phabricator-zindex-css', 2179 2190 'phui-button-css', 2191 + 'phui-button-simple-css', 2180 2192 'phui-theme-css', 2181 2193 'phabricator-standard-page-view', 2182 2194 'aphront-dialog-view-css',
+1
resources/celerity/packages.php
··· 93 93 'phabricator-core-css', 94 94 'phabricator-zindex-css', 95 95 'phui-button-css', 96 + 'phui-button-simple-css', 96 97 'phui-theme-css', 97 98 'phabricator-standard-page-view', 98 99 'aphront-dialog-view-css',
+1 -1
src/view/phui/PHUIButtonBarView.php
··· 29 29 } 30 30 31 31 protected function getTagContent() { 32 - require_celerity_resource('phui-button-css'); 32 + require_celerity_resource('phui-button-bar-css'); 33 33 34 34 $i = 1; 35 35 $j = count($this->buttons);
+1
src/view/phui/PHUIButtonView.php
··· 154 154 protected function getTagAttributes() { 155 155 156 156 require_celerity_resource('phui-button-css'); 157 + require_celerity_resource('phui-button-simple-css'); 157 158 158 159 $classes = array(); 159 160 $classes[] = 'button';
+1
webroot/rsrc/css/aphront/tokenizer.css
··· 181 181 .button.tokenizer-browse-button .phui-icon-view { 182 182 top: 7px; 183 183 left: 9px; 184 + position: absolute; 184 185 }
+61
webroot/rsrc/css/phui/button/phui-button-bar.css
··· 1 + /** 2 + * @provides phui-button-bar-css 3 + * @requires phui-button-css 4 + * @requires phui-button-simple-css 5 + */ 6 + 7 + .phui-button-bar-borderless .button { 8 + border: 0; 9 + background-color: transparent; 10 + background-image: none; 11 + padding-left: 10px; 12 + padding-right: 10px; 13 + } 14 + 15 + .phui-button-bar-borderless .button .phui-icon-view { 16 + font-size: 15px; 17 + color: rgba({$alphagrey},.4); 18 + } 19 + 20 + .phui-button-bar-borderless .button:hover { 21 + background-color: transparent; 22 + background-image: none; 23 + border-radius: 3px; 24 + } 25 + 26 + .phui-button-bar-borderless .button:hover .phui-icon-view { 27 + color: rgba({$alphagrey},.9); 28 + } 29 + 30 + .phui-button-bar-borderless .button { 31 + border: 0; 32 + } 33 + 34 + .phui-button-bar .phui-button-bar-first { 35 + border-top-right-radius: 0px; 36 + border-bottom-right-radius: 0px; 37 + } 38 + 39 + .phui-button-bar .phui-button-bar-middle { 40 + border-radius: 0; 41 + border-left: none; 42 + } 43 + 44 + .phui-button-bar .phui-button-bar-last { 45 + border-left: none; 46 + border-top-left-radius: 0px; 47 + border-bottom-left-radius: 0px; 48 + } 49 + 50 + .phui-button-bar .button.simple:hover { 51 + border-color: {$lightblueborder}; 52 + background-color: #fff; 53 + background-image: none; 54 + color: {$sky}; 55 + } 56 + 57 + .phui-button-bar .button.simple:hover .phui-icon-view { 58 + border-color: {$lightblueborder}; 59 + color: {$sky}; 60 + background-image: none; 61 + }
+105
webroot/rsrc/css/phui/button/phui-button-simple.css
··· 1 + /** 2 + * @provides phui-button-simple-css 3 + * @requires phui-button-css 4 + */ 5 + 6 + 7 + /* - Basic -------------------------------------------------------------------*/ 8 + 9 + button.simple, 10 + input[type="submit"].simple, 11 + a.simple, 12 + a.simple:visited { 13 + background: #fff; 14 + color: {$bluetext}; 15 + border: 1px solid {$lightblueborder}; 16 + } 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 { 22 + color: {$lightbluetext}; 23 + } 24 + 25 + a.button.simple:hover, 26 + button.simple:hover { 27 + border-color: {$blueborder}; 28 + background-image: none; 29 + background-color: #fff; 30 + transition: 0s; 31 + } 32 + 33 + a.simple.current { 34 + background: {$lightblue}; 35 + } 36 + 37 + 38 + /* - Red --------------------------------------------------------------------*/ 39 + 40 + button.simple.red, 41 + input[type="submit"].simple.red, 42 + a.simple.red, 43 + a.simple.red:visited { 44 + background: #fff; 45 + color: {$redtext}; 46 + border: 1px solid {$sh-redborder}; 47 + } 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 { 53 + color: {$redtext}; 54 + } 55 + 56 + a.button.simple.red:hover, 57 + button.simple.red:hover { 58 + border-color: {$red}; 59 + background-image: none; 60 + background-color: #fff; 61 + transition: 0s; 62 + } 63 + 64 + /* - Green ------------------------------------------------------------------*/ 65 + 66 + button.simple.green, 67 + input[type="submit"].simple.green, 68 + a.simple.green, 69 + a.simple.green:visited { 70 + background: #fff; 71 + color: {$greentext}; 72 + border: 1px solid {$sh-greenborder}; 73 + } 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 { 79 + color: {$greentext}; 80 + } 81 + 82 + a.button.simple.green:hover, 83 + button.simple.green:hover { 84 + border-color: {$green}; 85 + background-image: none; 86 + background-color: #fff; 87 + transition: 0s; 88 + } 89 + 90 + 91 + /* - Misc -------------------------------------------------------------------*/ 92 + 93 + a.button.simple .phui-icon-view { 94 + border: none; 95 + } 96 + 97 + a.button.simple.phuix-dropdown-open { 98 + background-color: #fff; 99 + color: {$blue}; 100 + box-shadow: none; 101 + } 102 + 103 + a.button.simple.phuix-dropdown-open:hover .phui-icon-view { 104 + color: {$blue}; 105 + }
-123
webroot/rsrc/css/phui/phui-button.css webroot/rsrc/css/phui/button/phui-button.css
··· 86 86 color: {$darkgreytext}; 87 87 } 88 88 89 - button.simple, 90 - input[type="submit"].simple, 91 - a.simple, 92 - a.simple:visited { 93 - background: #fff; 94 - color: {$bluetext}; 95 - border: 1px solid {$lightblueborder}; 96 - } 97 - 98 - a.simple.current { 99 - background: {$lightblue}; 100 - } 101 - 102 - button.simple .phui-icon-view, 103 - input[type="submit"].simple .phui-icon-view, 104 - a.simple .phui-icon-view, 105 - a.simple:visited .phui-icon-view { 106 - color: {$lightbluetext}; 107 - } 108 - 109 - button.simple.red, 110 - input[type="submit"].simple.red, 111 - a.simple.red, 112 - a.simple.red:visited { 113 - background: #fff; 114 - color: {$redtext}; 115 - border: 1px solid {$sh-redborder}; 116 - } 117 - 118 - button.simple.red .phui-icon-view, 119 - input[type="submit"].simple.red .phui-icon-view, 120 - a.simple.red .phui-icon-view, 121 - a.simple.red:visited .phui-icon-view { 122 - color: {$redtext}; 123 - } 124 - 125 89 a.disabled, 126 90 button.disabled, 127 91 button[disabled] { ··· 157 121 background-color: #0DAD48; 158 122 background-image: linear-gradient(to bottom, #23BB5B, #178841); 159 123 transition: 0.1s; 160 - } 161 - 162 - a.button.simple:hover, 163 - button.simple:hover { 164 - border-color: {$blueborder}; 165 - background-image: none; 166 - background-color: #fff; 167 - transition: 0s; 168 - } 169 - 170 - a.button.simple.red:hover, 171 - button.simple.red:hover { 172 - border-color: {$red}; 173 - background-image: none; 174 - background-color: #fff; 175 - transition: 0s; 176 - } 177 - 178 - a.button.simple .phui-icon-view { 179 - border: none; 180 - } 181 - 182 - a.button.simple.phuix-dropdown-open { 183 - background-color: #fff; 184 - color: {$blue}; 185 - box-shadow: none; 186 - } 187 - 188 - a.button.simple.phuix-dropdown-open:hover .phui-icon-view { 189 - color: {$blue}; 190 124 } 191 125 192 126 body a.button.disabled:hover, ··· 359 293 font-weight: normal; 360 294 } 361 295 362 - /* PHUI Button Bar */ 363 - 364 - .phui-button-bar-borderless .button { 365 - border: 0; 366 - background-color: transparent; 367 - background-image: none; 368 - padding-left: 10px; 369 - padding-right: 10px; 370 - } 371 - 372 - .phui-button-bar-borderless .button .phui-icon-view { 373 - font-size: 15px; 374 - color: rgba({$alphagrey},.4); 375 - } 376 - 377 - .phui-button-bar-borderless .button:hover { 378 - background-color: transparent; 379 - background-image: none; 380 - border-radius: 3px; 381 - } 382 - 383 - .phui-button-bar-borderless .button:hover .phui-icon-view { 384 - color: rgba({$alphagrey},.9); 385 - } 386 - 387 - .phui-button-bar-borderless .button { 388 - border: 0; 389 - } 390 - 391 - .phui-button-bar .phui-button-bar-first { 392 - border-top-right-radius: 0px; 393 - border-bottom-right-radius: 0px; 394 - } 395 - 396 - .phui-button-bar .phui-button-bar-middle { 397 - border-radius: 0; 398 - border-left: none; 399 - } 400 - 401 - .phui-button-bar .phui-button-bar-last { 402 - border-left: none; 403 - border-top-left-radius: 0px; 404 - border-bottom-left-radius: 0px; 405 - } 406 - 407 - .phui-button-bar .button.simple:hover { 408 - border-color: {$lightblueborder}; 409 - background-color: #fff; 410 - background-image: none; 411 - color: {$sky}; 412 - } 413 - 414 - .phui-button-bar .button.simple:hover .phui-icon-view { 415 - border-color: {$lightblueborder}; 416 - color: {$sky}; 417 - background-image: none; 418 - }