From e6f3c24bc3b090bd265893f64de4fe34db7768f7 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Fri, 9 Aug 2013 12:47:31 -0700 Subject: [PATCH] Tweak colors on Conpherence Notification Menu Summary: Fixes T3690. Uses standard colors, smaller borders. Test Plan: Review Menu with and without a notification Reviewers: epriestley, btrahan Reviewed By: btrahan CC: Korvin, aran Maniphest Tasks: T3690 Differential Revision: https://secure.phabricator.com/D6710 --- src/__celerity_resource_map__.php | 94 +++++++++---------- .../application/base/notification-menu.css | 2 +- .../rsrc/css/application/conpherence/menu.css | 10 +- .../application/conpherence/notification.css | 17 ++-- 4 files changed, 61 insertions(+), 62 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index c9d7f5b2cc..60f0900899 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -981,7 +981,7 @@ celerity_register_resource_map(array( ), 'conpherence-menu-css' => array( - 'uri' => '/res/621766a2/rsrc/css/application/conpherence/menu.css', + 'uri' => '/res/d250b49c/rsrc/css/application/conpherence/menu.css', 'type' => 'css', 'requires' => array( @@ -999,7 +999,7 @@ celerity_register_resource_map(array( ), 'conpherence-notification-css' => array( - 'uri' => '/res/8804c853/rsrc/css/application/conpherence/notification.css', + 'uri' => '/res/232c8cdb/rsrc/css/application/conpherence/notification.css', 'type' => 'css', 'requires' => array( @@ -3309,7 +3309,7 @@ celerity_register_resource_map(array( ), 'phabricator-notification-menu-css' => array( - 'uri' => '/res/a350cd86/rsrc/css/application/base/notification-menu.css', + 'uri' => '/res/5ecfc142/rsrc/css/application/base/notification-menu.css', 'type' => 'css', 'requires' => array( @@ -4170,7 +4170,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - 'e289f6ce' => + '866406fa' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4218,7 +4218,7 @@ celerity_register_resource_map(array( 40 => 'phabricator-property-list-view-css', 41 => 'phabricator-tag-view-css', ), - 'uri' => '/res/pkg/e289f6ce/core.pkg.css', + 'uri' => '/res/pkg/866406fa/core.pkg.css', 'type' => 'css', ), '7cc3f99d' => @@ -4409,16 +4409,16 @@ celerity_register_resource_map(array( ), 'reverse' => array( - 'aphront-dialog-view-css' => 'e289f6ce', - 'aphront-error-view-css' => 'e289f6ce', - 'aphront-form-view-css' => 'e289f6ce', - 'aphront-list-filter-view-css' => 'e289f6ce', - 'aphront-pager-view-css' => 'e289f6ce', - 'aphront-panel-view-css' => 'e289f6ce', - 'aphront-table-view-css' => 'e289f6ce', - 'aphront-tokenizer-control-css' => 'e289f6ce', - 'aphront-tooltip-css' => 'e289f6ce', - 'aphront-typeahead-control-css' => 'e289f6ce', + 'aphront-dialog-view-css' => '866406fa', + 'aphront-error-view-css' => '866406fa', + 'aphront-form-view-css' => '866406fa', + 'aphront-list-filter-view-css' => '866406fa', + 'aphront-pager-view-css' => '866406fa', + 'aphront-panel-view-css' => '866406fa', + 'aphront-table-view-css' => '866406fa', + 'aphront-tokenizer-control-css' => '866406fa', + 'aphront-tooltip-css' => '866406fa', + 'aphront-typeahead-control-css' => '866406fa', 'differential-changeset-view-css' => 'dd27a69b', 'differential-core-view-css' => 'dd27a69b', 'differential-inline-comment-editor' => '48040be9', @@ -4432,7 +4432,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => 'dd27a69b', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => 'e289f6ce', + 'global-drag-and-drop-css' => '866406fa', 'inline-comment-summary-css' => 'dd27a69b', 'javelin-aphlict' => '7cc3f99d', 'javelin-behavior' => '2dbbb7d1', @@ -4505,55 +4505,55 @@ celerity_register_resource_map(array( 'javelin-util' => '2dbbb7d1', 'javelin-vector' => '2dbbb7d1', 'javelin-workflow' => '2dbbb7d1', - 'lightbox-attachment-css' => 'e289f6ce', + 'lightbox-attachment-css' => '866406fa', 'maniphest-task-summary-css' => '06bacb9a', 'maniphest-transaction-detail-css' => '06bacb9a', - 'phabricator-action-list-view-css' => 'e289f6ce', - 'phabricator-application-launch-view-css' => 'e289f6ce', + 'phabricator-action-list-view-css' => '866406fa', + 'phabricator-application-launch-view-css' => '866406fa', 'phabricator-busy' => '7cc3f99d', 'phabricator-content-source-view-css' => 'dd27a69b', - 'phabricator-core-css' => 'e289f6ce', - 'phabricator-crumbs-view-css' => 'e289f6ce', + 'phabricator-core-css' => '866406fa', + 'phabricator-crumbs-view-css' => '866406fa', 'phabricator-drag-and-drop-file-upload' => '48040be9', 'phabricator-dropdown-menu' => '7cc3f99d', 'phabricator-file-upload' => '7cc3f99d', - 'phabricator-filetree-view-css' => 'e289f6ce', - 'phabricator-flag-css' => 'e289f6ce', - 'phabricator-form-view-css' => 'e289f6ce', - 'phabricator-header-view-css' => 'e289f6ce', + 'phabricator-filetree-view-css' => '866406fa', + 'phabricator-flag-css' => '866406fa', + 'phabricator-form-view-css' => '866406fa', + 'phabricator-header-view-css' => '866406fa', 'phabricator-hovercard' => '7cc3f99d', - 'phabricator-jump-nav' => 'e289f6ce', + 'phabricator-jump-nav' => '866406fa', 'phabricator-keyboard-shortcut' => '7cc3f99d', 'phabricator-keyboard-shortcut-manager' => '7cc3f99d', - 'phabricator-main-menu-view' => 'e289f6ce', + 'phabricator-main-menu-view' => '866406fa', 'phabricator-menu-item' => '7cc3f99d', - 'phabricator-nav-view-css' => 'e289f6ce', + 'phabricator-nav-view-css' => '866406fa', 'phabricator-notification' => '7cc3f99d', - 'phabricator-notification-css' => 'e289f6ce', - 'phabricator-notification-menu-css' => 'e289f6ce', - 'phabricator-object-item-list-view-css' => 'e289f6ce', + 'phabricator-notification-css' => '866406fa', + 'phabricator-notification-menu-css' => '866406fa', + 'phabricator-object-item-list-view-css' => '866406fa', 'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-phtize' => '7cc3f99d', 'phabricator-prefab' => '7cc3f99d', 'phabricator-project-tag-css' => '06bacb9a', - 'phabricator-property-list-view-css' => 'e289f6ce', - 'phabricator-remarkup-css' => 'e289f6ce', + 'phabricator-property-list-view-css' => '866406fa', + 'phabricator-remarkup-css' => '866406fa', 'phabricator-shaped-request' => '48040be9', - 'phabricator-side-menu-view-css' => 'e289f6ce', - 'phabricator-standard-page-view' => 'e289f6ce', - 'phabricator-tag-view-css' => 'e289f6ce', + 'phabricator-side-menu-view-css' => '866406fa', + 'phabricator-standard-page-view' => '866406fa', + 'phabricator-tag-view-css' => '866406fa', 'phabricator-textareautils' => '7cc3f99d', 'phabricator-tooltip' => '7cc3f99d', - 'phabricator-transaction-view-css' => 'e289f6ce', - 'phabricator-zindex-css' => 'e289f6ce', - 'phui-button-css' => 'e289f6ce', - 'phui-form-css' => 'e289f6ce', - 'phui-icon-view-css' => 'e289f6ce', - 'phui-spacing-css' => 'e289f6ce', - 'sprite-apps-large-css' => 'e289f6ce', - 'sprite-gradient-css' => 'e289f6ce', - 'sprite-icons-css' => 'e289f6ce', - 'sprite-menu-css' => 'e289f6ce', - 'syntax-highlighting-css' => 'e289f6ce', + 'phabricator-transaction-view-css' => '866406fa', + 'phabricator-zindex-css' => '866406fa', + 'phui-button-css' => '866406fa', + 'phui-form-css' => '866406fa', + 'phui-icon-view-css' => '866406fa', + 'phui-spacing-css' => '866406fa', + 'sprite-apps-large-css' => '866406fa', + 'sprite-gradient-css' => '866406fa', + 'sprite-icons-css' => '866406fa', + 'sprite-menu-css' => '866406fa', + 'syntax-highlighting-css' => '866406fa', ), )); diff --git a/webroot/rsrc/css/application/base/notification-menu.css b/webroot/rsrc/css/application/base/notification-menu.css index a3f826b9fc..792a859901 100644 --- a/webroot/rsrc/css/application/base/notification-menu.css +++ b/webroot/rsrc/css/application/base/notification-menu.css @@ -59,7 +59,7 @@ .phabricator-notification-list .phabricator-notification-unread, .phabricator-notification-menu .phabricator-notification-unread { - background: #aacfef; + background: {$lightblue}; } .phabricator-notification-header { diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css index 5972ba6b4a..74b46d668f 100644 --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -149,13 +149,13 @@ position: absolute; left: 35px; top: 3px; - background: #f00; + background: {$red}; border-radius: 10px; - color: white; + color: #FFF; font-weight: bold; - padding: 1px 6px 2px; - border: 1px solid #a00; - font-size: 12px; + padding: 1px 5px 2px; + border: 1px solid #333; + font-size: 11px; } .conpherence-menu .hide-unread-count .conpherence-menu-item-unread-count, diff --git a/webroot/rsrc/css/application/conpherence/notification.css b/webroot/rsrc/css/application/conpherence/notification.css index 92ab4e7b0b..565504cbc2 100644 --- a/webroot/rsrc/css/application/conpherence/notification.css +++ b/webroot/rsrc/css/application/conpherence/notification.css @@ -10,13 +10,12 @@ .phabricator-notification .conpherence-menu-item-view { display: block; height: 55px; - width: 100%; overflow: hidden; position: relative; text-decoration: none; - border-bottom: solid 1px #E9E9E9; + border-bottom: none; border-right: 0; - border-left: 2px solid transparent; + border-left: 0; } .phabricator-notification .conpherence-menu-item-view @@ -28,7 +27,7 @@ width: 35px; height: 35px; background-size: 35px; - border: 4px solid #DEDEDE; + border: 4px solid #e7e7e7; border-radius: 3px; } @@ -61,13 +60,13 @@ position: absolute; left: 35px; top: 3px; - background: #f00; + background: {$red}; border-radius: 10px; - color: white; + color: #FFF; font-weight: bold; - padding: 1px 6px 2px; - border: 1px solid #a00; - font-size: 12px; + padding: 1px 5px 2px; + border: 1px solid #333; + font-size: 11px; } .phabricator-notification .conpherence-menu-item-view