Browse files

Merge remote-tracking branch 'jhung/FLUID-4959' into demo

* jhung/FLUID-4959:
  FLUID-4959: Added a height to the toggle label so it doesn't scale with the line spacing option. This will fix the 'off' text in position. Also added a fixed height to the fl-uiOptions container so that line spacing in UIO does not scale with UIO. This may not be a solution we want, but for the demo it helps keep UIO from looking broken.
  • Loading branch information...
michelled committed Apr 1, 2013
2 parents 214080b + c7ac670 commit 2b96d0fa0fe651a940531f420fe80b24773fb34c
Showing with 5 additions and 0 deletions.
  1. +5 −0 src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
@@ -7,6 +7,7 @@
.fl-uiOptions-fatPanel .fl-uiOptions {
font-family: 'OpenSans',"Myriad Pro", Helvetica, Arial, sans-serif;
+ line-height: 1.2em !important; /* FLUID-4959: fix the line height so it doesn't scale with the UIO line spacing scaling. */
/* UI Options Fat Panel styles */
@@ -189,6 +190,10 @@
+.fl-uiOptions-fatPanel .fl-uiOptions-fatPanel-toc label {
+ line-height: 1.7em !important;
.fl-uiOptions-fatPanel .fl-uiOptions-fatPanel-option-description {
padding: 0; /* override .fl-uiOptions-option-description style. */
display: inline-block;

0 comments on commit 2b96d0f

Please sign in to comment.