Skip to content
This repository
Browse code

ENHANCEMENT Message colours updated

  • Loading branch information...
commit f988ae316383772a59641294f40b3d79e5b4177d 1 parent 169366a
Paul authored November 06, 2012
2  .gitignore
@@ -6,3 +6,5 @@
6 6
 css/GridField_print.css
7 7
 admin/thirdparty/chosen/node_modules
8 8
 
  9
+
  10
+
1  admin/css/ie7.css
... ...
@@ -1,5 +1,6 @@
1 1
 /** 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. */
2 2
 /** ----------------------------------------------- Colours ------------------------------------------------ */
  3
+/*$color-optional: #a1d2eb !default; */
3 4
 /** ----------------------------------------------- Textures ----------------------------------------------- */
4 5
 /** ----------------------------------------------- Typography.  ------------------------------------------------ */
5 6
 /** ----------------------------------------------- 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 ------------------------------------------------ */
1  admin/css/ie8.css
... ...
@@ -1,5 +1,6 @@
1 1
 /** 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. */
2 2
 /** ----------------------------------------------- Colours ------------------------------------------------ */
  3
+/*$color-optional: #a1d2eb !default; */
3 4
 /** ----------------------------------------------- Textures ----------------------------------------------- */
4 5
 /** ----------------------------------------------- Typography.  ------------------------------------------------ */
5 6
 /** ----------------------------------------------- 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 ------------------------------------------------ */
15  admin/css/screen.css
@@ -24,6 +24,7 @@ If more variables exist in the future, consider creating a variables file.*/
24 24
 /** ----------------------------- Theme ------------------------------ */
25 25
 /** 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. */
26 26
 /** ----------------------------------------------- Colours ------------------------------------------------ */
  27
+/*$color-optional: #a1d2eb !default; */
27 28
 /** ----------------------------------------------- Textures ----------------------------------------------- */
28 29
 /** ----------------------------------------------- Typography.  ------------------------------------------------ */
29 30
 /** ----------------------------------------------- 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 ------------------------------------------------ */
@@ -334,12 +335,14 @@ body.cms { overflow: hidden; }
334 335
 .cms-content-actions { margin: 0; padding: 12px 16px; z-index: 0; border-top: 1px solid rgba(201, 205, 206, 0.8); border-top: 1px solid #FAFAFA; -webkit-box-shadow: #cccccc 0 -1px 1px; -moz-box-shadow: #cccccc 0 -1px 1px; box-shadow: #cccccc 0 -1px 1px; }
335 336
 
336 337
 /** -------------------------------------------- Messages -------------------------------------------- */
337  
-.message { display: block; clear: both; margin: 0 0 8px 0; padding: 7px 7px; font-weight: bold; border: 1px #ccc solid; background: #fff; background: rgba(255, 255, 255, 0.5); -webkit-border-radius: 3px 3px 3px 3px; -moz-border-radius: 3px 3px 3px 3px; -ms-border-radius: 3px 3px 3px 3px; -o-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; }
338  
-.message.notice { background: #d9edf7; border-color: #bce8f1; }
339  
-.message.warning { background-color: #ffbe66; border-color: #ff9300; }
340  
-.message.error, .message.bad, .message.required, .message.validation { background: #f6e7e7; background: rgba(241, 220, 220, 0.5); border-color: #efd4d8; color: #b94a48; }
341  
-.message.good { background: #65a839; background: rgba(101, 168, 57, 0.7); border-color: #65a839; color: #fff; text-shadow: 1px -1px 0 #1f9433; }
342  
-.message.good a, .message.good .cms .jstree .jstree-wholerow a:hover, .cms .jstree .jstree-wholerow .message.good a:hover, .message.good .cms .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow #vakata-contextmenu .message.good li.vakata-hover > a, .message.good .cms #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .jstree .jstree-wholerow .message.good li.vakata-hover > a, .message.good .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .message.good li.vakata-hover > a, .message.good .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow .message.good li.vakata-hover > a, .message.good .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .message.good a:hover, .message.good .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu .message.good li.vakata-hover > a, .message.good .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .message.good li.vakata-hover > a, .message.good .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu .message.good li.vakata-hover > a, .message.good .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow .message.good li.vakata-hover > a { text-shadow: none; }
  338
+.message { display: block; clear: both; margin: 0 0 8px 0; padding: 10px 12px; font-weight: normal; border: 1px #ccc solid; background: #fff; background: rgba(255, 255, 255, 0.5); text-shadow: none; -webkit-border-radius: 3px 3px 3px 3px; -moz-border-radius: 3px 3px 3px 3px; -ms-border-radius: 3px 3px 3px 3px; -o-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; /*													// Orange
  339
+	background: lighten($color-optional,16%);
  340
+	border-color: $color-optional;
  341
+*/ }
  342
+.message.notice { background-color: #f0f8fc; border-color: #93cde8; }
  343
+.message.warning { background-color: #fefbde; border-color: #e9d104; }
  344
+.message.error, .message.bad, .message.required, .message.validation { background-color: #fae8e9; border-color: #e68288; }
  345
+.message.good { background-color: #eaf6e4; border-color: #72c34b; }
343 346
 .message p { margin: 0; }
344 347
 
345 348
 /** -------------------------------------------- Page icons -------------------------------------------- */
45  admin/scss/_style.scss
@@ -388,41 +388,38 @@ body.cms {
388 388
  * Messages
389 389
  * -------------------------------------------- */
390 390
 
391  
-.message {
  391
+.message {												// White
392 392
 	display: block;
393 393
 	clear: both;
394 394
 	margin: 0 0 $grid-y 0;
395  
-	padding: $grid-y - 1 $grid-x - 1;
396  
-	font-weight: bold;	
  395
+	padding: $grid-y + $grid-x/4 $grid-x + $grid-x/2;
  396
+	font-weight: normal;	
397 397
 	border: 1px #ccc solid;
398  
-	background:#fff;	//for browsers that don't understand rgba
399  
-	background:rgba(#fff,0.5);
  398
+	background: #fff;									// for browsers that don't understand rgba
  399
+	background: rgba(#fff,0.5);
  400
+	text-shadow: none;
400 401
 	@include border-radius(3px 3px 3px 3px);
401  
-	&.notice {
402  
-		background: $color-notice;
403  
-		border-color: darken(adjust-hue($color-notice, -10), 7%);		
404  
-	}	
405 402
 
406  
-	&.warning {
407  
-		background-color: lighten($color-warning, 20%);
  403
+	&.notice {		
  404
+		background-color: lighten($color-notice,22%);	// Blue
  405
+		border-color: $color-notice;	
  406
+	}
  407
+	&.warning {											// Yellow
  408
+		background-color: lighten($color-warning,47%);
408 409
 		border-color: $color-warning;
409 410
 	}
410  
-	&.error, &.bad, &.required, &.validation {
411  
-		background: lighten($color-error, 43%);//for browsers that don't understand rgba
412  
-		background: rgba(lighten($color-error, 40%), 0.5);
413  
-		border-color: lighten(adjust-hue($color-error, -10), 38%);
414  
-		color:$color-error;
  411
+	&.error, &.bad, &.required, &.validation {			// Red
  412
+		background-color: lighten($color-error,24%);
  413
+		border-color: $color-error;
415 414
 	}	
416  
-	&.good {
417  
-		background: $color-good;//for browsers that don't understand rgba
418  
-		background: rgba($color-good,0.7);
  415
+	&.good {											// Green
  416
+		background-color: lighten($color-good,40%);
419 417
 		border-color: $color-good;
420  
-		color:#fff;	
421  
-		@include text-shadow(1px -1px 0 $color-button-constructive);	
422  
-		a {
423  
-			text-shadow:none;
424  
-		}
425 418
 	}
  419
+	/*													// Orange
  420
+		background: lighten($color-optional,16%);
  421
+		border-color: $color-optional;
  422
+	*/
426 423
 	
427 424
 	p {
428 425
 		margin: 0;
9  admin/scss/themes/_default.scss
@@ -54,10 +54,11 @@ $color-button-destructive: #f00 !default;
54 54
 
55 55
 $color-button-disabled: #eeeded !default;
56 56
 
57  
-$color-warning: #FF9300 !default;
58  
-$color-error: #b94a48 !default;
59  
-$color-notice: #d9edf7 !default;
60  
-$color-good: #65A839 !default;
  57
+$color-notice: #93CDE8 !default;		// blue
  58
+$color-warning: #E9D104 !default;		// yellow
  59
+$color-error: #e68288 !default;			// red
  60
+$color-good: #72c34b !default;			// green
  61
+/*$color-optional: #a1d2eb !default; */	// orange
61 62
 
62 63
 $color-cms-batchactions-menu-background: #f5f5f5 !default;
63 64
 $color-cms-batchactions-menu-selected-background: #efe999 !default;
4  css/AssetUploadField.css
@@ -31,12 +31,12 @@ body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-asse
31 31
 .ss-assetuploadfield .ss-uploadfield-files .ui-state-error .ss-uploadfield-item-info { background-color: #c11f1d; padding-right: 130px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c11f1d), color-stop(4%, #bf1d1b), color-stop(8%, #b71b1c), color-stop(15%, #b61e1d), color-stop(27%, #b11d1d), color-stop(31%, #ab1d1c), color-stop(42%, #a51b1b), color-stop(46%, #9f1b19), color-stop(50%, #9f1b19), color-stop(54%, #991c1a), color-stop(58%, #971a18), color-stop(62%, #911b1b), color-stop(65%, #911b1b), color-stop(88%, #7e1816), color-stop(92%, #771919), color-stop(100%, #731817)); background-image: -webkit-linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); background-image: -moz-linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); background-image: -o-linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); background-image: linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); }
32 32
 .ss-assetuploadfield .ss-uploadfield-files .ui-state-error .ss-uploadfield-item-info .ss-uploadfield-item-name { width: 100%; cursor: default; background: #bcb9b9; background: rgba(201, 198, 198, 0.9); }
33 33
 .ss-assetuploadfield .ss-uploadfield-files .ui-state-error .ss-uploadfield-item-info .ss-uploadfield-item-name .name { text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.7); }
34  
-.ss-assetuploadfield .ss-uploadfield-files .ui-state-warning .ss-uploadfield-item-info { background-color: #ff9300; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #eba547), color-stop(8%, #e89a30), color-stop(50%, #e68f19), color-stop(54%, #e68e19), color-stop(96%, #e17519), color-stop(100%, #dc6718)); background-image: -webkit-linear-gradient(top, #eba547 0%, #e89a30 8%, #e68f19 50%, #e68e19 54%, #e17519 96%, #dc6718 100%); background-image: -moz-linear-gradient(top, #eba547 0%, #e89a30 8%, #e68f19 50%, #e68e19 54%, #e17519 96%, #dc6718 100%); background-image: -o-linear-gradient(top, #eba547 0%, #e89a30 8%, #e68f19 50%, #e68e19 54%, #e17519 96%, #dc6718 100%); background-image: linear-gradient(top, #eba547 0%, #e89a30 8%, #e68f19 50%, #e68e19 54%, #e17519 96%, #dc6718 100%); }
  34
+.ss-assetuploadfield .ss-uploadfield-files .ui-state-warning .ss-uploadfield-item-info { background-color: #e09d66; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #dbb99e), color-stop(8%, #d4ac8b), color-stop(50%, #ce9f78), color-stop(54%, #cd9d77), color-stop(96%, #d18261), color-stop(100%, #d27154)); background-image: -webkit-linear-gradient(top, #dbb99e 0%, #d4ac8b 8%, #ce9f78 50%, #cd9d77 54%, #d18261 96%, #d27154 100%); background-image: -moz-linear-gradient(top, #dbb99e 0%, #d4ac8b 8%, #ce9f78 50%, #cd9d77 54%, #d18261 96%, #d27154 100%); background-image: -o-linear-gradient(top, #dbb99e 0%, #d4ac8b 8%, #ce9f78 50%, #cd9d77 54%, #d18261 96%, #d27154 100%); background-image: linear-gradient(top, #dbb99e 0%, #d4ac8b 8%, #ce9f78 50%, #cd9d77 54%, #d18261 96%, #d27154 100%); }
35 35
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name { position: relative; z-index: 1; margin: 3px 0 3px 50px; width: 50%; color: #5e5e5e; background: #eeeded; background: rgba(255, 255, 255, 0.8); -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; line-height: 24px; height: 22px; padding: 0 5px; text-align: left; cursor: pointer; display: table; table-layout: fixed; }
36 36
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .name { text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5); display: inline; float: left; max-width: 50%; font-weight: normal; padding: 0 5px 0 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
37 37
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status { position: relative; float: right; padding: 0 0 0 5px; max-width: 30%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5); }
38 38
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-error-text { max-width: 70%; position: absolute; right: 5px; text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.6); color: #cc0000; }
39  
-.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { color: #cc7600; }
  39
+.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { color: #d7823c; }
40 40
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-success-text { color: #1f9433; }
41 41
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions { position: absolute; top: 0; right: 0; left: 0; z-index: 0; color: #f00; }
42 42
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button { background: none; border: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; text-shadow: none; color: white; float: right; }
2  css/GridField.css
@@ -38,7 +38,7 @@
38 38
 .cms table.ss-gridfield-table tbody td.col-buttons { width: 40px; padding: 0 8px; text-align: left; }
39 39
 .cms table.ss-gridfield-table tbody td.col-listChildrenLink { width: 16px; border-right: none; text-indent: -9999em; padding: 0; }
40 40
 .cms table.ss-gridfield-table tbody td.col-listChildrenLink .list-children-link { background: transparent url(../images/sitetree_ss_default_icons.png) no-repeat 3px -4px; display: block; }
41  
-.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.item { color: #1556b2; }
  41
+.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.item { color: #0073c1; }
42 42
 .cms table.ss-gridfield-table tbody td.col-getTreeTitle span.badge { clear: both; text-transform: uppercase; display: inline-block; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 10px; margin-right: 6px; margin-top: -1px; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; border-radius: 2px / 2px; }
43 43
 .cms table.ss-gridfield-table tbody td.col-getTreeTitle span.badge.modified { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
44 44
 .cms table.ss-gridfield-table tbody td.col-getTreeTitle span.badge.addedtodraft { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
2  css/UploadField.css
@@ -17,7 +17,7 @@
17 17
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .name { font-size: 11px; color: #848484; width: 290px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; display: inline; float: left; }
18 18
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status { float: right; padding: 0 0 0 5px; width: 100px; text-align: right; }
19 19
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-error-text { color: red; font-weight: bold; }
20  
-.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { color: #cc7600; }
  20
+.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { color: #d7823c; }
21 21
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-success-text { color: #1f9433; }
22 22
 .ss-uploadfield .ss-ui-button { display: block; float: left; margin: 0 10px 0 0; }
23 23
 .ss-uploadfield .ss-ui-button.ss-uploadfield-fromcomputer { position: relative; overflow: hidden; }

0 notes on commit f988ae3

Please sign in to comment.
Something went wrong with that request. Please try again.