Intial commit to nightly branch

MichaelVdheeren · May 10, 2012 · bfadfa4 · bfadfa4
1 parent 447d20d
commit bfadfa4
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 24 deletions.
diff --git a/demos/jquery.html b/demos/jquery.html
@@ -477,19 +477,32 @@ <h2 class="demoHeaders">Datepicker</h2>
 		<h2 class="demoHeaders">Progressbar</h2>	
 		<div id="progressbar"></div>
 
-		<!-- Highlight / Error -->
-		<h2 class="demoHeaders">Highlight / Error</h2>
+		<!-- Highlight / Error -->
+
+		<h2 class="demoHeaders">Highlight / Error</h2>
+		<div class="ui-widget">
+			<div class="ui-state-success ui-corner-all" style="margin-top: 20px; padding: 0 .7em;"> 
+				<p><span class="ui-icon ui-icon-notice" style="float: left; margin-right: .3em;"></span> 
+				<strong>Success:</strong> Sample ui-state-success style.</p>
+			</div>
+		</div>
+		<div class="ui-widget">
+			<div class="ui-state-warning ui-corner-all" style="margin-top: 20px; padding: 0 .7em;"> 
+				<p><span class="ui-icon ui-icon-notice" style="float: left; margin-right: .3em;"></span> 
+				<strong>Warning:</strong> Sample ui-state-warning style.</p>
+			</div>
+		</div>
 		<div class="ui-widget">
 			<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;"> 
 				<p><span class="ui-icon ui-icon-lightbulb" style="float: left; margin-right: .3em;"></span>
-				<strong>Hey!</strong> Sample ui-state-highlight style.</p>
+				<strong>Information:</strong> Sample ui-state-highlight style.</p>
 			</div>
 		</div>
 		<br/>
 		<div class="ui-widget">
 			<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;"> 
 				<p><span class="ui-icon ui-icon-notice" style="float: left; margin-right: .3em;"></span> 
-				<strong>Alert:</strong> Sample ui-state-error style.</p>
+				<strong>Error:</strong> Sample ui-state-error style.</p>
 			</div>
 		</div>
 

diff --git a/development/absolution.blue.less b/development/absolution.blue.less
@@ -1,21 +1,35 @@
 // Color information
-@defaultStateStartColor: 	#fdfdfd;
-@defaultStateEndColor: 		#ececec;
-@defaultStateTextColor: 	#333333;
-@defaultStateBorderColor:	#a9a9a9;
+@font:						#243314;
 
-@hoverStateStartColor: 		#5e9ae2;
-@hoverStateEndColor: 		#3570b8;
-@hoverStateTextColor: 		#ffffff;
-@hoverStateBorderColor:		#2e63a5;
+@default-state-top:			#F5F5F5;
+@default-state-bottom:		#E3E3E3;
+@default-state-text:		@font;
+@default-state-border:		#ABABAB;
+
+@hover-state-top:			#ECECEC;
+@hover-state-bottom:		#DCDCDC;
+@hover-state-text:			@font;
+@hover-state-border:		#ABABAB;
+
+
+// Legacy!!!
+@defaultStateStartColor: 	@default-state-top;
+@defaultStateEndColor: 		@default-state-bottom;
+@defaultStateTextColor: 	@default-state-text;
+@defaultStateBorderColor:	@default-state-border;
+
+@hoverStateStartColor: 		@hover-state-top;
+@hoverStateEndColor: 		@hover-state-bottom;
+@hoverStateTextColor: 		@hover-state-text;
+@hoverStateBorderColor:		@hover-state-border;
 
 @focusStateStartColor: 		@hoverStateStartColor;
 @focusStateEndColor: 		@hoverStateEndColor;
 @focusStateTextColor: 		@hoverStateTextColor;
 @focusStateBorderColor:		@hoverStateBorderColor;
 
-@activeStateStartColor: 	#3570b8;
-@activeStateEndColor: 		#5e9ae2;
+@activeStateStartColor: 	#447BC6;
+@activeStateEndColor: 		#49A7DB;
 @activeStateTextColor: 		#ffffff;
 @activeStateBorderColor:	#2e63a5;
 

diff --git a/development/jquery.ui.base.less b/development/jquery.ui.base.less
@@ -4,6 +4,7 @@
 { 
 	font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; 
 	font-size: 1.1em;
+	color: @font;
 
 	a { color: inherit; }
 	.ui-widget { font-size: 1em; }
@@ -19,7 +20,7 @@
 
 .ui-widget-content {
 	border-color: @defaultStateBorderColor; 
-	background: #eeeeee;
+	background: #f9f9f9;
 	border-style: solid;
 	border-width: 1px;
 }
@@ -86,10 +87,42 @@
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #8b9fc2; background: #7cc5e3; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: inherit; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #953737; background: #f35757; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: inherit; }
+.ui-state-success, .ui-widget-content .ui-state-success, .ui-widget-header .ui-state-success
+{
+	border: 1px solid #627D3F;
+	background: #90A960;
+	.gradientTopToBottom(#90A960, #76954E);
+}
+
+.ui-state-warning, .ui-widget-content .ui-state-warning, .ui-widget-header .ui-state-warning
+{
+	border: 1px solid #997233;
+	background: #DAB151;
+	.gradientTopToBottom(#DAB151, #CB9940);
+}
+
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight
+{
+	border: 1px solid #2E63A5;
+	background: #49A7DB;
+	.gradientTopToBottom(#49A7DB, #447BC6);
+}
+
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error
+{
+	border: 1px solid #A1474B;
+	background: #C36468;
+	.gradientTopToBottom(#C36468, #B85155);
+}
+
+.ui-state-success a, .ui-widget-content .ui-state-success a,.ui-widget-header .ui-state-success a,
+.ui-state-warning a, .ui-widget-content .ui-state-warning a,.ui-widget-header .ui-state-warning a,
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a,
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a
+{
+	color: inherit;
+}
+
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #363636; }
 
 .ui-priority-secondary,

diff --git a/development/jquery.ui.datepicker.less b/development/jquery.ui.datepicker.less
@@ -2,7 +2,7 @@
 	width: 17em;
 	padding: 0;
 	border-color: #ffffff;
-	.box-shadow(0px,0px,5px,#282425);
+	.box-shadow(0px,2px,5px,#282425);
 
 	.ui-datepicker-header { 
 		position:relative; 
@@ -110,6 +110,12 @@
 	}
 }
 
+
+.ui-datepicker-calendar th {
+	border-bottom: 1px solid #a9a9a9;
+	background: #E0DCE0;
+}
+
 .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-prev:hover { left: 4px; }
 .ui-datepicker .ui-datepicker-next, .ui-datepicker .ui-datepicker-next:hover { right: 4px; }
 .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
@@ -119,7 +125,7 @@
 .ui-datepicker select.ui-datepicker-month, 
 .ui-datepicker select.ui-datepicker-year { width: 49%;}
 .ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; }
 .ui-datepicker td { border: 0; padding: 0px; }
 .ui-datepicker td span, .ui-datepicker td a { display: block; padding: .6em; text-align: center; text-decoration: none; }
 .ui-datepicker .ui-datepicker-buttonpane { margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }

diff --git a/development/jquery.ui.dialog.less b/development/jquery.ui.dialog.less
@@ -4,11 +4,12 @@
 	width: 300px;
 	overflow: hidden;
 	border-color: #ffffff;
-	.box-shadow(0px,0px,5px,#282425);
+	.box-shadow(0px,2px,5px,#282425);
 
 	.ui-dialog-title {
 		float: left;
 		margin: .1em 16px .2em 0;
+		text-transform: uppercase;
 	}
 
 	.ui-dialog-titlebar-close {
@@ -57,7 +58,7 @@
 		border-width: 1px 0 0 0;
 		margin: .5em 0 0 0;
 		padding: .3em .3em .5em .4em;
-		background: #f7f7f8;
+		background: #f4f4f4;
 
 		.ui-dialog-buttonset {
 			float: right;
@@ -80,9 +81,11 @@
 		-moz-border-radius-bottomright: 0px;
 		-webkit-border-bottom-right-radius: 0px;
 		border-bottom-right-radius: 0px;
-		border: 0px;
+		border-width: 0px 0 1px 0;
 		font-size: 1.5em;
 		font-weight: normal;
+		background-color: #e3e3e3;
+
 		.gradientTopToBottom(@titleBarStartColor, @titleBarEndColor);
 		color: @titleBarTextColor;
 

diff --git a/development/wijmo.calendar.less b/development/wijmo.calendar.less
@@ -57,6 +57,11 @@
     float: left;
 }
 
+.wijmo-wijcalendar-table th {
+	border-bottom: 1px solid #a9a9a9;
+	background: #E0DCE0;
+}
+
 .wijmo-wijcalendar-title, .wijmo-wijcalendar-selectable
 {
     cursor: pointer;