[Pkg-mozext-commits] [requestpolicy] 197/280: add SeaMonkey-specific CSS for the toolbarbutton

David Prévot taffit at moszumanska.debian.org
Sat May 2 20:30:26 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit a2f77e4da59a617de4b6c1af5a2536acfd9970d4
Author: Martin Kimmerle <dev at 256k.de>
Date:   Sat Jan 31 17:22:19 2015 +0100

    add SeaMonkey-specific CSS for the toolbarbutton
    
    Part of #502.
---
 src/content/lib/utils.jsm            |  4 ++-
 src/content/main/window-manager.jsm  |  8 +++--
 src/skin/toolbarbutton-seamonkey.css | 64 ++++++++++++++++++++++++++++++++++++
 src/skin/toolbarbutton.css           | 19 ++++++-----
 4 files changed, 83 insertions(+), 12 deletions(-)

diff --git a/src/content/lib/utils.jsm b/src/content/lib/utils.jsm
index 289b07b..28b40d1 100644
--- a/src/content/lib/utils.jsm
+++ b/src/content/lib/utils.jsm
@@ -109,7 +109,9 @@ let Utils = (function() {
     }
   }
 
-  self.info.isFirefox = Services.appinfo.ID == C.FIREFOX_ID;
+  let appID = Services.appinfo.ID;
+  self.info.isFirefox = appID === C.FIREFOX_ID;
+  self.info.isSeamonkey = appID === C.SEAMONKEY_ID;
   self.info.isAustralis = self.info.isFirefox &&
       Services.vc.compare(Services.appinfo.platformVersion, '29') >= 0;
 
diff --git a/src/content/main/window-manager.jsm b/src/content/main/window-manager.jsm
index 4be3623..ba15538 100644
--- a/src/content/main/window-manager.jsm
+++ b/src/content/main/window-manager.jsm
@@ -49,9 +49,13 @@ let rpWindowManager = (function(self) {
       globalScope);
 
   let styleSheets = [
-    "chrome://requestpolicy/skin/requestpolicy.css",
-    "chrome://requestpolicy/skin/toolbarbutton.css"
+    "chrome://requestpolicy/skin/requestpolicy.css"
   ];
+  if (Utils.info.isSeamonkey) {
+    styleSheets.push("chrome://requestpolicy/skin/toolbarbutton-seamonkey.css");
+  } else {
+    styleSheets.push("chrome://requestpolicy/skin/toolbarbutton.css");
+  }
 
   let frameScriptURI = "chrome://requestpolicy/content/ui/frame.js?" +
       Math.random();
diff --git a/src/skin/toolbarbutton-seamonkey.css b/src/skin/toolbarbutton-seamonkey.css
new file mode 100644
index 0000000..cbbe439
--- /dev/null
+++ b/src/skin/toolbarbutton-seamonkey.css
@@ -0,0 +1,64 @@
+
+/*
+ * Case: customizing.
+ * ==> red flag.
+ * (the !important keyword is necessary.)
+ */
+/* 32px is the default icon size in SeaMonkey */
+toolbar > toolbarpaletteitem #requestpolicyToolbarButton,
+#palette-box #requestpolicyToolbarButton {
+  list-style-image:
+    url(chrome://requestpolicy/skin/requestpolicy-icon-32-blocked.png) !important;
+}
+toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
+  list-style-image:
+    url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png) !important;
+}
+
+
+/*
+ * Case: "default" (no other selector matched) and
+ * Case: something has been blocked
+ * ==> red flag.
+ */
+
+/* default: */ toolbar #requestpolicyToolbarButton,
+/* blocked: */ toolbar #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
+  list-style-image:
+    url(chrome://requestpolicy/skin/requestpolicy-icon-32-blocked.png);
+}
+/* default: */ toolbar[iconsize="small"] #requestpolicyToolbarButton,
+/* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
+  list-style-image:
+    url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png);
+}
+
+
+/*
+ * Case: nothing has been blocked.
+ * ==> grey flag.
+ */
+
+/* allowed: */ toolbar #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
+  list-style-image:
+    url(chrome://requestpolicy/skin/requestpolicy-icon-32-allowed.png);
+}
+/* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
+  list-style-image:
+    url(chrome://requestpolicy/skin/requestpolicy-icon-allowed.png);
+}
+
+
+/*
+ * Case: blocking is disabled.
+ * ==> yellow flag.
+ */
+
+toolbar #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
+  list-style-image:
+    url(chrome://requestpolicy/skin/requestpolicy-icon-32-disabled.png);
+}
+toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
+  list-style-image:
+    url(chrome://requestpolicy/skin/requestpolicy-icon-disabled.png);
+}
diff --git a/src/skin/toolbarbutton.css b/src/skin/toolbarbutton.css
index be768ac..370cc00 100644
--- a/src/skin/toolbarbutton.css
+++ b/src/skin/toolbarbutton.css
@@ -41,10 +41,10 @@
  *********************************************
  * ___________ detecting Icon Size ___________
  *
- * since Australis:
+ * Australis:
  *    the size/place of the buttons is detected
  *    via the "cui-areatype" attribute.
- * pre-Australis:
+ * non-Australis:
  *    the selector includes the
  * parent toolbar[iconsize="..."]
  *
@@ -55,7 +55,7 @@
  * toolbarpaletteitem[place="..."].
  * Places can be:
  *   palette (32px), panel (32px), toolbar
- * this is the same for Australs and pre-
+ * this is the same for Australs and non-
  * Australis firefox versions.
  *
  *********************************************
@@ -72,6 +72,7 @@ toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
   list-style-image:
     url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png) !important;
 }
+toolbar > toolbarpaletteitem #requestpolicyToolbarButton,
 toolbar[iconsize="large"] > toolbarpaletteitem #requestpolicyToolbarButton {
   list-style-image:
     url(chrome://requestpolicy/skin/requestpolicy-icon-24-blocked.png) !important;
@@ -95,7 +96,7 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
   list-style-image:
     url(chrome://requestpolicy/skin/requestpolicy-icon-32.png);
 }
-/*** pre-Australis only ***/
+/*** non-Australis only ***/
 /* default: */ toolbar[iconsize="large"] #requestpolicyToolbarButton,
 /* blocked: */ toolbar[iconsize="large"] #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
   list-style-image:
@@ -105,7 +106,7 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
 /** Australis: **/
 /* default: */ #requestpolicyToolbarButton[cui-areatype="toolbar"],
 /* blocked: */ #requestpolicyToolbarButton[cui-areatype="toolbar"][requestpolicyBlocked="true"],
-/** pre-Australis: **/
+/** non-Australis: **/
 /* default: */ toolbar[iconsize="small"] #requestpolicyToolbarButton,
 /* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
   list-style-image:
@@ -124,7 +125,7 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
   list-style-image:
     url(chrome://requestpolicy/skin/requestpolicy-icon-32-allowed.png);
 }
-/*** pre-Australis only ***/
+/*** non-Australis only ***/
 /* allowed: */ toolbar[iconsize="large"] #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
   list-style-image:
     url(chrome://requestpolicy/skin/requestpolicy-icon-24-allowed.png);
@@ -132,7 +133,7 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
 /*** "normal" toolbars (16px icons) ***/
 /** selectors for Australis **/
 /* allowed: */ #requestpolicyToolbarButton[cui-areatype="toolbar"][requestpolicyBlocked="false"],
-/** selectors for pre-Australis **/
+/** selectors for non-Australis **/
 /* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
   list-style-image:
     url(chrome://requestpolicy/skin/requestpolicy-icon-allowed.png);
@@ -148,7 +149,7 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
   list-style-image:
     url(chrome://requestpolicy/skin/requestpolicy-icon-32-disabled.png);
 }
-/*** pre-Australis only ***/
+/*** non-Australis only ***/
 toolbar[iconsize="large"] #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
   list-style-image:
     url(chrome://requestpolicy/skin/requestpolicy-icon-24-disabled.png);
@@ -156,7 +157,7 @@ toolbar[iconsize="large"] #requestpolicyToolbarButton[requestpolicyPermissive="t
 /*** "normal" toolbars (16px icons) ***/
 /** Australis: **/
 #requestpolicyToolbarButton[cui-areatype="toolbar"][requestpolicyPermissive="true"],
-/** pre-Australis: **/
+/** non-Australis: **/
 toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
   list-style-image:
     url(chrome://requestpolicy/skin/requestpolicy-icon-disabled.png);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git



More information about the Pkg-mozext-commits mailing list