aboutsummaryrefslogtreecommitdiffstats
path: root/themes/base/jquery.ui.button.css
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-11-28 23:29:15 +0100
committerFelix Nagel <info@felixnagel.com>2012-11-28 23:29:15 +0100
commit36533a718da41d4dc82286d2b7ff52a34481dbbb (patch)
tree481804cc832f9b8223fd243de8f6ca8dbd119fa2 /themes/base/jquery.ui.button.css
parent4e68c526ab464facc56e5b85ca67f4c6648d2f21 (diff)
parent37ea7341823e7dfe54f37596b1d054b8a2e5c3de (diff)
downloadjquery-ui-36533a718da41d4dc82286d2b7ff52a34481dbbb.tar.gz
jquery-ui-36533a718da41d4dc82286d2b7ff52a34481dbbb.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'themes/base/jquery.ui.button.css')
-rw-r--r--themes/base/jquery.ui.button.css6
1 files changed, 1 insertions, 5 deletions
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
index b540983f2..5588eb42c 100644
--- a/themes/base/jquery.ui.button.css
+++ b/themes/base/jquery.ui.button.css
@@ -42,7 +42,7 @@ button.ui-button-icons-only {
/* button text element */
.ui-button .ui-button-text {
- display: block;
+ display: inline-block;
line-height: 1.4;
}
.ui-button-text-only .ui-button-text {
@@ -94,10 +94,6 @@ input.ui-button {
.ui-button-icons-only .ui-button-icon-secondary {
right: .5em;
}
-.ui-button-text-icons .ui-button-icon-secondary,
-.ui-button-icons-only .ui-button-icon-secondary {
- right: .5em;
-}
/* button sets */
.ui-buttonset {