From 4189eb810b4c03302d488c947e569aefb60b3c9d Mon Sep 17 00:00:00 2001 From: Chad Little Date: Thu, 13 Apr 2017 12:16:07 -0700 Subject: [PATCH] Use violet with not-verified user tags Summary: Will see how this goes in practice. Uses violet where color is used for non responsive peeps. Test Plan: Create a user without email verification, test hover card, profile, mentions and lists. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D17678 --- resources/celerity/map.php | 10 +++++----- .../people/markup/PhabricatorMentionRemarkupRule.php | 2 +- .../people/phid/PhabricatorPeopleUserPHIDType.php | 2 +- .../people/view/PhabricatorUserCardView.php | 2 +- src/applications/phid/PhabricatorObjectHandle.php | 1 + .../rsrc/css/application/base/standard-page-view.css | 4 ++++ webroot/rsrc/css/phui/phui-tag-view.css | 6 +++--- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index e9c86db2e9..33e3549d2b 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => '437d3b5a', 'conpherence.pkg.js' => '281b1a73', - 'core.pkg.css' => '9139007e', + 'core.pkg.css' => 'b2ad82f4', 'core.pkg.js' => 'fbc1c380', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '90b30783', @@ -37,7 +37,7 @@ return array( 'rsrc/css/application/base/main-menu-view.css' => '5294060f', 'rsrc/css/application/base/notification-menu.css' => '6a697e43', 'rsrc/css/application/base/phui-theme.css' => '9f261c6b', - 'rsrc/css/application/base/standard-page-view.css' => '285cedf3', + 'rsrc/css/application/base/standard-page-view.css' => '89da5a9c', 'rsrc/css/application/chatlog/chatlog.css' => 'd295b020', 'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4', 'rsrc/css/application/config/config-options.css' => '0ede4c9b', @@ -166,7 +166,7 @@ return array( 'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892', 'rsrc/css/phui/phui-spacing.css' => '042804d6', 'rsrc/css/phui/phui-status.css' => 'd5263e49', - 'rsrc/css/phui/phui-tag-view.css' => '84d65f26', + 'rsrc/css/phui/phui-tag-view.css' => 'cc4fd402', 'rsrc/css/phui/phui-timeline-view.css' => '1d7ef61d', 'rsrc/css/phui/phui-two-column-view.css' => 'ce9fa0b7', 'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5', @@ -798,7 +798,7 @@ return array( 'phabricator-shaped-request' => '7cbe244b', 'phabricator-slowvote-css' => 'a94b7230', 'phabricator-source-code-view-css' => '4383192f', - 'phabricator-standard-page-view' => '285cedf3', + 'phabricator-standard-page-view' => '89da5a9c', 'phabricator-textareautils' => '320810c8', 'phabricator-title' => '485aaa6c', 'phabricator-tooltip' => '8fadb715', @@ -875,7 +875,7 @@ return array( 'phui-segment-bar-view-css' => 'b1d1b892', 'phui-spacing-css' => '042804d6', 'phui-status-list-view-css' => 'd5263e49', - 'phui-tag-view-css' => '84d65f26', + 'phui-tag-view-css' => 'cc4fd402', 'phui-theme-css' => '9f261c6b', 'phui-timeline-view-css' => '1d7ef61d', 'phui-two-column-view-css' => 'ce9fa0b7', diff --git a/src/applications/people/markup/PhabricatorMentionRemarkupRule.php b/src/applications/people/markup/PhabricatorMentionRemarkupRule.php index 778384e946..1f82d78423 100644 --- a/src/applications/people/markup/PhabricatorMentionRemarkupRule.php +++ b/src/applications/people/markup/PhabricatorMentionRemarkupRule.php @@ -151,7 +151,7 @@ final class PhabricatorMentionRemarkupRule extends PhutilRemarkupRule { } if (!$user->isResponsive()) { - $tag->setDotColor(PHUITagView::COLOR_GREY); + $tag->setDotColor(PHUITagView::COLOR_VIOLET); } else { if ($user->getAwayUntil()) { $away = PhabricatorCalendarEventInvitee::AVAILABILITY_AWAY; diff --git a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php index 2d773121a0..b2a456cd51 100644 --- a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php +++ b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php @@ -62,7 +62,7 @@ final class PhabricatorPeopleUserPHIDType extends PhabricatorPHIDType { $availability = null; if (!$user->isResponsive()) { - $availability = PhabricatorObjectHandle::AVAILABILITY_DISABLED; + $availability = PhabricatorObjectHandle::AVAILABILITY_NOEMAIL; } else { $until = $user->getAwayUntil(); if ($until) { diff --git a/src/applications/people/view/PhabricatorUserCardView.php b/src/applications/people/view/PhabricatorUserCardView.php index 5b6d34b90c..4f4f15a33d 100644 --- a/src/applications/people/view/PhabricatorUserCardView.php +++ b/src/applications/people/view/PhabricatorUserCardView.php @@ -68,7 +68,7 @@ final class PhabricatorUserCardView extends AphrontTagView { } else if (!$user->getIsEmailVerified()) { $tag_icon = 'fa-envelope'; $tag_title = pht('Email Not Verified'); - $tag_shade = PHUITagView::COLOR_RED; + $tag_shade = PHUITagView::COLOR_VIOLET; } else if ($user->getIsAdmin()) { $tag_icon = 'fa-star'; $tag_title = pht('Administrator'); diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php index e6230c4ae6..49255fd9e8 100644 --- a/src/applications/phid/PhabricatorObjectHandle.php +++ b/src/applications/phid/PhabricatorObjectHandle.php @@ -6,6 +6,7 @@ final class PhabricatorObjectHandle const AVAILABILITY_FULL = 'full'; const AVAILABILITY_NONE = 'none'; + const AVAILABILITY_NOEMAIL = 'no-email'; const AVAILABILITY_PARTIAL = 'partial'; const AVAILABILITY_DISABLED = 'disabled'; diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css index f0e5e0cbe3..b4386764ab 100644 --- a/webroot/rsrc/css/application/base/standard-page-view.css +++ b/webroot/rsrc/css/application/base/standard-page-view.css @@ -84,6 +84,10 @@ a.handle-status-closed:hover { color: {$orange}; } +.handle-availability-no-email .perfect-circle { + color: {$violet}; +} + .handle-availability-disabled .perfect-circle { color: {$greytext}; } diff --git a/webroot/rsrc/css/phui/phui-tag-view.css b/webroot/rsrc/css/phui/phui-tag-view.css index f14909bc06..d5b2710d7b 100644 --- a/webroot/rsrc/css/phui/phui-tag-view.css +++ b/webroot/rsrc/css/phui/phui-tag-view.css @@ -46,11 +46,11 @@ a.phui-tag-view:hover { .phui-tag-dot { position: relative; display: inline-block; - width: 6px; - height: 6px; + width: 5px; + height: 5px; margin-right: 4px; top: -1px; - border-radius: 6px; + border-radius: 5px; border: 1px solid transparent; }