- removed all !important flags. Replaced with additional selectors.

- added .ui-state-focus class. Matches appearance of ui-state-hover in framework.

1 files changed, 12 insertions, 12 deletions

diff --git a/themes/base/ui.theme.css b/themes/base/ui.theme.css
index 54de47e6b..50e30e86a 100644
--- a/themes/base/ui.theme.css
+++ b/themes/base/ui.theme.css
@@ -17,21 +17,21 @@
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/e6e6e6_40x100_textures_02_glass_75.png)/*{bgImgUrlDefault}*/ 0 50% repeat-x; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/ !important; outline: none; }
-.ui-state-default a { color: #555555/*{fcDefault}*/ !important; text-decoration: none; outline: none; }
-.ui-state-hover { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/dadada_40x100_textures_02_glass_75.png)/*{bgImgUrlHover}*/ 0  50% repeat-x; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/ !important; outline: none; }
-.ui-state-hover a { color: #212121/*{fcHover}*/ !important; text-decoration: none; outline: none; }
-.ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ffffff_40x100_textures_02_glass_65.png)/*{bgImgUrlActive}*/ 0 50% repeat-x !important; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/ !important; outline: none; }
-.ui-state-active a { color: #212121/*{fcActive}*/ !important; outline: none; text-decoration: none; }
+.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/e6e6e6_40x100_textures_02_glass_75.png)/*{bgImgUrlDefault}*/ 0 50% repeat-x; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; outline: none; }
+.ui-state-default a { color: #555555/*{fcDefault}*/; text-decoration: none; outline: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/dadada_40x100_textures_02_glass_75.png)/*{bgImgUrlHover}*/ 0  50% repeat-x; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; outline: none; }
+.ui-state-hover a { color: #212121/*{fcHover}*/; text-decoration: none; outline: none; }
+.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ffffff_40x100_textures_02_glass_65.png)/*{bgImgUrlActive}*/ 0 50% repeat-x; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; outline: none; }
+.ui-state-active a { color: #212121/*{fcActive}*/; outline: none; text-decoration: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/fbf9ee_40x100_textures_02_glass_55.png)/*{bgImgUrlHighlight}*/ 0 50% repeat-x; color: #363636/*{fcHighlight}*/ !important; }
-.ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/fef1ec_40x100_textures_05_inset_soft_95.png)/*{bgImgUrlError}*/ 0 50% repeat-x; color: #cd0a0a/*{fcError}*/ !important; }
-.ui-state-error-text { color: #cd0a0a/*{fcError}*/ !important; }
-.ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none !important; }
-.ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/fbf9ee_40x100_textures_02_glass_55.png)/*{bgImgUrlHighlight}*/ 0 50% repeat-x; color: #363636/*{fcHighlight}*/; }
+.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/fef1ec_40x100_textures_05_inset_soft_95.png)/*{bgImgUrlError}*/ 0 50% repeat-x; color: #cd0a0a/*{fcError}*/; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a/*{fcError}*/; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
 
 /* Icons
 ----------------------------------*/