11 files changed, 180 insertions, 16 deletions
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-16.png b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-16.png
index 27339c7..ee84da0 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-16.png
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-16.png
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-32.png b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-32.png
index 7d98d62..f41da4c 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-32.png
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-32.png
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-48.png b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-48.png
new file mode 100644
index 0000000..511a921
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-48.png
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-64.png b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-64.png
new file mode 100644
index 0000000..3c8c67a
--- /dev/null
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status-64.png
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status.png b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status.png
index e7ecf24..f5eae06 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/abp-status.png
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/abp-status.png
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/composer.css b/data/extensions/spyblock@gnu.org/chrome/skin/composer.css
index d80eafe..6263eb1 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/composer.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/composer.css
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/filters.css b/data/extensions/spyblock@gnu.org/chrome/skin/filters.css
index 3576315..f335ceb 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/filters.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/filters.css
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -153,10 +153,11 @@ tree
  * Force left-to-right for filter text but not comments
  */
 treechildren:-moz-locale-dir(rtl)::-moz-tree-cell(col-filter, type-invalid),
+treechildren:-moz-locale-dir(rtl)::-moz-tree-cell(col-filter, type-blocking),
 treechildren:-moz-locale-dir(rtl)::-moz-tree-cell(col-filter, type-whitelist),
-treechildren:-moz-locale-dir(rtl)::-moz-tree-cell(col-filter, type-filterlist),
 treechildren:-moz-locale-dir(rtl)::-moz-tree-cell(col-filter, type-elemhide),
-treechildren:-moz-locale-dir(rtl)::-moz-tree-cell(col-filter, type-elemhideexception)
+treechildren:-moz-locale-dir(rtl)::-moz-tree-cell(col-filter, type-elemhideexception),
+treechildren:-moz-locale-dir(rtl)::-moz-tree-cell(col-filter, type-elemhideemulation)
 {
   direction: ltr;
   text-align: end;
@@ -173,7 +174,8 @@ treechildren::-moz-tree-cell-text(col-filter, type-elemhideexception, selected-f
   color: #008000;
 }
 
-treechildren::-moz-tree-cell-text(col-filter, type-elemhide, selected-false)
+treechildren::-moz-tree-cell-text(col-filter, type-elemhide, selected-false),
+treechildren::-moz-tree-cell-text(col-filter, type-elemhideemulation, selected-false)
 {
   color: #000080;
 }
@@ -215,7 +217,55 @@ treechildren::-moz-tree-image(col-slow, slow-true)
   list-style-image: url(slow.png);
 }
 
-.findbar-highlight
+/* Findbar */
+
+#findbar
 {
-  display: none;
+  border-top: 1px solid #888;
+}
+
+#findbar-closebutton
+{
+  list-style-image: url(close.png);
+  -moz-image-region: rect(0px, 14px, 14px, 0px);
+}
+
+#findbar-closebutton:hover
+{
+  -moz-image-region: rect(0px, 28px, 14px, 14px);
+}
+
+#findbar-closebutton:active
+{
+  -moz-image-region: rect(0px, 42px, 14px, 28px);
+}
+
+#findbar[data-status="notFound"] > #findbar-textbox
+{
+  /* We cannot change background color because of -moz-appearance but a red */
+  /* shadow works. */
+  box-shadow: 0 0 1.5px 1px red;
+}
+
+#findbar[data-status="notFound"] > #findbar-textbox[focused="true"]
+{
+  box-shadow: 0 0 2px 2px rgba(255, 0, 0, 0.4);
+}
+
+#findbar[data-os="darwin"] > #findbar-case-sensitive[checked="true"]
+{
+  /* Firefox on Mac doesn't indicate checked buttons, do it ourselves */
+  filter: brightness(70%);
+}
+
+.findbar-status
+{
+  font-size: 80%;
+}
+
+#findbar:not([data-status="wrappedStart"]) #findbar-status-wrappedStart,
+#findbar:not([data-status="wrappedEnd"]) #findbar-status-wrappedEnd,
+#findbar:not([data-status="notFound"]) #findbar-status-notFound
+{
+  visibility: hidden;
 }
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/overlay.css b/data/extensions/spyblock@gnu.org/chrome/skin/overlay.css
index dca1b46..60ba812 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/overlay.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/overlay.css
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -26,10 +26,12 @@
 toolbar[iconsize="small"] #abp-toolbarbutton,
 #PersonalToolbar #abp-toolbarbutton,
 #header-view-toolbar > #abp-toolbarbutton,
-#abp-status {
+#abp-status
+{
   list-style-image: url("abp-status-16.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
+
 toolbar[iconsize="small"] #abp-toolbarbutton[abpstate="disabled"],
 #PersonalToolbar #abp-toolbarbutton[abpstate="disabled"],
 #header-view-toolbar > #abp-toolbarbutton[abpstate="disabled"],
@@ -37,10 +39,59 @@ toolbar[iconsize="small"] #abp-toolbarbutton[abpstate="disabled"],
 toolbar[iconsize="small"] #abp-toolbarbutton[abpstate="whitelisted"],
 #PersonalToolbar #abp-toolbarbutton[abpstate="whitelisted"],
 #header-view-toolbar > #abp-toolbarbutton[abpstate="whitelisted"],
-#abp-status[abpstate="whitelisted"] {
+#abp-status[abpstate="whitelisted"]
+{
   -moz-image-region: rect(16px, 16px, 32px, 0px);
 }
 
+@media screen and (min-resolution: 1.5dppx)
+{
+  toolbar[iconsize="small"] #abp-toolbarbutton,
+  #PersonalToolbar #abp-toolbarbutton,
+  #header-view-toolbar > #abp-toolbarbutton,
+  #abp-status
+  {
+    list-style-image: url("abp-status.png");
+    -moz-image-region: rect(0px, 24px, 24px, 0px);
+  }
+
+  toolbar[iconsize="small"] #abp-toolbarbutton[abpstate="disabled"],
+  #PersonalToolbar #abp-toolbarbutton[abpstate="disabled"],
+  #header-view-toolbar > #abp-toolbarbutton[abpstate="disabled"],
+  #abp-status[abpstate="disabled"],
+  toolbar[iconsize="small"] #abp-toolbarbutton[abpstate="whitelisted"],
+  #PersonalToolbar #abp-toolbarbutton[abpstate="whitelisted"],
+  #header-view-toolbar > #abp-toolbarbutton[abpstate="whitelisted"],
+  #abp-status[abpstate="whitelisted"]
+  {
+    -moz-image-region: rect(24px, 24px, 48px, 0px);
+  }
+}
+
+@media screen and (min-resolution: 2dppx)
+{
+  toolbar[iconsize="small"] #abp-toolbarbutton,
+  #PersonalToolbar #abp-toolbarbutton,
+  #header-view-toolbar > #abp-toolbarbutton,
+  #abp-status
+  {
+    list-style-image: url("abp-status-32.png");
+    -moz-image-region: rect(0px, 32px, 32px, 0px);
+  }
+
+  toolbar[iconsize="small"] #abp-toolbarbutton[abpstate="disabled"],
+  #PersonalToolbar #abp-toolbarbutton[abpstate="disabled"],
+  #header-view-toolbar > #abp-toolbarbutton[abpstate="disabled"],
+  #abp-status[abpstate="disabled"],
+  toolbar[iconsize="small"] #abp-toolbarbutton[abpstate="whitelisted"],
+  #PersonalToolbar #abp-toolbarbutton[abpstate="whitelisted"],
+  #header-view-toolbar > #abp-toolbarbutton[abpstate="whitelisted"],
+  #abp-status[abpstate="whitelisted"]
+  {
+    -moz-image-region: rect(32px, 32px, 64px, 0px);
+  }
+}
+
 #abp-toolbarbutton[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #abp-toolbarbutton
 {
@@ -56,6 +107,42 @@ toolbarpaletteitem[place="palette"] > #abp-toolbarbutton[abpstate="whitelisted"]
   -moz-image-region: rect(32px, 32px, 64px, 0px);
 }
 
+@media screen and (min-resolution: 1.5dppx)
+{
+  #abp-toolbarbutton[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #abp-toolbarbutton
+  {
+    list-style-image: url("abp-status-48.png");
+    -moz-image-region: rect(0px, 48px, 48px, 0px);
+  }
+
+  #abp-toolbarbutton[cui-areatype="menu-panel"][abpstate="disabled"],
+  toolbarpaletteitem[place="palette"] > #abp-toolbarbutton[abpstate="disabled"],
+  #abp-toolbarbutton[cui-areatype="menu-panel"][abpstate="whitelisted"],
+  toolbarpaletteitem[place="palette"] > #abp-toolbarbutton[abpstate="whitelisted"]
+  {
+    -moz-image-region: rect(48px, 48px, 96px, 0px);
+  }
+}
+
+@media screen and (min-resolution: 2dppx)
+{
+  #abp-toolbarbutton[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #abp-toolbarbutton
+  {
+    list-style-image: url("abp-status-64.png");
+    -moz-image-region: rect(0px, 64px, 64px, 0px);
+  }
+
+  #abp-toolbarbutton[cui-areatype="menu-panel"][abpstate="disabled"],
+  toolbarpaletteitem[place="palette"] > #abp-toolbarbutton[abpstate="disabled"],
+  #abp-toolbarbutton[cui-areatype="menu-panel"][abpstate="whitelisted"],
+  toolbarpaletteitem[place="palette"] > #abp-toolbarbutton[abpstate="whitelisted"]
+  {
+    -moz-image-region: rect(64px, 64px, 128px, 0px);
+  }
+}
+
 #abp-toolbar-popup {
   list-style-image: none;
   -moz-image-region: rect(0px, 0px, 0px, 0px);
@@ -148,7 +235,9 @@ toolbar[mode="full"] #abp-toolbarbutton[type="menu"]
     visibility: visible !important;
 }
 
-#abp-bottombar-close {
+#abp-bottombar-close,
+#abp-notification-close
+{
   padding: 4px 2px;
   border-style: none !important;
   -moz-user-focus: normal;
@@ -157,11 +246,15 @@ toolbar[mode="full"] #abp-toolbarbutton[type="menu"]
   -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
 
-#abp-bottombar-close:hover {
+#abp-bottombar-close:hover,
+#abp-notification-close:hover
+{
   -moz-image-region: rect(0px, 28px, 14px, 14px);
 }
 
-#abp-bottombar-close:hover:active {
+#abp-bottombar-close:hover:active,
+#abp-notification-close:hover:active
+{
   -moz-image-region: rect(0px, 42px, 14px, 28px);
 }
 
@@ -224,3 +317,14 @@ toolbar[mode="full"] #abp-toolbarbutton[type="menu"]
 {
   text-decoration: underline;
 }
+
+#abp-notification.abp-closing #abp-notification-content,
+#abp-notification:not(.abp-closing) #abp-notification-close-content
+{
+  display: none;
+}
+
+#abp-notification-close-content toolbarbutton label
+{
+  text-align: left;
+}
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/sendReport.css b/data/extensions/spyblock@gnu.org/chrome/skin/sendReport.css
index 9410880..9a0d769 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/sendReport.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/sendReport.css
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -94,6 +94,11 @@ radio, checkbox, .topLabel, #dataDeck
   overflow-y: scroll;
 }
 
+#anonymousCheckbox, #extensionsCheckbox
+{
+  margin-top: 0px;
+}
+
 #commentLengthWarning, #anonymityWarning
 {
   color: red;
@@ -104,6 +109,11 @@ radio, checkbox, .topLabel, #dataDeck
   visibility: hidden;
 }
 
+#data
+{
+  min-height: 50px;
+}
+
 /*
  * Force left-to-right everywhere where we are displaying addresses
  */
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/sidebar.css b/data/extensions/spyblock@gnu.org/chrome/skin/sidebar.css
index ba511d5..abacee7 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/sidebar.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/sidebar.css
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
diff --git a/data/extensions/spyblock@gnu.org/chrome/skin/subscriptionSelection.css b/data/extensions/spyblock@gnu.org/chrome/skin/subscriptionSelection.css
index 44c3080..234277e 100644
--- a/data/extensions/spyblock@gnu.org/chrome/skin/subscriptionSelection.css
+++ b/data/extensions/spyblock@gnu.org/chrome/skin/subscriptionSelection.css
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as