Bug 1488033 - Fix the layout of the Preferences window when one of the advanced cookie blocking options under Cookies and Site Data section are selected; r=johannh
authorEhsan Akhgari <ehsan@mozilla.com>
Sun, 02 Sep 2018 20:07:47 -0400
changeset 492294 3d8df5a41dc520e8fc3168e42104a7f4995422f4
parent 492293 650e1b5d0446e5b150e77c56c0a87e0a970adef0
child 492295 45710448c230689682a0d7d85e46411b475763dd
push id1815
push userffxbld-merge
push dateMon, 15 Oct 2018 10:40:45 +0000
treeherdermozilla-release@18d4c09e9378 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1488033
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1488033 - Fix the layout of the Preferences window when one of the advanced cookie blocking options under Cookies and Site Data section are selected; r=johannh Differential Revision: https://phabricator.services.mozilla.com/D4830
browser/components/preferences/in-content/privacy.xul
browser/themes/shared/incontentprefs/privacy.css
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -390,37 +390,31 @@
           <vbox class="content-blocking-category-checkbox">
             <checkbox id="contentBlockingBlockCookiesCheckbox" class="content-blocking-checkbox" />
           </vbox>
           <vbox class="content-blocking-category-icon">
             <image class="reject-trackers-icon content-blocking-icon"/>
           </vbox>
           <vbox class="content-blocking-category-labels" flex="1">
             <hbox>
-              <vbox>
+              <vbox flex="1">
                 <label data-l10n-id="content-blocking-reject-trackers-label"
                        class="content-blocking-category-name"
                        control="contentBlockingBlockCookiesCheckbox"/>
                 <deck id="blockCookiesCBDeck">
                   <description id="blockCookiesCBDesc"
                                data-l10n-id="content-blocking-reject-trackers-description"
                                class="content-blocking-category-description"/>
-                  <hbox id="warningAllCookiesBlocked">
-                    <image class="reject-trackers-warning-icon"/>
-                    <description data-l10n-id="content-blocking-reject-trackers-warning-your-settings-prevent-changes"
-                                 class="content-blocking-category-description description-with-side-element"/>
-                  </hbox>
-                  <hbox id="warningFromVisitedCookiesBlocked">
-                    <image class="reject-trackers-warning-icon"/>
-                    <description data-l10n-id="content-blocking-reject-trackers-warning-your-settings-prevent-changes"
-                                 class="content-blocking-category-description description-with-side-element"/>
-                  </hbox>
+                  <description data-l10n-id="content-blocking-reject-trackers-warning-your-settings-prevent-changes"
+                               class="content-blocking-category-description description-with-side-element reject-trackers-warning-icon"/>
+                  <description data-l10n-id="content-blocking-reject-trackers-warning-your-settings-prevent-changes"
+                               class="content-blocking-category-description description-with-side-element reject-trackers-warning-icon"/>
                 </deck>
               </vbox>
-              <hbox align="center">
+              <hbox align="center" pack="end">
                 <vbox align="center">
                   <button id="contentBlockingChangeCookieSettings"
                           class="accessory-button"
                           flex="1"
                           hidden="true"
                           data-l10n-id="content-blocking-change-cookie-settings"/>
                 </vbox>
               </hbox>
--- a/browser/themes/shared/incontentprefs/privacy.css
+++ b/browser/themes/shared/incontentprefs/privacy.css
@@ -152,19 +152,23 @@
   list-style-image: url(chrome://browser/skin/controlcenter/trackers.svg);
 }
 
 .reject-trackers-icon {
   list-style-image: url(chrome://browser/skin/controlcenter/3rdpartycookies.svg);
 }
 
 .reject-trackers-warning-icon {
-  list-style-image: url(chrome://browser/skin/controlcenter/warning.svg);
+  background: url(chrome://browser/skin/controlcenter/warning.svg) no-repeat 0 5px;
   -moz-context-properties: fill, stroke;
   fill: #d7b600;
   stroke: white;
-  padding: 4px;
+  inline-padding-start: 20px;
+}
+
+.reject-trackers-warning-icon:-moz-locale-dir(rtl) {
+  background-position-x: right 0;
 }
 
 #contentBlockingChangeCookieSettings {
   padding: 0.25em 0.75em;
   margin: 4px 8px;
 }