Bug 658530 - Part 2: Update about:permissions style to use common inContentUI page styles. r=dao
authorBlair McBride <bmcbride@mozilla.com>
Thu, 11 Aug 2011 12:42:38 +1200
changeset 74304 c14bbf65c00efb0e7e68dde2525ca8f6fbb1f6d6
parent 74303 fd84808b1eddbf3e09cba3c2f06999fc482ee278
child 74305 f803e527662ba9b22c45b767c6bd7e64ec00c70c
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
reviewersdao
bugs658530
milestone8.0a1
Bug 658530 - Part 2: Update about:permissions style to use common inContentUI page styles. r=dao
browser/components/preferences/aboutPermissions.xul
browser/themes/gnomestripe/browser/preferences/aboutPermissions.css
browser/themes/pinstripe/browser/preferences/aboutPermissions.css
browser/themes/winstripe/browser/preferences/aboutPermissions.css
--- a/browser/components/preferences/aboutPermissions.xul
+++ b/browser/components/preferences/aboutPermissions.xul
@@ -53,17 +53,17 @@
       onload="AboutPermissions.init();"
       onunload="AboutPermissions.cleanUp();"
       disablefastfind="true"
       role="application">
 
   <script type="application/javascript"
           src="chrome://browser/content/preferences/aboutPermissions.js"/>
 
-  <hbox flex="1" id="permissions-content">
+  <hbox flex="1" id="permissions-content" class="main-content">
 
     <vbox id="sites-box">
       <textbox id="sites-filter"
                emptytext="&sites.search;"
                oncommand="AboutPermissions.filterSitesList();"
                type="search"/>
       <richlistbox id="sites-list"
                    flex="1"
--- a/browser/themes/gnomestripe/browser/preferences/aboutPermissions.css
+++ b/browser/themes/gnomestripe/browser/preferences/aboutPermissions.css
@@ -1,32 +1,26 @@
-/* background styles borrowed from extensions.css */
-#permissions-page {
-  -moz-appearance: none;
-  padding: 18px;
-  background-color: Window;  
-  background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0) 160px),
-                    -moz-linear-gradient(-moz-dialog, Window 160px);
-  color: WindowText;
-}
+@import url("chrome://global/skin/inContentUI.css");
 
-#permissions-content {
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  border: 1px solid ThreeDShadow;
-  border-radius: 5px;
-}
 
 /* sites box */
 
 #sites-box {
   padding: 10px;
   width: 25em;
 }
 
+#sites-filter {
+  margin: 0;
+}
+
+#sites-list {
+  margin: 5px 0 0 0;
+}
+
 .site {
   padding: 4px;
   border-bottom: 1px solid ThreeDLightShadow;
 }
 
 .site-favicon {
   height: 16px;
   width: 16px;
--- a/browser/themes/pinstripe/browser/preferences/aboutPermissions.css
+++ b/browser/themes/pinstripe/browser/preferences/aboutPermissions.css
@@ -1,34 +1,30 @@
-/* background styles borrowed from extensions.css */
-#permissions-page {
-  -moz-appearance: none;
-  padding: 18px;
-  background-image: /* Texture */
-                    url("chrome://mozapps/skin/extensions/background-texture.png"),
-                    /* Gradient */
-                    -moz-linear-gradient(top, #ADB5C2, #BFC6D1);
-}
+@import url("chrome://global/skin/inContentUI.css");
 
-#permissions-content {
-  background-image: -moz-linear-gradient(top,
-                                         rgba(255, 255, 255, 0.4),
-                                         rgba(255, 255, 255, 0.25) 50%,
-                                         rgba(255, 255, 255, 0.05));
-  border: 1px solid rgba(50, 65, 92, 0.4);
-  border-radius: 5px;
-}
 
 /* sites box */
 
 #sites-box {
   padding: 10px;
   width: 25em;
 }
 
+#sites-filter {
+  margin: 0;
+}
+
+#sites-list {
+  -moz-appearance: none;
+  border: 1px solid rgba(60,73,97,0.5);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,0.15), 0 1px rgba(255,255,255,0.25);
+  background: -moz-linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.3));
+  margin: 5px 0 0 0;
+}
+
 .site {
   padding: 4px;
   border-bottom: 1px solid ThreeDLightShadow;
 }
 
 .site-favicon {
   height: 16px;
   width: 16px;
--- a/browser/themes/winstripe/browser/preferences/aboutPermissions.css
+++ b/browser/themes/winstripe/browser/preferences/aboutPermissions.css
@@ -1,37 +1,29 @@
-/* background styles borrowed from extensions.css */
-#permissions-page {
-  -moz-appearance: none;
-  padding: 18px;
-  background-repeat: repeat;
-  color: -moz-dialogText;
-  background-color: -moz-dialog;
-  background-image: /* Fade-out texture at the top, and blend with browser tab */
-                    -moz-linear-gradient(rgba(255,255,255,0.5), rgba(255,255,255,0) 30%),
-                    /* Texture */
-                    url("chrome://mozapps/skin/extensions/background-texture.png");
-}
+@import url("chrome://global/skin/inContentUI.css");
 
-#permissions-content {
-  background-color: rgba(255, 255, 255, 0.35);
-  background-image: -moz-linear-gradient(top,
-                                         rgba(255, 255, 255, 0),
-                                         rgba(255, 255, 255, 0.75));
-  border: 1px solid #C3CEDF;
-  border-radius: 5px;
-}
 
 /* sites box */
 
 #sites-box {
   padding: 10px;
   width: 25em;
 }
 
+#sites-filter {
+  margin: 0;
+}
+
+#sites-list {
+  -moz-appearance: none;
+  border: 1px solid rgba(0, 0, 0, 0.32);
+  background-color: rgba(255, 255, 255, 0.4);
+  margin: 5px 0 0 0;
+}
+
 .site {
   padding: 4px;
   border-bottom: 1px solid ThreeDLightShadow;
 }
 
 .site-favicon {
   height: 16px;
   width: 16px;