From 4206002ca00b98c21c1744c34887dcf326bf43b0 Mon Sep 17 00:00:00 2001 From: William Chen Date: Fri, 17 May 2013 15:29:02 -0700 Subject: [PATCH] Bug 875165 - Update help button style to be compatible with XBL refactoring changes. r=dao --HG-- extra : rebase_source : 2874a068bc0de77161268810bf6c8daff92ed3e8 --- toolkit/themes/osx/global/button.css | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/toolkit/themes/osx/global/button.css b/toolkit/themes/osx/global/button.css index f908c6bfce9..d66740fbef7 100644 --- a/toolkit/themes/osx/global/button.css +++ b/toolkit/themes/osx/global/button.css @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace xbl "http://www.mozilla.org/xbl"; button { -moz-appearance: button; @@ -83,17 +84,28 @@ button[dlgtype="help"]:-moz-focusring { -moz-outline-radius: 10000px; } -button[dlgtype="help"] > .button-box > .button-icon { +button[dlgtype="help"] > .button-box > .button-icon, +/* Due to XBL refactoring changes, default content in a binding is + contained in a element and thus the selector above + will not match the help button icon. When the XBL refactoring is + shipped (bug 653881), the selector above may be removed. */ +button[dlgtype="help"] > .button-box > xbl|children > .button-icon { list-style-image: url("chrome://global/skin/icons/question-mark.png"); -moz-image-region: rect(0 24px 24px 0); padding: 0; margin: 0; } -button[dlgtype="help"]:active > .button-box > .button-icon { +button[dlgtype="help"]:active > .button-box > .button-icon, +/* When the XBL refactoring is shipped (bug 653881), + the selector above may be removed. */ +button[dlgtype="help"]:active > .button-box > xbl|children > .button-icon { -moz-image-region: rect(0 48px 24px 24px); } -button[dlgtype="help"] > .button-box > .button-text { +button[dlgtype="help"] > .button-box > .button-text, +/* When the XBL refactoring is shipped (bug 653881), + the selector above may be removed. */ +button[dlgtype="help"] > .button-box > xbl|children > .button-text { display: none; }