diff --git a/tests/static/button/default.html b/tests/static/button/default.html index a2c35a4ad67..e0e0050907e 100644 --- a/tests/static/button/default.html +++ b/tests/static/button/default.html @@ -23,24 +23,34 @@
Using button elements
-
-
Button
+
+
Primary icon
- -
-
-
Button
+ +
+
Secondary icon
+
+
+ +
+
+
Primary icon
+
+ +
+
Secondary icon
+
-
Button
+
Both icons
-
Button
+
No text
@@ -53,24 +63,34 @@
Using anchor elements
-
-
Button
+
+
Primary icon
-
-
-
Button
+
+
Secondary icon
+
+
+ +
+
+
Primary icon
+
+ +
+
Secondary icon
+
-
Button
+
Both icons
-
Button
+
No text
@@ -85,24 +105,34 @@
Using label elements (used when proxying to radio or check inputs)
-
-
Button
+
+
Primary icon
-
-
-
Button
+
+
Secondary icon
+
+
+ +
+
+
Primary icon
+
+ +
+
Secondary icon
+
-
Button
+
Both icons
-
Button
+
No text
@@ -111,9 +141,10 @@
Using label elements (used when proxying to radio or check inputs)
Button Sets
-
Simple button
-
Simple button
-
Simple button
+
First
+
Middle
+
Middle
+
Last
diff --git a/tests/visual/button/button.html b/tests/visual/button/button.html index 7575eadf149..de0bb3ab9ad 100644 --- a/tests/visual/button/button.html +++ b/tests/visual/button/button.html @@ -58,9 +58,9 @@
With icon
Button with icon only
-
Button with icon on the left
-
Button with two icons
-
Button with text and secondary icon
+
Primary icon
+
Secondary icon
+
Both icons
Button with two icons and no text
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css index 47777a42800..efe1ec03eb8 100644 --- a/themes/base/jquery.ui.button.css +++ b/themes/base/jquery.ui.button.css @@ -11,15 +11,17 @@ button.ui-button-icons-only { width: 3.7em; } .ui-button .ui-button-text { display: block; line-height: 1.4; } .ui-button-text-only .ui-button-text { padding: .4em 1em; } .ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } -.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } .ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } /* no icon support for input elements, provide padding by default */ input.ui-button { padding: .4em 1em; } /*button icon element(s) */ -.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } +.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } .ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } -.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } +.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } +.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .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*/ @@ -28,8 +30,3 @@ input.ui-button { padding: .4em 1em; } /* workarounds */ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ - - - - - diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index 83f14f4c986..8176c332190 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -16,7 +16,7 @@ var lastActive, baseClasses = "ui-button ui-widget ui-state-default ui-corner-all", stateClasses = "ui-state-hover ui-state-active ", - typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon ui-button-text-only", + typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only", formResetHandler = function( event ) { $( ":ui-button", event.target.form ).each(function() { var inst = $( this ).data( "button" ); @@ -288,7 +288,7 @@ $.widget( "ui.button", { multipleIcons = icons.primary && icons.secondary; if ( icons.primary || icons.secondary ) { buttonElement.addClass( "ui-button-text-icon" + - ( multipleIcons ? "s" : "" ) ); + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) ); if ( icons.primary ) { buttonElement.prepend( "
" ); } @@ -298,7 +298,7 @@ $.widget( "ui.button", { if ( !this.options.text ) { buttonElement .addClass( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" ) - .removeClass( "ui-button-text-icons ui-button-text-icon" ); + .removeClass( "ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary" ); if ( !this.hasTitle ) { buttonElement.attr( "title", buttonText ); }