Skip to content
Browse files

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

* jhung/FLUID-4960:
  FLUID-4960: Removed the fixed width for show/hide button in the CSS for the UIO demo. This way the button scales properly with text style and size.
  FLUID-4960: Added min-width value to the show/hide tab which helps fix the text size issue with verdana and other fonts.
  FLUID-4960: Added min height to the tabs which helps the overflow issue. Also moved the tab divider to the show/hide button which helps with the height of the divider. However there appears to still be issues when using Verdana and text size 2.
  • Loading branch information...
2 parents 3df820c + d33b9e7 commit dda002596433a4db7e0c3c6c1dd55cb62eea7bc7 @michelled michelled committed
View
8 src/webapp/components/uiOptions/css/FatPanelUIOptions.css
@@ -20,7 +20,7 @@
border-bottom-left-radius:8px;
border-bottom-right-radius:8px;
background-color: white;
- height: 2.2em;
+ min-height: 2em;
margin-right: 10em;
display:block;
float:right;
@@ -32,7 +32,7 @@
font-weight: bold;
border:0;
background-color: white;
- height: 100%;
+ height: 2em;
color: #2f2b2a
font-family: 'OpenSans',"Myriad Pro", Helvetica, Arial, sans-serif;
font-size: 1.1em;
@@ -41,11 +41,11 @@
}
.fl-uiOptions-fatPanel .fl-uiOptions-reset {
- border-right: 1px solid #ccc;
+ border-right: 1px solid #ccc;
}
.fl-uiOptions-fatPanel .fl-toggleButton {
- width: 15em;
+ min-width: 15em;
}
/* IFrame */
View
4 src/webapp/demos/uiOptions/css/uiOptions.css
@@ -153,10 +153,6 @@ img {
background-color: #0071BC;
}
-.fl-uiOptions-fatPanel .fl-toggleButton {
- width: 17.6em;
-}
-
.uio-demo-theme .fl-uiOptions-fatPanel .fl-toggleButton,
.uio-demo-theme .fl-uiOptions-fatPanel .fl-uiOptions-reset {
font-family: "Myriad Pro", Helvetica, Tahoma, Verdana, sans-serif;

0 comments on commit dda0025

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