Skip to content

Commit

Permalink
ENHANCEMENT Message colours updated
Browse files Browse the repository at this point in the history
  • Loading branch information
clarkepaul committed Nov 6, 2012
1 parent 169366a commit f988ae3
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 38 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@
css/GridField_print.css
admin/thirdparty/chosen/node_modules



1 change: 1 addition & 0 deletions admin/css/ie7.css
Original file line number Diff line number Diff line change
@@ -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 ------------------------------------------------ */
Expand Down
1 change: 1 addition & 0 deletions admin/css/ie8.css
Original file line number Diff line number Diff line change
@@ -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 ------------------------------------------------ */
Expand Down
15 changes: 9 additions & 6 deletions admin/css/screen.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 21 additions & 24 deletions admin/scss/_style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions admin/scss/themes/_default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions css/AssetUploadField.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/GridField.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/UploadField.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f988ae3

Please sign in to comment.