Merge branch 'master' into FLUID-5100

fluid-project · Aug 15, 2013 · c5185ff · c5185ff
2 parents 5957f0d + b452d86
commit c5185ff
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/src/components/uiOptions/css/UIOptions.css b/src/components/uiOptions/css/UIOptions.css
@@ -463,14 +463,23 @@
 }
 
 .fl-theme-bw .fl-uiOptions input:focus + label,
-.fl-theme-wb .fl-uiOptions input:focus + label,
+.fl-theme-bw .fl-uiOptions .fl-choice input:focus ~ label,
 .fl-theme-by .fl-uiOptions input:focus + label,
+.fl-theme-by .fl-uiOptions .fl-choice input:focus ~ label {
+    outline: 0.2em solid #000;
+}
+
+.fl-theme-wb .fl-uiOptions input:focus + label,
+.fl-theme-wb .fl-uiOptions .fl-choice input:focus ~ label {
+    outline: 0.2em solid #fff;
+}
+
 .fl-theme-yb .fl-uiOptions input:focus + label,
+.fl-theme-yb .fl-uiOptions .fl-choice input:focus ~ label {
+    outline: 0.2em solid #ffff00;
+}
+
 .fl-theme-lgdg .fl-uiOptions input:focus + label,
-.fl-theme-bw .fl-uiOptions .fl-choice input:focus ~ label,
-.fl-theme-wb .fl-uiOptions .fl-choice input:focus ~ label,
-.fl-theme-by .fl-uiOptions .fl-choice input:focus ~ label,
-.fl-theme-yb .fl-uiOptions .fl-choice input:focus ~ label,
 .fl-theme-lgdg .fl-uiOptions .fl-choice input:focus ~ label {
-    outline: 0.2em solid #00AAFF;
+    outline: 0.2em solid #bdbdbb;
 }
diff --git a/src/framework/fss/css/fss-theme-bw.css b/src/framework/fss/css/fss-theme-bw.css
@@ -65,7 +65,7 @@
 .fl-theme-wb .fl-inverted-color .fl-focus:focus,
 .fl-theme-wb .fl-inverted-color .fl-focus :focus,
 .fl-theme-wb.fl-inverted-color.fl-focus :focus,
-.fl-theme-wb .fl-inverted-color .selectable {outline: 0.2em solid #00AAFF;}
+.fl-theme-wb .fl-inverted-color .selectable {outline: 0.2em solid #000;}
 
 .fl-theme-bw .fl-knockout,
 .fl-theme-wb .fl-inverted-color .fl-knockout {background:transparent !important; color:#000;} /* Deprecated: use .fl-noBackgroundImages */

diff --git a/src/framework/fss/css/fss-theme-by.css b/src/framework/fss/css/fss-theme-by.css
@@ -65,7 +65,7 @@
 .fl-theme-yb .fl-inverted-color .fl-focus:focus,
 .fl-theme-yb .fl-inverted-color .fl-focus :focus,
 .fl-theme-yb.fl-inverted-color.fl-focus :focus,
-.fl-theme-yb .fl-inverted-color .selectable {outline: 0.2em solid #00AAFF;}
+.fl-theme-yb .fl-inverted-color .selectable {outline: 0.2em solid #000;}
 
 .fl-theme-by .fl-knockout, 
 .fl-theme-yb .fl-inverted-color .fl-knockout{background:transparent !important; color:#000;} /* Deprecated: use .fl-noBackgroundImages */

diff --git a/src/framework/fss/css/fss-theme-dglg.css b/src/framework/fss/css/fss-theme-dglg.css
@@ -71,7 +71,7 @@
 .fl-theme-lgdg .fl-inverted-color .fl-focus:focus,
 .fl-theme-lgdg .fl-inverted-color .fl-focus :focus,
 .fl-theme-lgdg.fl-inverted-color.fl-focus :focus,
-.fl-theme-lgdg .fl-inverted-color .selectable {outline: 0.2em solid #00AAFF;}
+.fl-theme-lgdg .fl-inverted-color .selectable {outline: 0.2em solid #555555;}
 
 .fl-theme-dglg .fl-knockout,
 .fl-theme-lgdg .fl-inverted-color .fl-knockout {background:transparent !important; color:#555555;} /* Deprecated: use .fl-noBackgroundImages */

diff --git a/src/framework/fss/css/fss-theme-lgdg.css b/src/framework/fss/css/fss-theme-lgdg.css
@@ -72,7 +72,7 @@
 .fl-theme-dglg .fl-inverted-color .fl-focus:focus,
 .fl-theme-dglg .fl-inverted-color .fl-focus :focus,
 .fl-theme-dglg.fl-inverted-color.fl-focus :focus,
-.fl-theme-dglg .fl-inverted-color .selectable {outline: 0.2em solid #00AAFF;}
+.fl-theme-dglg .fl-inverted-color .selectable {outline: 0.2em solid #bdbdbb;}
 
 .fl-theme-lgdg .fl-knockout,
 .fl-theme-dglg .fl-inverted-color .fl-knockout {background:transparent !important; color:#bdbdbb;} /* Deprecated: use .fl-noBackgroundImages */

diff --git a/src/framework/fss/css/fss-theme-wb.css b/src/framework/fss/css/fss-theme-wb.css
@@ -65,7 +65,7 @@
 .fl-theme-bw .fl-inverted-color .fl-focus:focus,
 .fl-theme-bw .fl-inverted-color .fl-focus :focus,
 .fl-theme-bw.fl-inverted-color.fl-focus :focus,
-.fl-theme-bw .fl-inverted-color .selectable {outline: 0.2em solid #00AAFF;}
+.fl-theme-bw .fl-inverted-color .selectable {outline: 0.2em solid #ffffff;}
 
 .fl-theme-wb .fl-knockout,
 .fl-theme-bw .fl-inverted-color .fl-knockout {background:transparent !important; color:#ffffff;} /* Deprecated: use .fl-noBackgroundImages */

diff --git a/src/framework/fss/css/fss-theme-yb.css b/src/framework/fss/css/fss-theme-yb.css
@@ -65,7 +65,7 @@
 .fl-theme-by .fl-inverted-color .fl-focus:focus,
 .fl-theme-by .fl-inverted-color .fl-focus :focus,
 .fl-theme-by.fl-inverted-color.fl-focus :focus,
-.fl-theme-by .fl-inverted-color .selectable {outline: 0.2em solid #00AAFF;}
+.fl-theme-by .fl-inverted-color .selectable {outline: 0.2em solid #ffff00;}
 
 .fl-theme-yb .fl-knockout,
 .fl-theme-by .fl-inverted-color .fl-knockout {background:transparent !important; color:#ffff00;} /* Deprecated: use .fl-noBackgroundImages */