From 03d4d674f8033300be2c55feb1bf415f3cd7b25f Mon Sep 17 00:00:00 2001 From: Chad Little Date: Mon, 22 May 2017 10:47:19 -0700 Subject: [PATCH] Clean up some colors missing from PHUITagView type shade Summary: Grep for phui-tag-shade and verify we're no longer calling shade-color directly. Test Plan: Search, workboard, story points, etc. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D17993 --- resources/celerity/map.php | 22 +++++++++---------- ...PhabricatorCalendarEventViewController.php | 2 +- .../controller/DiffusionController.php | 2 +- .../ManiphestTaskDetailController.php | 2 +- .../css/application/search/search-results.css | 2 +- webroot/rsrc/css/phui/phui-header-view.css | 2 +- .../application/projects/WorkboardColumn.js | 6 ++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 0649f9dbc0..2415f90ff1 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => 'ff161f2d', 'conpherence.pkg.js' => 'b5b51108', - 'core.pkg.css' => '6e9cf0af', + 'core.pkg.css' => '5387f8b6', 'core.pkg.js' => '599698a7', 'darkconsole.pkg.js' => '1f9a31bc', 'differential.pkg.css' => '7d4cfa59', @@ -109,7 +109,7 @@ return array( 'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd', 'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae', 'rsrc/css/application/search/application-search-view.css' => '66ee5d46', - 'rsrc/css/application/search/search-results.css' => 'f87d23ad', + 'rsrc/css/application/search/search-results.css' => '8f8e08ed', 'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230', 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', @@ -154,7 +154,7 @@ return array( 'rsrc/css/phui/phui-form-view.css' => '6175808d', 'rsrc/css/phui/phui-form.css' => 'a5570f70', 'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f', - 'rsrc/css/phui/phui-header-view.css' => 'e082678d', + 'rsrc/css/phui/phui-header-view.css' => 'a3d1aecd', 'rsrc/css/phui/phui-hovercard.css' => 'f0592bcf', 'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee', 'rsrc/css/phui/phui-icon.css' => '12b387a1', @@ -433,7 +433,7 @@ return array( 'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '5e9f347c', 'rsrc/js/application/projects/WorkboardBoard.js' => '8935deef', 'rsrc/js/application/projects/WorkboardCard.js' => 'c587b80f', - 'rsrc/js/application/projects/WorkboardColumn.js' => '21df4ff5', + 'rsrc/js/application/projects/WorkboardColumn.js' => '758b4758', 'rsrc/js/application/projects/WorkboardController.js' => '26167537', 'rsrc/js/application/projects/behavior-project-boards.js' => '4250a34e', 'rsrc/js/application/projects/behavior-project-create.js' => '065227cc', @@ -754,7 +754,7 @@ return array( 'javelin-websocket' => '3ffe32d6', 'javelin-workboard-board' => '8935deef', 'javelin-workboard-card' => 'c587b80f', - 'javelin-workboard-column' => '21df4ff5', + 'javelin-workboard-column' => '758b4758', 'javelin-workboard-controller' => '26167537', 'javelin-workflow' => '1e911d0f', 'maniphest-batch-editor' => 'b0f0b6d5', @@ -801,7 +801,7 @@ return array( 'phabricator-remarkup-css' => 'd1a5e11e', 'phabricator-scroll-objective' => '7e8877e7', 'phabricator-scroll-objective-list' => '6120e99a', - 'phabricator-search-results-css' => 'f87d23ad', + 'phabricator-search-results-css' => '8f8e08ed', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-slowvote-css' => 'a94b7230', 'phabricator-source-code-view-css' => '4383192f', @@ -856,7 +856,7 @@ return array( 'phui-form-css' => 'a5570f70', 'phui-form-view-css' => '6175808d', 'phui-head-thing-view-css' => 'fd311e5f', - 'phui-header-view-css' => 'e082678d', + 'phui-header-view-css' => 'a3d1aecd', 'phui-hovercard' => '1bd28176', 'phui-hovercard-view-css' => 'f0592bcf', 'phui-icon-set-selector-css' => '87db8fee', @@ -1060,10 +1060,6 @@ return array( 'javelin-install', 'javelin-dom', ), - '21df4ff5' => array( - 'javelin-install', - 'javelin-workboard-card', - ), '2290aeef' => array( 'javelin-install', 'javelin-dom', @@ -1464,6 +1460,10 @@ return array( 'javelin-vector', 'javelin-dom', ), + '758b4758' => array( + 'javelin-install', + 'javelin-workboard-card', + ), '76b9fc3e' => array( 'javelin-behavior', 'javelin-stratcom', diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php index 91d3a9e336..3ba3aa1e70 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php @@ -125,7 +125,7 @@ final class PhabricatorCalendarEventViewController ->setName(pht('Imported')) ->setIcon('fa-download') ->setHref($event->getImportSource()->getURI()) - ->setShade('orange')); + ->setColor(PHUITagView::COLOR_ORANGE)); } foreach ($this->buildRSVPActions($event) as $action) { diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php index a018eb3dbb..a296761bdf 100644 --- a/src/applications/diffusion/controller/DiffusionController.php +++ b/src/applications/diffusion/controller/DiffusionController.php @@ -332,7 +332,7 @@ abstract class DiffusionController extends PhabricatorController { $tag = id(new PHUITagView()) ->setName($commit) - ->setShade('indigo') + ->setColor(PHUITagView::COLOR_INDIGO) ->setType(PHUITagView::TYPE_SHADE); return $tag; diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index 5384825de8..7859599a2f 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -233,7 +233,7 @@ final class ManiphestTaskDetailController extends ManiphestController { ManiphestTaskPoints::getPointsLabel()); $tag = id(new PHUITagView()) ->setName($points_name) - ->setShade('blue') + ->setColor(PHUITagView::COLOR_BLUE) ->setType(PHUITagView::TYPE_SHADE); $view->addTag($tag); diff --git a/webroot/rsrc/css/application/search/search-results.css b/webroot/rsrc/css/application/search/search-results.css index a1837fa391..0f0a31a1b9 100644 --- a/webroot/rsrc/css/application/search/search-results.css +++ b/webroot/rsrc/css/application/search/search-results.css @@ -26,6 +26,6 @@ margin: 0 2px; } -.phui-fulltext-tokens .phui-tag-view.phui-tag-shade-grey { +.phui-fulltext-tokens .phui-tag-view.phui-tag-grey { opacity: 0.5; } diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css index 5c24d5575e..470e821544 100644 --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -353,7 +353,7 @@ body .phui-header-shell.phui-bleed-header vertical-align: top; } -.phui-header-view .phui-tag-shade-indigo a { +.phui-header-view .phui-tag-indigo a { color: {$sh-indigotext}; } diff --git a/webroot/rsrc/js/application/projects/WorkboardColumn.js b/webroot/rsrc/js/application/projects/WorkboardColumn.js index 81fba84077..9973648593 100644 --- a/webroot/rsrc/js/application/projects/WorkboardColumn.js +++ b/webroot/rsrc/js/application/projects/WorkboardColumn.js @@ -285,9 +285,9 @@ JX.install('WorkboardColumn', { JX.DOM.alterClass(panel, 'project-panel-over-limit', over_limit); var color_map = { - 'phui-tag-shade-disabled': (total_points === 0), - 'phui-tag-shade-blue': (total_points > 0 && !over_limit), - 'phui-tag-shade-red': (over_limit) + 'phui-tag-disabled': (total_points === 0), + 'phui-tag-blue': (total_points > 0 && !over_limit), + 'phui-tag-red': (over_limit) }; for (var c in color_map) {