From 35dd7a259e92e9d5769805001400b45cb4ba37b2 Mon Sep 17 00:00:00 2001 From: Chase Wagoner Date: Tue, 24 May 2016 22:02:24 -0700 Subject: [PATCH 1/2] Checkboxradio: icons broken inside dialogs Limit a CSS `background` rule that only sets color to `background-color` to avoid losing the `background-position`. Fixes #14955 --- tests/visual/checkboxradio/inside-dialog.html | 26 +++++++++++++++++++ tests/visual/index.html | 1 + themes/base/theme.css | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 tests/visual/checkboxradio/inside-dialog.html diff --git a/tests/visual/checkboxradio/inside-dialog.html b/tests/visual/checkboxradio/inside-dialog.html new file mode 100644 index 00000000000..6c02c8012be --- /dev/null +++ b/tests/visual/checkboxradio/inside-dialog.html @@ -0,0 +1,26 @@ + + + + + Checkbox Inside Dialog + + + + + + +

WHAT: A modal dialog containing a checkbox.

+

EXPECTED: Checkbox icon is correct when checked.

+ +
+ + +
+ + + diff --git a/tests/visual/index.html b/tests/visual/index.html index 39168c9f46f..15efc9f0ffb 100644 --- a/tests/visual/index.html +++ b/tests/visual/index.html @@ -34,6 +34,7 @@

Button

Checkboxradio

Dialog

diff --git a/themes/base/theme.css b/themes/base/theme.css index acac7cc0417..adfe1a39eac 100644 --- a/themes/base/theme.css +++ b/themes/base/theme.css @@ -134,7 +134,7 @@ a.ui-button:active, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { border: 1px solid #dad55e/*{borderColorHighlight}*/; - background: #fffa90/*{bgColorHighlight}*/ /*{bgImgUrlHighlight}*/ /*{bgHighlightXPos}*/ /*{bgHighlightYPos}*/ /*{bgHighlightRepeat}*/; + background-color: #fffa90/*{bgColorHighlight}*/ /*{bgImgUrlHighlight}*/ /*{bgHighlightXPos}*/ /*{bgHighlightYPos}*/ /*{bgHighlightRepeat}*/; color: #777620/*{fcHighlight}*/; } .ui-state-highlight a, From e4f979413a1e31e1c9de90e06fb05da6ed2d9f0a Mon Sep 17 00:00:00 2001 From: Chase Wagoner Date: Tue, 24 May 2016 23:12:57 -0700 Subject: [PATCH 2/2] Checkboxradio: fix visual test JS errors --- tests/visual/checkboxradio/checkboxradio.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/visual/checkboxradio/checkboxradio.html b/tests/visual/checkboxradio/checkboxradio.html index a472c9df2fd..7c8e2094b2a 100644 --- a/tests/visual/checkboxradio/checkboxradio.html +++ b/tests/visual/checkboxradio/checkboxradio.html @@ -4,12 +4,8 @@ jQuery UI - Checkboxes - - - - - - + $(function() { var checkboxes = $( "form input" ).checkboxradio();