Bug 986636 - Use icon instead of [?] on sync prefs when master password locked. r=ttaubert, a=sledru
authorMark Hammond <mhammond@skippinet.com.au>
Thu, 10 Apr 2014 12:14:43 +1000
changeset 183708 785fb5b58ae5eb227931ca85cba79abe9303770e
parent 183707 8b66928d0515ef777f8977d0359e2c375fe48f1e
child 183709 dcbe04c7a069f0079aa3be5cb91b536082c88e70
push id3455
push userryanvm@gmail.com
push dateFri, 11 Apr 2014 17:58:28 +0000
treeherdermozilla-beta@dcbe04c7a069 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersttaubert, sledru
bugs986636
milestone29.0
Bug 986636 - Use icon instead of [?] on sync prefs when master password locked. r=ttaubert, a=sledru
browser/components/preferences/in-content/sync.xul
browser/components/preferences/sync.xul
browser/themes/linux/preferences/preferences.css
browser/themes/osx/preferences/preferences.css
browser/themes/windows/preferences/preferences.css
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -261,20 +261,17 @@
             <checkbox id="fxa-pweng-chk"
                       label="&engine.passwords.label;"
                       accesskey="&engine.passwords.accesskey;"
                       preference="engine.passwords"/>
 
             <vbox id="fxa-pweng-help">
               <spacer flex="1"/>
               <hbox id="fxa-pweng-help-link">
-                <label value=" ["/>
-                <label class="text-link" value="?"
-                        onclick="gSyncUtils.openMPInfoPage(event);"/>
-                <label value="]"/>
+                <image onclick="gSyncUtils.openMPInfoPage(event);" />
               </hbox>
               <spacer flex="1"/>
             </vbox>
           </hbox>
           <checkbox label="&engine.history.label;"
                     accesskey="&engine.history.accesskey;"
                     preference="engine.history"/>
           <checkbox label="&engine.addons.label;"
--- a/browser/components/preferences/sync.xul
+++ b/browser/components/preferences/sync.xul
@@ -270,20 +270,17 @@
                 <checkbox id="fxa-pweng-chk"
                           label="&engine.passwords.label;"
                           accesskey="&engine.passwords.accesskey;"
                           preference="engine.passwords"/>
 
                 <vbox id="fxa-pweng-help">
                   <spacer flex="1"/>
                   <hbox id="fxa-pweng-help-link">
-                    <label value=" ["/>
-                    <label class="text-link" value="?"
-                           onclick="gSyncUtils.openMPInfoPage(event);"/>
-                    <label value="]"/>
+                        <image onclick="gSyncUtils.openMPInfoPage(event);" />
                   </hbox>
                   <spacer flex="1"/>
                 </vbox>
               </hbox>
               <checkbox label="&engine.history.label;"
                         accesskey="&engine.history.accesskey;"
                         preference="engine.history"/>
               <checkbox label="&engine.addons.label;"
--- a/browser/themes/linux/preferences/preferences.css
+++ b/browser/themes/linux/preferences/preferences.css
@@ -164,9 +164,13 @@ label.small {
 #noFxaAccount > label:first-child {
   margin-bottom: 0.6em;
 }
 
 #fxa-pweng-help-link > label {
   margin: 0;
 }
 
+#fxa-pweng-help-link > image {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+}
+
 %endif
--- a/browser/themes/osx/preferences/preferences.css
+++ b/browser/themes/osx/preferences/preferences.css
@@ -229,9 +229,21 @@ html|a.inline-link:-moz-focusring {
 #noFxaAccount > label:first-child {
   margin-bottom: 0.6em;
 }
 
 #fxa-pweng-help-link > label {
   margin: 0;
 }
 
+#fxa-pweng-help-link > image {
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+}
+
+@media (min-resolution: 2dppx) {
+  #fxa-pweng-help-link > image {
+    list-style-image: url("chrome://global/skin/icons/question-32.png");
+  }
+}
+
 %endif
--- a/browser/themes/windows/preferences/preferences.css
+++ b/browser/themes/windows/preferences/preferences.css
@@ -154,9 +154,13 @@ label.small {
 #noFxaAccount > label:first-child {
   margin-bottom: 0.6em;
 }
 
 #fxa-pweng-help-link > label {
   margin: 0;
 }
 
+#fxa-pweng-help-link > image {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+}
+
 %endif