From f34dcbc73be97f3b5636fbedce24064e3042c0a5 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Wed, 19 Jun 2013 08:37:56 -0700 Subject: [PATCH] Use color palette in timeline view Summary: Updated Timeline to use new colors. Test Plan: UIExamples Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D6231 --- src/__celerity_resource_map__.php | 92 +++++++++---------- .../examples/PHUIColorPalletteExample.php | 2 +- .../phabricator-object-item-list-view.css | 4 +- .../css/layout/phabricator-timeline-view.css | 40 ++++---- 4 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 819db90911..e221c4a2b6 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -3233,7 +3233,7 @@ celerity_register_resource_map(array( ), 'phabricator-object-item-list-view-css' => array( - 'uri' => '/res/2a0eb432/rsrc/css/layout/phabricator-object-item-list-view.css', + 'uri' => '/res/2eb1ac99/rsrc/css/layout/phabricator-object-item-list-view.css', 'type' => 'css', 'requires' => array( @@ -3429,7 +3429,7 @@ celerity_register_resource_map(array( ), 'phabricator-timeline-view-css' => array( - 'uri' => '/res/5517bf1a/rsrc/css/layout/phabricator-timeline-view.css', + 'uri' => '/res/642a9f44/rsrc/css/layout/phabricator-timeline-view.css', 'type' => 'css', 'requires' => array( @@ -4057,7 +4057,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '24fadc3c' => + '6f230701' => 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/24fadc3c/core.pkg.css', + 'uri' => '/res/pkg/6f230701/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' => '24fadc3c', - 'aphront-error-view-css' => '24fadc3c', - 'aphront-form-view-css' => '24fadc3c', - 'aphront-list-filter-view-css' => '24fadc3c', - 'aphront-pager-view-css' => '24fadc3c', - 'aphront-panel-view-css' => '24fadc3c', - 'aphront-table-view-css' => '24fadc3c', - 'aphront-tokenizer-control-css' => '24fadc3c', - 'aphront-tooltip-css' => '24fadc3c', - 'aphront-typeahead-control-css' => '24fadc3c', + 'aphront-dialog-view-css' => '6f230701', + 'aphront-error-view-css' => '6f230701', + 'aphront-form-view-css' => '6f230701', + 'aphront-list-filter-view-css' => '6f230701', + 'aphront-pager-view-css' => '6f230701', + 'aphront-panel-view-css' => '6f230701', + 'aphront-table-view-css' => '6f230701', + 'aphront-tokenizer-control-css' => '6f230701', + 'aphront-tooltip-css' => '6f230701', + 'aphront-typeahead-control-css' => '6f230701', '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' => '24fadc3c', + 'global-drag-and-drop-css' => '6f230701', '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' => '24fadc3c', + 'lightbox-attachment-css' => '6f230701', 'maniphest-task-summary-css' => 'a7ca34a9', 'maniphest-transaction-detail-css' => 'a7ca34a9', - 'phabricator-action-list-view-css' => '24fadc3c', - 'phabricator-application-launch-view-css' => '24fadc3c', + 'phabricator-action-list-view-css' => '6f230701', + 'phabricator-application-launch-view-css' => '6f230701', 'phabricator-busy' => 'f2ad0683', 'phabricator-content-source-view-css' => 'dd27a69b', - 'phabricator-core-css' => '24fadc3c', - 'phabricator-crumbs-view-css' => '24fadc3c', + 'phabricator-core-css' => '6f230701', + 'phabricator-crumbs-view-css' => '6f230701', 'phabricator-drag-and-drop-file-upload' => '9488bb69', 'phabricator-dropdown-menu' => 'f2ad0683', 'phabricator-file-upload' => 'f2ad0683', - 'phabricator-filetree-view-css' => '24fadc3c', - 'phabricator-flag-css' => '24fadc3c', - 'phabricator-form-view-css' => '24fadc3c', - 'phabricator-header-view-css' => '24fadc3c', + 'phabricator-filetree-view-css' => '6f230701', + 'phabricator-flag-css' => '6f230701', + 'phabricator-form-view-css' => '6f230701', + 'phabricator-header-view-css' => '6f230701', 'phabricator-hovercard' => 'f2ad0683', - 'phabricator-jump-nav' => '24fadc3c', + 'phabricator-jump-nav' => '6f230701', 'phabricator-keyboard-shortcut' => 'f2ad0683', 'phabricator-keyboard-shortcut-manager' => 'f2ad0683', - 'phabricator-main-menu-view' => '24fadc3c', + 'phabricator-main-menu-view' => '6f230701', 'phabricator-menu-item' => 'f2ad0683', - 'phabricator-nav-view-css' => '24fadc3c', + 'phabricator-nav-view-css' => '6f230701', 'phabricator-notification' => 'f2ad0683', - 'phabricator-notification-css' => '24fadc3c', - 'phabricator-notification-menu-css' => '24fadc3c', - 'phabricator-object-item-list-view-css' => '24fadc3c', + 'phabricator-notification-css' => '6f230701', + 'phabricator-notification-menu-css' => '6f230701', + 'phabricator-object-item-list-view-css' => '6f230701', 'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-phtize' => 'f2ad0683', 'phabricator-prefab' => 'f2ad0683', 'phabricator-project-tag-css' => 'a7ca34a9', - 'phabricator-property-list-view-css' => '24fadc3c', - 'phabricator-remarkup-css' => '24fadc3c', + 'phabricator-property-list-view-css' => '6f230701', + 'phabricator-remarkup-css' => '6f230701', 'phabricator-shaped-request' => '9488bb69', - 'phabricator-side-menu-view-css' => '24fadc3c', - 'phabricator-standard-page-view' => '24fadc3c', - 'phabricator-tag-view-css' => '24fadc3c', + 'phabricator-side-menu-view-css' => '6f230701', + 'phabricator-standard-page-view' => '6f230701', + 'phabricator-tag-view-css' => '6f230701', 'phabricator-textareautils' => 'f2ad0683', 'phabricator-tooltip' => 'f2ad0683', - 'phabricator-transaction-view-css' => '24fadc3c', - 'phabricator-zindex-css' => '24fadc3c', - 'phui-button-css' => '24fadc3c', - 'phui-form-css' => '24fadc3c', - 'phui-icon-view-css' => '24fadc3c', - 'phui-spacing-css' => '24fadc3c', - 'sprite-apps-large-css' => '24fadc3c', - 'sprite-gradient-css' => '24fadc3c', - 'sprite-icons-css' => '24fadc3c', - 'sprite-menu-css' => '24fadc3c', - 'syntax-highlighting-css' => '24fadc3c', + 'phabricator-transaction-view-css' => '6f230701', + 'phabricator-zindex-css' => '6f230701', + 'phui-button-css' => '6f230701', + 'phui-form-css' => '6f230701', + 'phui-icon-view-css' => '6f230701', + 'phui-spacing-css' => '6f230701', + 'sprite-apps-large-css' => '6f230701', + 'sprite-gradient-css' => '6f230701', + 'sprite-icons-css' => '6f230701', + 'sprite-menu-css' => '6f230701', + 'syntax-highlighting-css' => '6f230701', ), )); diff --git a/src/applications/uiexample/examples/PHUIColorPalletteExample.php b/src/applications/uiexample/examples/PHUIColorPalletteExample.php index 81b2586fea..95c5060c09 100644 --- a/src/applications/uiexample/examples/PHUIColorPalletteExample.php +++ b/src/applications/uiexample/examples/PHUIColorPalletteExample.php @@ -17,7 +17,7 @@ final class PHUIColorPalletteExample extends PhabricatorUIExample { 'd35400' => 'Base Orange', 'f1c40f' => 'Base Yellow', '27ae60' => 'Base Green', - '298094' => 'Base Blue', + '2980b9' => 'Base Blue', 'c6539d' => 'Base Indigo', '8e44ad' => 'Base Violet', ); 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 0f85c27a46..a69bfe9cf4 100644 --- a/webroot/rsrc/css/layout/phabricator-object-item-list-view.css +++ b/webroot/rsrc/css/layout/phabricator-object-item-list-view.css @@ -18,7 +18,7 @@ background: #ffffff; border-style: solid; border-color: #c0c5d1; - border-width: 0 0 0 3px; + border-width: 0 0 0 4px; margin: 5px 0; overflow: hidden; @@ -330,7 +330,7 @@ } .phabricator-object-item-bar-color-grey { - border-left-color: #7f8cbd; + border-left-color: #bdc3c7; } .phabricator-object-item-bar-color-black { diff --git a/webroot/rsrc/css/layout/phabricator-timeline-view.css b/webroot/rsrc/css/layout/phabricator-timeline-view.css index 05f743f50c..b75413b941 100644 --- a/webroot/rsrc/css/layout/phabricator-timeline-view.css +++ b/webroot/rsrc/css/layout/phabricator-timeline-view.css @@ -160,83 +160,83 @@ } .phabricator-timeline-red .phabricator-timeline-border { - border-color: #cc0000; + border-color: #c0392b; } .phabricator-timeline-orange .phabricator-timeline-border { - border-color: #cc7300; + border-color: #d35400; } .phabricator-timeline-yellow .phabricator-timeline-border { - border-color: #ccc000; + border-color: #f1c40f; } .phabricator-timeline-green .phabricator-timeline-border { - border-color: #009b2d; + border-color: #27ae60; } .phabricator-timeline-sky .phabricator-timeline-border { - border-color: #6498cf; + border-color: #3498db; } .phabricator-timeline-blue .phabricator-timeline-border { - border-color: #00659a; + border-color: #2980b9; } .phabricator-timeline-indigo .phabricator-timeline-border { - border-color: #3a00cc; + border-color: #c6539d; } .phabricator-timeline-violet .phabricator-timeline-border { - border-color: #67009b; + border-color: #8e44ad; } .phabricator-timeline-grey .phabricator-timeline-border { - border-color: #999999; + border-color: #888; } .phabricator-timeline-black .phabricator-timeline-border { - border-color: #333333; + border-color: #333; } .phabricator-timeline-red .phabricator-timeline-icon-fill { - background-color: #cc0000; + background-color: #c0392b; } .phabricator-timeline-orange .phabricator-timeline-icon-fill { - background-color: #cc7300; + background-color: #d35400; } .phabricator-timeline-yellow .phabricator-timeline-icon-fill { - background-color: #ccc000; + background-color: #f1c40f; } .phabricator-timeline-green .phabricator-timeline-icon-fill { - background-color: #009b2d; + background-color: #27ae60; } .phabricator-timeline-sky .phabricator-timeline-icon-fill { - background-color: #6498cf; + background-color: #3498db; } .phabricator-timeline-blue .phabricator-timeline-icon-fill { - background-color: #00659a; + background-color: #2980b9; } .phabricator-timeline-indigo .phabricator-timeline-icon-fill { - background-color: #3a00cc; + background-color: #c6539d; } .phabricator-timeline-violet .phabricator-timeline-icon-fill { - background-color: #67009b; + background-color: #8e44ad; } .phabricator-timeline-grey .phabricator-timeline-icon-fill { - background-color: #999999; + background-color: #888; } .phabricator-timeline-black .phabricator-timeline-icon-fill { - background-color: #333333; + background-color: #333; } .phabricator-timeline-shell.anchor-target {