From 63a8780bd5d342014cc1b129321489389f2ff180 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Wed, 19 Jun 2013 15:50:15 -0700 Subject: [PATCH] 83% Light Colors. Summary: This adds an 83% Light set of colors for highlights, warnings, etc. Test Plan: Tested Notifications, Error View, and Color Palette page. Test is out, not quite sure on notifications. Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D6239 --- src/__celerity_resource_map__.php | 94 +++++++++---------- .../examples/PHUIColorPalletteExample.php | 17 ++++ webroot/rsrc/css/aphront/error-view.css | 22 ++--- webroot/rsrc/css/aphront/notification.css | 20 ++-- .../phabricator-object-item-list-view.css | 4 +- 5 files changed, 86 insertions(+), 71 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index b21dbf2302..034baffe55 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -805,7 +805,7 @@ celerity_register_resource_map(array( ), 'aphront-error-view-css' => array( - 'uri' => '/res/5f43a7c5/rsrc/css/aphront/error-view.css', + 'uri' => '/res/9684f1e9/rsrc/css/aphront/error-view.css', 'type' => 'css', 'requires' => array( @@ -3215,7 +3215,7 @@ celerity_register_resource_map(array( ), 'phabricator-notification-css' => array( - 'uri' => '/res/664b9bec/rsrc/css/aphront/notification.css', + 'uri' => '/res/3b18922a/rsrc/css/aphront/notification.css', 'type' => 'css', 'requires' => array( @@ -3233,7 +3233,7 @@ celerity_register_resource_map(array( ), 'phabricator-object-item-list-view-css' => array( - 'uri' => '/res/2eb1ac99/rsrc/css/layout/phabricator-object-item-list-view.css', + 'uri' => '/res/2acf1b18/rsrc/css/layout/phabricator-object-item-list-view.css', 'type' => 'css', 'requires' => array( @@ -4057,7 +4057,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - 'ec799ff8' => + '1f77b30f' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4105,7 +4105,7 @@ celerity_register_resource_map(array( 40 => 'phabricator-property-list-view-css', 41 => 'phabricator-tag-view-css', ), - 'uri' => '/res/pkg/ec799ff8/core.pkg.css', + 'uri' => '/res/pkg/1f77b30f/core.pkg.css', 'type' => 'css', ), 'f2ad0683' => @@ -4299,16 +4299,16 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => 'a7ca34a9', - 'aphront-dialog-view-css' => 'ec799ff8', - 'aphront-error-view-css' => 'ec799ff8', - 'aphront-form-view-css' => 'ec799ff8', - 'aphront-list-filter-view-css' => 'ec799ff8', - 'aphront-pager-view-css' => 'ec799ff8', - 'aphront-panel-view-css' => 'ec799ff8', - 'aphront-table-view-css' => 'ec799ff8', - 'aphront-tokenizer-control-css' => 'ec799ff8', - 'aphront-tooltip-css' => 'ec799ff8', - 'aphront-typeahead-control-css' => 'ec799ff8', + 'aphront-dialog-view-css' => '1f77b30f', + 'aphront-error-view-css' => '1f77b30f', + 'aphront-form-view-css' => '1f77b30f', + 'aphront-list-filter-view-css' => '1f77b30f', + 'aphront-pager-view-css' => '1f77b30f', + 'aphront-panel-view-css' => '1f77b30f', + 'aphront-table-view-css' => '1f77b30f', + 'aphront-tokenizer-control-css' => '1f77b30f', + 'aphront-tooltip-css' => '1f77b30f', + 'aphront-typeahead-control-css' => '1f77b30f', 'differential-changeset-view-css' => 'dd27a69b', 'differential-core-view-css' => 'dd27a69b', 'differential-inline-comment-editor' => '9488bb69', @@ -4322,7 +4322,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' => 'ec799ff8', + 'global-drag-and-drop-css' => '1f77b30f', 'inline-comment-summary-css' => 'dd27a69b', 'javelin-aphlict' => 'f2ad0683', 'javelin-behavior' => 'a9f14d76', @@ -4396,55 +4396,55 @@ celerity_register_resource_map(array( 'javelin-util' => 'a9f14d76', 'javelin-vector' => 'a9f14d76', 'javelin-workflow' => 'a9f14d76', - 'lightbox-attachment-css' => 'ec799ff8', + 'lightbox-attachment-css' => '1f77b30f', 'maniphest-task-summary-css' => 'a7ca34a9', 'maniphest-transaction-detail-css' => 'a7ca34a9', - 'phabricator-action-list-view-css' => 'ec799ff8', - 'phabricator-application-launch-view-css' => 'ec799ff8', + 'phabricator-action-list-view-css' => '1f77b30f', + 'phabricator-application-launch-view-css' => '1f77b30f', 'phabricator-busy' => 'f2ad0683', 'phabricator-content-source-view-css' => 'dd27a69b', - 'phabricator-core-css' => 'ec799ff8', - 'phabricator-crumbs-view-css' => 'ec799ff8', + 'phabricator-core-css' => '1f77b30f', + 'phabricator-crumbs-view-css' => '1f77b30f', 'phabricator-drag-and-drop-file-upload' => '9488bb69', 'phabricator-dropdown-menu' => 'f2ad0683', 'phabricator-file-upload' => 'f2ad0683', - 'phabricator-filetree-view-css' => 'ec799ff8', - 'phabricator-flag-css' => 'ec799ff8', - 'phabricator-form-view-css' => 'ec799ff8', - 'phabricator-header-view-css' => 'ec799ff8', + 'phabricator-filetree-view-css' => '1f77b30f', + 'phabricator-flag-css' => '1f77b30f', + 'phabricator-form-view-css' => '1f77b30f', + 'phabricator-header-view-css' => '1f77b30f', 'phabricator-hovercard' => 'f2ad0683', - 'phabricator-jump-nav' => 'ec799ff8', + 'phabricator-jump-nav' => '1f77b30f', 'phabricator-keyboard-shortcut' => 'f2ad0683', 'phabricator-keyboard-shortcut-manager' => 'f2ad0683', - 'phabricator-main-menu-view' => 'ec799ff8', + 'phabricator-main-menu-view' => '1f77b30f', 'phabricator-menu-item' => 'f2ad0683', - 'phabricator-nav-view-css' => 'ec799ff8', + 'phabricator-nav-view-css' => '1f77b30f', 'phabricator-notification' => 'f2ad0683', - 'phabricator-notification-css' => 'ec799ff8', - 'phabricator-notification-menu-css' => 'ec799ff8', - 'phabricator-object-item-list-view-css' => 'ec799ff8', + 'phabricator-notification-css' => '1f77b30f', + 'phabricator-notification-menu-css' => '1f77b30f', + 'phabricator-object-item-list-view-css' => '1f77b30f', 'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-phtize' => 'f2ad0683', 'phabricator-prefab' => 'f2ad0683', 'phabricator-project-tag-css' => 'a7ca34a9', - 'phabricator-property-list-view-css' => 'ec799ff8', - 'phabricator-remarkup-css' => 'ec799ff8', + 'phabricator-property-list-view-css' => '1f77b30f', + 'phabricator-remarkup-css' => '1f77b30f', 'phabricator-shaped-request' => '9488bb69', - 'phabricator-side-menu-view-css' => 'ec799ff8', - 'phabricator-standard-page-view' => 'ec799ff8', - 'phabricator-tag-view-css' => 'ec799ff8', + 'phabricator-side-menu-view-css' => '1f77b30f', + 'phabricator-standard-page-view' => '1f77b30f', + 'phabricator-tag-view-css' => '1f77b30f', 'phabricator-textareautils' => 'f2ad0683', 'phabricator-tooltip' => 'f2ad0683', - 'phabricator-transaction-view-css' => 'ec799ff8', - 'phabricator-zindex-css' => 'ec799ff8', - 'phui-button-css' => 'ec799ff8', - 'phui-form-css' => 'ec799ff8', - 'phui-icon-view-css' => 'ec799ff8', - 'phui-spacing-css' => 'ec799ff8', - 'sprite-apps-large-css' => 'ec799ff8', - 'sprite-gradient-css' => 'ec799ff8', - 'sprite-icons-css' => 'ec799ff8', - 'sprite-menu-css' => 'ec799ff8', - 'syntax-highlighting-css' => 'ec799ff8', + 'phabricator-transaction-view-css' => '1f77b30f', + 'phabricator-zindex-css' => '1f77b30f', + 'phui-button-css' => '1f77b30f', + 'phui-form-css' => '1f77b30f', + 'phui-icon-view-css' => '1f77b30f', + 'phui-spacing-css' => '1f77b30f', + 'sprite-apps-large-css' => '1f77b30f', + 'sprite-gradient-css' => '1f77b30f', + 'sprite-icons-css' => '1f77b30f', + 'sprite-menu-css' => '1f77b30f', + 'syntax-highlighting-css' => '1f77b30f', ), )); diff --git a/src/applications/uiexample/examples/PHUIColorPalletteExample.php b/src/applications/uiexample/examples/PHUIColorPalletteExample.php index 95c5060c09..5769b4fb01 100644 --- a/src/applications/uiexample/examples/PHUIColorPalletteExample.php +++ b/src/applications/uiexample/examples/PHUIColorPalletteExample.php @@ -14,12 +14,19 @@ final class PHUIColorPalletteExample extends PhabricatorUIExample { $colors = array( 'c0392b' => 'Base Red', + 'f4dddb' => '83% Red', 'd35400' => 'Base Orange', + 'f7e2d4' => '83% Orange', 'f1c40f' => 'Base Yellow', + 'fdf5d4' => '83% Yellow', '27ae60' => 'Base Green', + 'dbf2e4' => '83% Green', '2980b9' => 'Base Blue', + 'daeaf3' => '83% Blue', 'c6539d' => 'Base Indigo', + 'f5e2ef' => '83% Indigo', '8e44ad' => 'Base Violet', + 'ecdff1' => '83% Violet' ); $darks = array( @@ -41,7 +48,9 @@ final class PHUIColorPalletteExample extends PhabricatorUIExample { } $c_column = array(); + $url = array(); foreach ($colors as $color => $name) { + $url[] = $color; $c_column[] = phutil_tag( 'div', array( @@ -50,12 +59,20 @@ final class PHUIColorPalletteExample extends PhabricatorUIExample { $name.' #'.$color); } + $color_url = phutil_tag( + 'a', + array( + 'href' => 'http://color.hailpixel.com/#'.implode(',', $url), + 'class' => 'button grey mlb'), + 'Color Palette'); + $layout1 = id(new PHUIBoxView()) ->appendChild($d_column) ->setShadow(true) ->addPadding(PHUI::PADDING_LARGE); $layout2 = id(new PHUIBoxView()) + ->appendChild($color_url) ->appendChild($c_column) ->setShadow(true) ->addPadding(PHUI::PADDING_LARGE); diff --git a/webroot/rsrc/css/aphront/error-view.css b/webroot/rsrc/css/aphront/error-view.css index 529b4e3efb..1ebe3bb2b1 100644 --- a/webroot/rsrc/css/aphront/error-view.css +++ b/webroot/rsrc/css/aphront/error-view.css @@ -36,35 +36,33 @@ } .aphront-error-severity-error { - color: #b94a48; - border-color: #eed3d7; - background: #f2dede; + color: #c0392b; + border-color: #c0392b; + background: #f4dddb; } .aphront-error-severity-error .aphront-error-view-head { - color: #aa0000; + color: #c0392b; } .aphront-error-severity-warning { color: #bc7837; - border-color: #ebdcc1; - background: #fcf8e3; + border-color: #f1c40f; + background: #fdf5d4; } .aphront-error-severity-warning .aphront-error-view-head { color: #bc7837; - background: #fcf8e3; } .aphront-error-severity-notice { - color: #3a87ad; - border-color: #a4bdec; - background: #dee7f8; + color: #2980b9; + border-color: #2980b9; + background: #daeaf3; } .aphront-error-severity-notice .aphront-error-view-head { - color: #3a87ad; - background: #dee7f8; + color: #2980b9; } .aphront-error-severity-nodata { diff --git a/webroot/rsrc/css/aphront/notification.css b/webroot/rsrc/css/aphront/notification.css index e8844b6921..c8f9d40831 100644 --- a/webroot/rsrc/css/aphront/notification.css +++ b/webroot/rsrc/css/aphront/notification.css @@ -16,9 +16,9 @@ font-size: 11px; overflow: hidden; - background: #f3f6ff; + background: #daeaf3; color: #444444; - border: 1px solid #afbfcf; + border: 1px solid #2980b9; cursor: pointer; @@ -28,21 +28,21 @@ } .jx-notification-alert { - background: #ffffa0; - border: 1px solid #aaaa60; + background: #fdf5d4; + border: 1px solid #f1c40f; } .jx-notification-debug { - background: #ffa0ff; - border: 1px solid #aa60aa; + background: #f5e2ef; + border: 1px solid #c6539d; } .jx-notification-done { - background: #d0ffd0; - border: 1px solid #60aa60; + background: #dbf2e4; + border: 1px solid #27ae60; } .jx-notification-error { - background: #ffd0d0; - border: 1px solid #aa6060; + background: #f4dddb; + border: 1px solid #c0392b; } diff --git a/webroot/rsrc/css/layout/phabricator-object-item-list-view.css b/webroot/rsrc/css/layout/phabricator-object-item-list-view.css index a69bfe9cf4..91aebae5cd 100644 --- a/webroot/rsrc/css/layout/phabricator-object-item-list-view.css +++ b/webroot/rsrc/css/layout/phabricator-object-item-list-view.css @@ -345,7 +345,7 @@ */ .phabricator-object-item-highlighted { - background: rgb(253, 255, 221); + background: #fdf5d4; } .phabricator-object-list-cards @@ -355,7 +355,7 @@ } .phabricator-object-item-selected { - background: #bfdcff; + background: #daeaf3; } .phabricator-object-list-flush .aphront-error-view {