Skip to content
Browse files

Merge remote-tracking branch 'heidiv/FLUID-4962' into demo

* heidiv/FLUID-4962:
  FLUID-4962: Adds focus style to contrast theme choices, and themes the focus for this and on/off switches
  • Loading branch information...
2 parents dda0025 + f51e3fc commit a0e11c4bc9b8e383071ad09eb6694223543982ea @michelled michelled committed Apr 1, 2013
Showing with 14 additions and 4 deletions.
  1. +14 −4 src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
View
18 src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
@@ -130,8 +130,7 @@
}
.fl-uiOptions-fatPanel .fl-choice label {
- margin-right: 5px;
-
+ margin-right: 5px;
border: 1px solid black;
border-radius: 5px;
height: 3em;
@@ -141,7 +140,6 @@
display: inline-block;
line-height: 3em !important;
}
-
.fl-uiOptions-fatPanel .fl-choice .uio-demo-theme .fl-crossout {
margin-top:-1.5em;
border-bottom: 1px dashed #ddbdc0;
@@ -155,9 +153,10 @@
font-size: 2.1em;
}
-.fl-uiOptions-fatPanel .fl-choice input:focus + label {
+.fl-uiOptions-fatPanel .fl-choice input:focus ~ label {
outline: 2px solid black;
}
+
.fl-uiOptions-fatPanel .fl-choice .fl-indicator {
font-family: 'UIO';
speak: none;
@@ -375,3 +374,14 @@
border-color: #FFFF00 !important;
color: #FFFF00 !important;
}
+
+.fl-uiOptions-fatPanel.fl-theme-bw .fl-uiOptions-fatPanel-toc-input:focus + label,
+.fl-uiOptions-fatPanel.fl-theme-wb .fl-uiOptions-fatPanel-toc-input:focus + label,
+.fl-uiOptions-fatPanel.fl-theme-by .fl-uiOptions-fatPanel-toc-input:focus + label,
+.fl-uiOptions-fatPanel.fl-theme-yb .fl-uiOptions-fatPanel-toc-input:focus + label,
+.fl-uiOptions-fatPanel.fl-theme-bw .fl-choice input:focus ~ label,
+.fl-uiOptions-fatPanel.fl-theme-wb .fl-choice input:focus ~ label,
+.fl-uiOptions-fatPanel.fl-theme-by .fl-choice input:focus ~ label,
+.fl-uiOptions-fatPanel.fl-theme-yb .fl-choice input:focus ~ label {
+ outline: 0.2em solid #00AAFF;
+}

0 comments on commit a0e11c4

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