diff options
author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2013-06-05 14:44:44 +0200 |
---|---|---|
committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2013-06-05 14:44:44 +0200 |
commit | ffc7d310d4d36543e71a7a97604c987659e463e3 (patch) | |
tree | d171a2f7b5bc4d9ddb365c0c47254ad21f4153ce /themes | |
parent | ab48ae7e302770bb45f8aa99578303b2037e8e94 (diff) | |
parent | e776a7fb092df2eeefa975c83bd4c1c7a6439b05 (diff) | |
download | jquery-ui-ffc7d310d4d36543e71a7a97604c987659e463e3.tar.gz jquery-ui-ffc7d310d4d36543e71a7a97604c987659e463e3.zip |
Merge branch 'master' into selectmenu
Diffstat (limited to 'themes')
-rw-r--r-- | themes/base/jquery.ui.datepicker.css | 3 | ||||
-rw-r--r-- | themes/base/jquery.ui.spinner.css | 4 | ||||
-rw-r--r-- | themes/base/jquery.ui.tabs.css | 11 |
3 files changed, 7 insertions, 11 deletions
diff --git a/themes/base/jquery.ui.datepicker.css b/themes/base/jquery.ui.datepicker.css index 5d9e71549..224924e27 100644 --- a/themes/base/jquery.ui.datepicker.css +++ b/themes/base/jquery.ui.datepicker.css @@ -58,9 +58,6 @@ font-size: 1em; margin: 1px 0; } -.ui-datepicker select.ui-datepicker-month-year { - width: 100%; -} .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year { width: 49%; diff --git a/themes/base/jquery.ui.spinner.css b/themes/base/jquery.ui.spinner.css index 1504fc3f7..db05c520b 100644 --- a/themes/base/jquery.ui.spinner.css +++ b/themes/base/jquery.ui.spinner.css @@ -38,13 +38,13 @@ overflow: hidden; right: 0; } -/* more specificity required here to overide default borders */ +/* more specificity required here to override default borders */ .ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } -/* vertical centre icon */ +/* vertically center icon */ .ui-spinner .ui-icon { position: absolute; margin-top: -8px; diff --git a/themes/base/jquery.ui.tabs.css b/themes/base/jquery.ui.tabs.css index b8f77b040..4994f210a 100644 --- a/themes/base/jquery.ui.tabs.css +++ b/themes/base/jquery.ui.tabs.css @@ -26,7 +26,7 @@ padding: 0; white-space: nowrap; } -.ui-tabs .ui-tabs-nav li a { +.ui-tabs .ui-tabs-nav .ui-tabs-anchor { float: left; padding: .5em 1em; text-decoration: none; @@ -35,13 +35,12 @@ margin-bottom: -1px; padding-bottom: 1px; } -.ui-tabs .ui-tabs-nav li.ui-tabs-active a, -.ui-tabs .ui-tabs-nav li.ui-state-disabled a, -.ui-tabs .ui-tabs-nav li.ui-tabs-loading a { +.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor, +.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor, +.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor { cursor: text; } -.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ -.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { +.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor { cursor: pointer; } .ui-tabs .ui-tabs-panel { |