remove blue accent from tabs, move some other dijit overrides to dijit.css

2 files changed, 36 insertions, 25 deletions

diff --git a/css/dijit.css b/css/dijit.css
index a3d1e19c5..a529129f3 100644
--- a/css/dijit.css
+++ b/css/dijit.css
@@ -1,5 +1,10 @@
 /* Tree */
 
+.claro .dijitTreeRow .dijitCheckBox {
+	position : relative;
+	top : -2px;
+}
+
 .claro .dijitTreeLabel {
 	outline : 0;
 }
@@ -93,6 +98,11 @@
 /* Toolbar */
 
 .claro .dijitToolbar {
+	background : #f5f5f5;
+	border-color : #ddd;
+}
+
+.claro .dijitToolbar {
 	text-shadow : 1px 1px 2px #fff;
 }
 
@@ -323,4 +333,30 @@ button[disabled],
 	text-shadow : 1px 1px 2px #fff;
 }
 
+.claro .dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected {
+	border-color : #ccc;
+}
+
+.claro .dijitAccordionContainer .dijitAccordionChildWrapper {
+	border-color : #ddd;
+}
+
+/* Tabs */
+
+.claro .dijitTabContent {
+	background : #eee;
+}
+
+.claro .dijitTabContent.dijitTabChecked,
+.claro .dijitTabContent.dijitTabHover,
+.claro .dijitTabContent.dijitFocused {
+	background : white;
+}
+
+.claro .dijitTabPaneWrapper, 
+.claro .dijitTabContainerTop-tabs,
+.claro .dijitTab,
+.claro .dijitAccordionInnerContainer {
+	border-color : #ddd;
+}
 
diff --git a/css/prefs.css b/css/prefs.css
index 502552599..a60cdca99 100644
--- a/css/prefs.css
+++ b/css/prefs.css
@@ -123,29 +123,4 @@ body#ttrssPrefs hr {
 	max-width : 100%;
 }
 
-.claro .dijitTabPaneWrapper, 
-.claro .dijitTabContainerTop-tabs,
-.claro .dijitTab,
-.claro .dijitAccordionInnerContainer {
-	border-color : #ddd;
-}
-
-.claro .dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected {
-	border-color : #ccc;
-}
-
-.claro .dijitToolbar {
-	background : #f5f5f5;
-	border-color : #eee;
-}
-
-.claro .dijitAccordionContainer .dijitAccordionChildWrapper {
-	border-color : #ddd;
-}
-
-.claro .dijitTreeRow .dijitCheckBox {
-	position : relative;
-	top : -2px;
-}
-