Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Apr 01, 2013
Jonathan Hung FLUID-4959: Added a height to the toggle label so it doesn't scale wi…
…th 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.
c7ac670
@michelled 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.
2b96d0f
Showing with 5 additions and 0 deletions.
  1. +5 −0 src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
View
5 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 @@
float:left;
}
+.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;

No commit comments for this range

Something went wrong with that request. Please try again.