From 8ef113f305eeeec2f0c3923636053e5415a39968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sat, 25 Mar 2017 12:03:39 +0100
Subject: [PATCH] Bug 1350539 - Clean up custom .checkbox-check styling. r=jaws

MozReview-Commit-ID: BfiA0gp9giI

--HG--
extra : rebase_source : 1a398d1c5fa0cbeb53b39a8f6afb3bf9348f2d6b
---
 browser/themes/linux/preferences/preferences.css    | 5 -----
 toolkit/themes/linux/global/in-content/common.css   | 2 +-
 toolkit/themes/shared/in-content/common.inc.css     | 5 ++---
 toolkit/themes/windows/global/in-content/common.css | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/browser/themes/linux/preferences/preferences.css b/browser/themes/linux/preferences/preferences.css
index 954b02c3bdcf..fd9fc8e3db4e 100644
--- a/browser/themes/linux/preferences/preferences.css
+++ b/browser/themes/linux/preferences/preferences.css
@@ -5,11 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-/* Global Styles */
-.checkbox-check {
-  -moz-appearance: checkbox;
-}
-
 /* General Pane */
 #useFirefoxSync,
 #getStarted {
diff --git a/toolkit/themes/linux/global/in-content/common.css b/toolkit/themes/linux/global/in-content/common.css
index 898e74df910b..a60952c70d97 100644
--- a/toolkit/themes/linux/global/in-content/common.css
+++ b/toolkit/themes/linux/global/in-content/common.css
@@ -52,7 +52,7 @@ xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker {
 }
 
 xul|*.checkbox-check {
-  background-image: none !important;
+  background-image: none;
 }
 
 xul|*.checkbox-check[checked] {
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index 357487a4f02e..e8246e549995 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -529,8 +529,7 @@ html|input[type="checkbox"] {
   margin: 0;
   margin-inline-end: 10px;
   background-color: #f1f1f1;
-  /* !important needed to override toolkit checked !important rule */
-  background-image: linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
+  background-image: linear-gradient(#fff, rgba(255,255,255,0.8));
   background-position: center center;
   background-repeat: no-repeat;
   box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03);
@@ -546,7 +545,7 @@ xul|*.checkbox-check[checked] {
 }
 
 html|input[type="checkbox"]:checked {
-  background-image: url("chrome://global/skin/in-content/check.svg#check"), linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
+  background-image: url("chrome://global/skin/in-content/check.svg#check"), linear-gradient(#fff, rgba(255,255,255,0.8));
 }
 
 xul|checkbox[disabled="true"] > xul|*.checkbox-check,
diff --git a/toolkit/themes/windows/global/in-content/common.css b/toolkit/themes/windows/global/in-content/common.css
index 767a5de174f0..02dcc077c574 100644
--- a/toolkit/themes/windows/global/in-content/common.css
+++ b/toolkit/themes/windows/global/in-content/common.css
@@ -26,7 +26,7 @@ xul|checkbox {
 
 @media (-moz-windows-default-theme: 0) {
   xul|*.checkbox-check {
-    background-image: none !important;
+    background-image: none;
   }
 
   xul|*.checkbox-check[checked] {