From e11637e489456c7e5339fe3e47799e5a05a4e74b Mon Sep 17 00:00:00 2001 From: Chad Little Date: Tue, 22 Jan 2013 18:37:09 -0800 Subject: [PATCH] Updates the error/notice box with cleaner look, softer colors. Summary: These colors are more inline with the look and feel and match the table colors. Test Plan: Used Inspect Element to test each color combination on an error page. Reviewers: epriestley, btrahan Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4593 --- src/__celerity_resource_map__.php | 84 ++++++++++++------------- webroot/rsrc/css/aphront/error-view.css | 48 +++++++------- 2 files changed, 65 insertions(+), 67 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 24d9f52536..bdf28af4c5 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -602,7 +602,7 @@ celerity_register_resource_map(array( ), 'aphront-error-view-css' => array( - 'uri' => '/res/410dbe72/rsrc/css/aphront/error-view.css', + 'uri' => '/res/048ed376/rsrc/css/aphront/error-view.css', 'type' => 'css', 'requires' => array( @@ -674,7 +674,7 @@ celerity_register_resource_map(array( ), 'aphront-table-view-css' => array( - 'uri' => '/res/fa7af0ad/rsrc/css/aphront/table-view.css', + 'uri' => '/res/fd33a0f0/rsrc/css/aphront/table-view.css', 'type' => 'css', 'requires' => array( @@ -3247,7 +3247,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '86c4a3b2' => + '52e51755' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3291,7 +3291,7 @@ celerity_register_resource_map(array( 36 => 'phabricator-object-item-list-view-css', 37 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/86c4a3b2/core.pkg.css', + 'uri' => '/res/pkg/52e51755/core.pkg.css', 'type' => 'css', ), 'c90b892e' => @@ -3481,19 +3481,19 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => '83f07678', - 'aphront-crumbs-view-css' => '86c4a3b2', - 'aphront-dialog-view-css' => '86c4a3b2', - 'aphront-error-view-css' => '86c4a3b2', - 'aphront-form-view-css' => '86c4a3b2', + 'aphront-crumbs-view-css' => '52e51755', + 'aphront-dialog-view-css' => '52e51755', + 'aphront-error-view-css' => '52e51755', + 'aphront-form-view-css' => '52e51755', 'aphront-headsup-action-list-view-css' => 'ec01d039', - 'aphront-headsup-view-css' => '86c4a3b2', - 'aphront-list-filter-view-css' => '86c4a3b2', - 'aphront-pager-view-css' => '86c4a3b2', - 'aphront-panel-view-css' => '86c4a3b2', - 'aphront-table-view-css' => '86c4a3b2', - 'aphront-tokenizer-control-css' => '86c4a3b2', - 'aphront-tooltip-css' => '86c4a3b2', - 'aphront-typeahead-control-css' => '86c4a3b2', + 'aphront-headsup-view-css' => '52e51755', + 'aphront-list-filter-view-css' => '52e51755', + 'aphront-pager-view-css' => '52e51755', + 'aphront-panel-view-css' => '52e51755', + 'aphront-table-view-css' => '52e51755', + 'aphront-tokenizer-control-css' => '52e51755', + 'aphront-tooltip-css' => '52e51755', + 'aphront-typeahead-control-css' => '52e51755', 'differential-changeset-view-css' => 'ec01d039', 'differential-core-view-css' => 'ec01d039', 'differential-inline-comment-editor' => 'ac53d36a', @@ -3507,7 +3507,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => 'ec01d039', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '86c4a3b2', + 'global-drag-and-drop-css' => '52e51755', 'inline-comment-summary-css' => 'ec01d039', 'javelin-aphlict' => 'c90b892e', 'javelin-behavior' => 'fbeded59', @@ -3577,48 +3577,48 @@ celerity_register_resource_map(array( 'javelin-util' => 'fbeded59', 'javelin-vector' => 'fbeded59', 'javelin-workflow' => 'fbeded59', - 'lightbox-attachment-css' => '86c4a3b2', + 'lightbox-attachment-css' => '52e51755', 'maniphest-task-summary-css' => '83f07678', 'maniphest-transaction-detail-css' => '83f07678', 'phabricator-busy' => 'c90b892e', 'phabricator-content-source-view-css' => 'ec01d039', - 'phabricator-core-buttons-css' => '86c4a3b2', - 'phabricator-core-css' => '86c4a3b2', - 'phabricator-crumbs-view-css' => '86c4a3b2', - 'phabricator-directory-css' => '86c4a3b2', + 'phabricator-core-buttons-css' => '52e51755', + 'phabricator-core-css' => '52e51755', + 'phabricator-crumbs-view-css' => '52e51755', + 'phabricator-directory-css' => '52e51755', 'phabricator-drag-and-drop-file-upload' => 'ac53d36a', 'phabricator-dropdown-menu' => 'c90b892e', 'phabricator-file-upload' => 'c90b892e', - 'phabricator-filetree-view-css' => '86c4a3b2', - 'phabricator-flag-css' => '86c4a3b2', - 'phabricator-form-view-css' => '86c4a3b2', - 'phabricator-header-view-css' => '86c4a3b2', - 'phabricator-jump-nav' => '86c4a3b2', + 'phabricator-filetree-view-css' => '52e51755', + 'phabricator-flag-css' => '52e51755', + 'phabricator-form-view-css' => '52e51755', + 'phabricator-header-view-css' => '52e51755', + 'phabricator-jump-nav' => '52e51755', 'phabricator-keyboard-shortcut' => 'c90b892e', 'phabricator-keyboard-shortcut-manager' => 'c90b892e', - 'phabricator-main-menu-view' => '86c4a3b2', + 'phabricator-main-menu-view' => '52e51755', 'phabricator-menu-item' => 'c90b892e', - 'phabricator-nav-view-css' => '86c4a3b2', + 'phabricator-nav-view-css' => '52e51755', 'phabricator-notification' => 'c90b892e', - 'phabricator-notification-css' => '86c4a3b2', - 'phabricator-notification-menu-css' => '86c4a3b2', - 'phabricator-object-item-list-view-css' => '86c4a3b2', + 'phabricator-notification-css' => '52e51755', + 'phabricator-notification-menu-css' => '52e51755', + 'phabricator-object-item-list-view-css' => '52e51755', 'phabricator-object-selector-css' => 'ec01d039', 'phabricator-paste-file-upload' => 'c90b892e', 'phabricator-prefab' => 'c90b892e', 'phabricator-project-tag-css' => '83f07678', - 'phabricator-remarkup-css' => '86c4a3b2', + 'phabricator-remarkup-css' => '52e51755', 'phabricator-shaped-request' => 'ac53d36a', - 'phabricator-side-menu-view-css' => '86c4a3b2', - 'phabricator-standard-page-view' => '86c4a3b2', + 'phabricator-side-menu-view-css' => '52e51755', + 'phabricator-standard-page-view' => '52e51755', 'phabricator-textareautils' => 'c90b892e', 'phabricator-tooltip' => 'c90b892e', - 'phabricator-transaction-view-css' => '86c4a3b2', - 'phabricator-zindex-css' => '86c4a3b2', - 'sprite-apps-large-css' => '86c4a3b2', - 'sprite-gradient-css' => '86c4a3b2', - 'sprite-icon-css' => '86c4a3b2', - 'sprite-menu-css' => '86c4a3b2', - 'syntax-highlighting-css' => '86c4a3b2', + 'phabricator-transaction-view-css' => '52e51755', + 'phabricator-zindex-css' => '52e51755', + 'sprite-apps-large-css' => '52e51755', + 'sprite-gradient-css' => '52e51755', + 'sprite-icon-css' => '52e51755', + 'sprite-menu-css' => '52e51755', + 'syntax-highlighting-css' => '52e51755', ), )); diff --git a/webroot/rsrc/css/aphront/error-view.css b/webroot/rsrc/css/aphront/error-view.css index 21f6e36156..23b969bd35 100644 --- a/webroot/rsrc/css/aphront/error-view.css +++ b/webroot/rsrc/css/aphront/error-view.css @@ -3,67 +3,65 @@ */ .aphront-error-view { - margin: 1em 2%; - box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1); + margin: 20px; border-style: solid; border-width: 1px; } +.device-phone .aphront-error-view { + margin: 10px; +} + .aphront-error-view-body { - padding: 0.5em 1em; - font-size: 12px; + padding: 10px; line-height: 1.6em; } .aphront-error-view-head { - font-size: 13px; - padding: 0.5em 1em; + padding: 10px 10px 0 10px; font-weight: bold; color: #333333; } .aphront-error-view-list { - margin: 0.2em 0 0.2em 2em; + margin: 0 0 0 20px; list-style: disc; } .aphront-error-severity-error { - border-color: #aa0000; - background: #fff3f3; + color: #b94a48; + border-color: #eed3d7; + background: #f2dede; } .aphront-error-severity-error .aphront-error-view-head { - background: #ffe3e3; + color: #aa0000; } .aphront-error-severity-warning { - border-color: #888800; - background: #ffffee; + color: #bc7837; + border-color: #ebdcc1; + background: #fcf8e3; } .aphront-error-severity-warning .aphront-error-view-head { - background: #ffffcc; + color: #bc7837; + background: #fcf8e3; } .aphront-error-severity-notice { - border-color: #000088; - background: #f3f3ff; + color: #3a87ad; + border-color: #a4bdec; + background: #dee7f8; } .aphront-error-severity-notice .aphront-error-view-head { - background: #e3e3ff; + color: #3a87ad; + background: #dee7f8; } .aphront-error-severity-nodata { border-color: #dfdfdf; background: #f3f3f3; - - color: #666666; - - box-shadow: 0px 0px 0px #000; + color: #666; } - -.aphront-error-severity-nodata .aphront-error-view-head { - background: #e3e3e3; -} -