1 files changed, 67 insertions, 26 deletions

diff --git a/css/dijit.less b/css/dijit.less
index b350a79da..a4ab55295 100644
--- a/css/dijit.less
+++ b/css/dijit.less
@@ -12,7 +12,7 @@
 	}
 
 	.dijitTree .feedParam {
-		color: #555;
+		color: @default-text;
 		float: right;
 		margin-right: 1em;
 	}
@@ -45,7 +45,7 @@
 
 	.dijitTree .dijitTreeLabel.filterDisabled,
 	.dijitTree .labelParam.filterDisabled {
-		color: #555;
+		color: @default-text;
 		text-decoration: line-through;
 	}
 
@@ -184,11 +184,13 @@
 
 	/* Various buttons */
 
-	.dijitButton.danger .dijitButtonText {
+	/* danger */
+	
+	.dijitButton.btn-danger .dijitButtonText {
 		color: #ffffff;
 	}
 
-	.dijitButton.danger {
+	.dijitButton.btn-danger {
 		text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 		background-color: #da4f49;
 		*background-color: #bd362f;
@@ -204,19 +206,62 @@
 		filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 	}
 
-	.dijitButton.dijitButtonDisabled.danger,
-	.dijitButton.dijitButtonActive.danger,
-	.dijitButton.dijitButtonHover.danger,
-	.dijitButton.dijitFocused.danger {
+	.dijitButton.dijitButtonDisabled.btn-danger,
+	.dijitButton.dijitButtonActive.btn-danger,
+	.dijitButton.dijitButtonHover.btn-danger,
+	.dijitButton.dijitFocused.btn-danger {
 		color: #ffffff;
 		background-color: #bd362f;
 		*background-color: #a9302a;
 	}
 
-	.dijitButton.dijitButtonActive.danger {
+	.dijitButton.dijitButtonActive.btn-danger {
 		background-color: #942a25 \9;
 	}
 
+	.dijitButton.dijitButtonActive.btn-danger {
+		color: rgba(255, 255, 255, 0.75);
+	}
+	
+	/* primary */
+
+	.dijitButton.btn-primary .dijitButtonText {
+		color: #ffffff;
+	}
+
+	.dijitButton.btn-primary {
+		text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+		background-color: #2883b3;
+		*background-color: #257aa7;
+		background-image: -moz-linear-gradient(top, #4ba6d8, #257aa7);
+		background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4ba6d8), to(#257aa7));
+		background-image: -webkit-linear-gradient(top, #4ba6d8, #257aa7);
+		background-image: -o-linear-gradient(top, #4ba6d8, #257aa7);
+		background-image: linear-gradient(to bottom, #4ba6d8, #257aa7);
+		background-repeat: repeat-x;
+		border-color: #257aa7 #257aa7 #1d5f82;
+		border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	}
+
+	.dijitButton.dijitButtonDisabled.btn-primary,
+	.dijitButton.dijitButtonActive.btn-primary,
+	.dijitButton.dijitButtonHover.btn-primary,
+	.dijitButton.dijitFocused.btn-primary {
+		color: #ffffff;
+		background-color: #257aa7;
+		*background-color: #1d6185;
+	}
+
+	.dijitButton.dijitButtonActive.btn-primary {
+		background-color: #1f678d \9;
+	}
+
+	.dijitButton.dijitButtonActive.btn-primary {
+		color: rgba(255, 255, 255, 0.75);
+	}
+	
+	/* others */
+
 	.dijitDropDownButton {
 		margin: 0px;
 	}
@@ -225,10 +270,6 @@
 		padding: 0px;
 	}
 
-	.dijitButton.dijitButtonActive.danger {
-		color: rgba(255, 255, 255, 0.75);
-	}
-
 	.dijitButton .dijitButtonNode,
 	.dijitDropDownButton .dijitButtonNode,
 	.dijitComboButton .dijitButtonNode,
@@ -413,14 +454,14 @@
 	}
 
 	.dijitMenu {
-		border-color: rgba(82, 168, 236, 0.8);
+		border-color: @color-accent;
 	}
 
 	.dijitMenu .dijitMenuItemSelected,
 	.dijitMenu .dijitMenuItemSelected td {
-		background: rgb(82, 168, 236);
+		background: @color-accent;
 		color: white;
-		border-color: rgba(82, 168, 236, 0.8);
+		border-color: @color-accent;
 	}
 
 	.dijitButton .dijitButtonNode,
@@ -453,7 +494,7 @@
 
 	.dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected,
 	.dijitAccordionTitle.dijitAccordionTitleSelected {
-		background: #0088cc;
+		background: @color-accent;
 		transition: background 0.25s;
 	}
 
@@ -462,7 +503,7 @@
 	}
 
 	.dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected {
-		border-color: #0088cc;
+		border-color: @color-accent;
 	}
 
 	.dijitAccordionContainer .dijitAccordionChildWrapper {
@@ -520,7 +561,7 @@
 		padding: 4px 6px;
 		font-size: 14px;
 		line-height: 20px;
-		color: #555555;
+		color: @default-text;
 		vertical-align: middle;
 		border-width: 0px;
 	}
@@ -534,7 +575,7 @@
 		padding: 4px 6px;
 		font-size: 14px;
 		line-height: 20px;
-		color: #555555;
+		color: @default-text;
 		vertical-align: middle;
 		-webkit-border-radius: 4px;
 		-moz-border-radius: 4px;
@@ -575,9 +616,9 @@
 		outline: thin dotted \9;
 		/* IE6-9 */
 
-		-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-		-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-		box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+		-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(red(@color-accent), green(@color-accent), blue(@color-accent), 0.6);
+		-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(red(@color-accent), green(@color-accent), blue(@color-accent), 0.6);
+		box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(red(@color-accent), green(@color-accent), blue(@color-accent), 0.6);
 	}
 
 	.dijitError .dijitValidationContainer {
@@ -636,7 +677,7 @@
 		background: white;
 		padding: 8px;
 		font-weight: 600;
-		color: #555;
+		color: @default-text;
 		font-size: 16px;
 		text-rendering: optimizelegibility;
 		font-family: @fonts-ui-bold;
@@ -649,11 +690,11 @@
 
 	.dijitProgressBar.dijitProgressBarEmpty {
 		background: #ddd;
-		border-color: #0088cc;
+		border-color: @color-accent;
 	}
 
 	.dijitProgressBar.dijitProgressBarEmpty .dijitProgressBarFull .dijitProgressBarTile {
-		background: rgb(82, 168, 236);
+		background: @color-accent;
 
 	}