Permalink
Browse files

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

* jhung/FLUID-4961:
  FLUID-4961: Added a style override for the font-icon so they are not replaced by a new font when the style is switched in the UIO panel.
  • Loading branch information...
michelled committed Apr 1, 2013
2 parents 77fb880 + 4b01cca commit ca9b52cb64882127e70ffa8a67bfdf5274ebcdc6
Showing with 13 additions and 0 deletions.
  1. +13 −0 src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
@@ -375,6 +375,19 @@
color: #FFFF00 !important;
}
+
+.fl-font-uio-serif [class*='fl-icon-'],
+.fl-font-uio-sans [class*='fl-icon-'],
+.fl-font-uio-monospace [class*='fl-icon-'],
+.fl-font-uio-arial [class*='fl-icon-'],
+.fl-font-uio-verdana [class*='fl-icon-'],
+.fl-font-uio-times [class*='fl-icon-'],
+.fl-font-uio-courier [class*='fl-icon-'],
+.fl-font-uio-comic-sans [class*='fl-icon-'],
+.fl-uiOptions-fatPanel .fl-choice .fl-indicator {
+ font-family:'UIO'!important; /* FLUID-4961: Over-riding UIO font style adjustments so icon fonts are rendered properly. */
+}
+
.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,

0 comments on commit ca9b52c

Please sign in to comment.