Permalink
Browse files

ENHANCEMENT Message colours updated

  • Loading branch information...
1 parent 169366a commit f988ae316383772a59641294f40b3d79e5b4177d @clarkepaul clarkepaul committed Nov 6, 2012
View
@@ -6,3 +6,5 @@
css/GridField_print.css
admin/thirdparty/chosen/node_modules
+
+
View
@@ -1,5 +1,6 @@
/** This file contains the default theme definitions for the admin interface. Please put mostly SCSS variable definitions in here, and leave the actual styling to _style.scss and auxilliary files. */
/** ----------------------------------------------- Colours ------------------------------------------------ */
+/*$color-optional: #a1d2eb !default; */
/** ----------------------------------------------- Textures ----------------------------------------------- */
/** ----------------------------------------------- Typography. ------------------------------------------------ */
/** ----------------------------------------------- Grid Units (px) We have a vertical rhythm that the grid is based off both x (=horizontal) and y (=vertical). All internal padding and margins are scaled to this and accounting for paragraphs ------------------------------------------------ */
View
@@ -1,5 +1,6 @@
/** This file contains the default theme definitions for the admin interface. Please put mostly SCSS variable definitions in here, and leave the actual styling to _style.scss and auxilliary files. */
/** ----------------------------------------------- Colours ------------------------------------------------ */
+/*$color-optional: #a1d2eb !default; */
/** ----------------------------------------------- Textures ----------------------------------------------- */
/** ----------------------------------------------- Typography. ------------------------------------------------ */
/** ----------------------------------------------- Grid Units (px) We have a vertical rhythm that the grid is based off both x (=horizontal) and y (=vertical). All internal padding and margins are scaled to this and accounting for paragraphs ------------------------------------------------ */
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -388,41 +388,38 @@ body.cms {
* Messages
* -------------------------------------------- */
-.message {
+.message { // White
display: block;
clear: both;
margin: 0 0 $grid-y 0;
- padding: $grid-y - 1 $grid-x - 1;
- font-weight: bold;
+ padding: $grid-y + $grid-x/4 $grid-x + $grid-x/2;
+ font-weight: normal;
border: 1px #ccc solid;
- background:#fff; //for browsers that don't understand rgba
- background:rgba(#fff,0.5);
+ background: #fff; // for browsers that don't understand rgba
+ background: rgba(#fff,0.5);
+ text-shadow: none;
@include border-radius(3px 3px 3px 3px);
- &.notice {
- background: $color-notice;
- border-color: darken(adjust-hue($color-notice, -10), 7%);
- }
- &.warning {
- background-color: lighten($color-warning, 20%);
+ &.notice {
+ background-color: lighten($color-notice,22%); // Blue
+ border-color: $color-notice;
+ }
+ &.warning { // Yellow
+ background-color: lighten($color-warning,47%);
border-color: $color-warning;
}
- &.error, &.bad, &.required, &.validation {
- background: lighten($color-error, 43%);//for browsers that don't understand rgba
- background: rgba(lighten($color-error, 40%), 0.5);
- border-color: lighten(adjust-hue($color-error, -10), 38%);
- color:$color-error;
+ &.error, &.bad, &.required, &.validation { // Red
+ background-color: lighten($color-error,24%);
+ border-color: $color-error;
}
- &.good {
- background: $color-good;//for browsers that don't understand rgba
- background: rgba($color-good,0.7);
+ &.good { // Green
+ background-color: lighten($color-good,40%);
border-color: $color-good;
- color:#fff;
- @include text-shadow(1px -1px 0 $color-button-constructive);
- a {
- text-shadow:none;
- }
}
+ /* // Orange
+ background: lighten($color-optional,16%);
+ border-color: $color-optional;
+ */
p {
margin: 0;
@@ -54,10 +54,11 @@ $color-button-destructive: #f00 !default;
$color-button-disabled: #eeeded !default;
-$color-warning: #FF9300 !default;
-$color-error: #b94a48 !default;
-$color-notice: #d9edf7 !default;
-$color-good: #65A839 !default;
+$color-notice: #93CDE8 !default; // blue
+$color-warning: #E9D104 !default; // yellow
+$color-error: #e68288 !default; // red
+$color-good: #72c34b !default; // green
+/*$color-optional: #a1d2eb !default; */ // orange
$color-cms-batchactions-menu-background: #f5f5f5 !default;
$color-cms-batchactions-menu-selected-background: #efe999 !default;
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit f988ae3

Please sign in to comment.