diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-04-02 15:20:37 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-04-02 15:20:37 +0200 |
| commit | 1f0e0b2bb158f6f51b1b65066ba6608471aa6034 (patch) | |
| tree | ddba28a1e773ec68e002e4b4e2b44f129364c2cd /themes | |
| parent | ff72467038f35fd7d031b33cf61d37ee02535a52 (diff) | |
| parent | 48e5c853f995a825dd9d14cd2d8f592037f8505c (diff) | |
| download | jquery-ui-1f0e0b2bb158f6f51b1b65066ba6608471aa6034.tar.gz jquery-ui-1f0e0b2bb158f6f51b1b65066ba6608471aa6034.zip | |
Merge branch 'master' into grunt
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/base/jquery.ui.button.css | 2 | ||||
| -rw-r--r-- | themes/base/jquery.ui.menu.css | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css index ccee26aab..be2e71796 100644 --- a/themes/base/jquery.ui.button.css +++ b/themes/base/jquery.ui.button.css @@ -7,7 +7,7 @@ * * http://docs.jquery.com/UI/Button#theming */ -.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: hidden; *overflow: visible; } /* the overflow property removes extra width in IE */ +.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ .ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ .ui-button-icons-only { width: 3.4em; } diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css index 84d7d85b1..1e559e661 100644 --- a/themes/base/jquery.ui.menu.css +++ b/themes/base/jquery.ui.menu.css @@ -15,6 +15,7 @@ .ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; } .ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; } +.ui-menu .ui-state-disabled a { cursor: default; } /* icon support */ .ui-menu-icons { position: relative; } |