Issue 6115 - Refactored icon classes

skin/desktop-options.css

Index: skin/desktop-options.css
===================================================================
--- a/skin/desktop-options.css
+++ b/skin/desktop-options.css
@@ -144,134 +144,39 @@
   cursor: pointer;
 }
 
-button.primary,
-.button.primary
+/* Ignore .icon to avoid overriding "specific" (primary, secondary) styles */
+button.primary:not(.icon),
+.button.primary:not(.icon)
 {
   border: 0px;
   color: #FFF;
   background-color: #077CA6;
 }
 
-button.primary:not([disabled]):hover,
-.button.primary:hover
+button.primary:not([disabled]):not(.icon):hover,
+.button.primary:not(.icon):hover
 {
   box-shadow: inset 0 0 0 3px #005D80;
 }
 
-button.primary[disabled]
+button.primary[disabled]:not(.icon)
 {
   background-color: #5CBCE1;
 }
 
-button.secondary,
-.button.secondary
+button.secondary:not(.icon),
+.button.secondary:not(.icon)
 {
   border: 2px solid #077CA6;
   color: #077CA6;
 }
 
-button.secondary:hover,
-.button.secondary:hover
+button.secondary:not(.icon):hover,
+.button.secondary:not(.icon):hover
 {
   box-shadow: inset 0 0 0 1px #077CA6;
 }
 
-button[role="checkbox"]
-{
-  width: 1.2rem;
-  height: 1.2rem;
-  padding: 0px;
-  border: 0px;
-  background-color: transparent;
-}
-
-button[role="checkbox"]:not(.toggle)
-{
-  /* Using ?query as a workaround to chromium bug #643716 */
-  background-image: url(icons/checkbox.svg?off#off);
-  display: inline-block;
-}
-
-button[role="checkbox"][aria-checked="true"]:not(.toggle)
-{
-  background-image: url(icons/checkbox.svg?on#on);
-}
-
-button[role="checkbox"][disabled],
-button[role="checkbox"][aria-disabled="true"]
-{
-  border-radius: 2px;
-  background-color: #ccc;
-}
-
-button[role="checkbox"].toggle
-{
-  background-image: url(icons/toggle.svg?on#on);
-}
-
-button[role="checkbox"][aria-checked="false"].toggle
-{
-  background-image: url(icons/toggle.svg?off#off);
-}
-
-button[role="checkbox"][aria-checked="true"].toggle
-{
-  background-image: url(icons/toggle.svg?on#on);
-}
-
-button[role="checkbox"].toggle
-{
-  background-position: initial;
-  width: 1.9rem;
-  height: 1rem;
-  vertical-align: middle;
-}
-
-button[role="checkbox"][disabled].toggle
-{
-  background: none;
-}
-
-button.delete::before
-{
-  background-image: url(icons/trash.svg?default#default);
-}
-
-button.delete:hover::before
-{
-  background-image: url(icons/trash.svg?hover#hover);
-}
-
-button.gear::before
-{
-  background-image: url(icons/gear.svg?default#default);
-}
-
-button.gear:hover::before
-{
-  background-image: url(icons/gear.svg?hover#hover);
-}
-
-button.gear,
-button.delete
-{
-  border: 0px;
-  padding: 0px;
-  background-color: transparent;
-}
-
-button.gear::before,
-button.delete::before
-{
-  content: "";
-  display: block;
-  height: 1rem;
-  width: 1rem;
-  border: 0.2rem solid transparent;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
 button.link,
 button.list
 {
@@ -296,7 +201,7 @@
 
 button.list
 {
-  border-style: solid;;
+  border-style: solid;
   border-color: #CDCDCD;
   border-width: 1px;
   width: 100%;
@@ -332,6 +237,219 @@
 }
 
 /*
+  icons
+ */
+
+.icon
+{
+  border: 0px;
+  padding: 0px;
+  background-color: transparent;
+}
+
+.icon:hover
+{
+  box-shadow: none;
+}
+
+.icon::before
+{
+  content: "";
+  display: block;
+  border: 0.2rem solid transparent;
+  background-repeat: no-repeat;
+}
+
+button[role="checkbox"].icon::before
+{
+  width: 1.2rem;
+  height: 1.2rem;
+  padding: 0px;
+}
+
+button[role="checkbox"][disabled].icon:not(.toggle)::before,
+button[role="checkbox"][aria-disabled="true"].icon:not(.toggle)::before
+{
+  border: 0rem;
+  margin: 0.2rem;
+  border-radius: 2px;
+  background-color: #ccc;
+}
+
+button[role="checkbox"].icon:not(.toggle)::before
+{
+  /* Using ?query as a workaround to chromium bug #643716 */
+  background-image: url(icons/checkbox.svg?off#off);
+}
+
+button[role="checkbox"][aria-checked="true"].icon:not(.toggle)::before
+{
+  background-image: url(icons/checkbox.svg?on#on);
+}
+
+button[role="checkbox"].icon.toggle::before
+{
+  background-image: url(icons/toggle.svg?on#on);
+}
+
+button[role="checkbox"][aria-checked="false"].icon.toggle::before
+{
+  background-image: url(icons/toggle.svg?off#off);
+}
+
+button[role="checkbox"].icon.toggle::before
+{
+  width: 1.9rem;
+  height: 1rem;
+}
+
+button[role="checkbox"][disabled].icon.toggle::before
+{
+  background: none;
+}
+
+.icon.delete::before
+{
+  background-image: url(icons/trash.svg?default#default);
+}
+
+.icon.delete:hover::before
+{
+  background-image: url(icons/trash.svg?hover#hover);
+}
+
+.icon.gear::before
+{
+  background-image: url(icons/gear.svg?default#default);
+}
+
+.icon.gear:hover::before
+{
+  background-image: url(icons/gear.svg?hover#hover);
+}
+
+.icon.gear::before,
+.icon.delete::before
+{
+  height: 1rem;
+  width: 1rem;
+}
+
+[data-validation] .floating-input input:focus:invalid ~ .icon.attention::before
+{
+  background-image: url(icons/attention.svg);
+}
+
+[data-validation] .floating-input input:valid ~ .icon.attention::before
+{
+  top: 0.5rem;
+  background-image: url(icons/checkmark.svg?approved#approved);
+}
+
+.context-menu .icon.update-subscription::before
+{
+  background-image: url(icons/reload.svg);
+}
+
+.context-menu .icon.website::before
+{
+  background-image: url(icons/globe.svg);
+}
+
+.context-menu .icon.source::before
+{
+  background-image: url(icons/code.svg);
+}
+
+.context-menu .icon.delete::before
+{
+  background-image: url(icons/trash.svg?default#default);
+}
+
+.close.icon::before
+{
+  height: 1rem;
+  width: 1rem;
+}
+
+.icon.close.primary::before
+{
+  background-image: url(icons/delete.svg?primary#primary);
+}
+
+.icon.close.primary:hover::before
+{
+  background-image: url(icons/delete.svg?primary-hover#primary-hover);
+}
+
+.icon.close.secondary::before
+{
+  background-image: url(icons/delete.svg?secondary#secondary);
+}
+
+.icon.close.tertiary::before
+{
+  background-image: url(icons/delete.svg?tertiary#tertiary);
+}
+
+.icon.close.secondary:hover::before
+{
+  background-image: url(icons/delete.svg?secondary-hover#secondary-hover);
+}
+
+.icon.close.tertiary:hover::before
+{
+  background-image: url(icons/delete.svg?tertiary-hover#tertiary-hover);
+}
+
+.tooltip::before
+{
+  width: 1.1rem;
+  height: 1.1rem;
+}
+
+.icon.tooltip::before
+{
+  background-image: url(icons/tooltip.svg);
+}
+
+#dialog .table.list li button.icon::before
+{
+  width: 1.3rem;
+  height: 1.3rem;
+  margin: 0rem;
+  border: 0rem;
+  background-image: none;
+}
+
+#dialog .table.list li button[aria-checked="true"].icon::before
+{
+  background-image: url(icons/checkmark.svg?default#default);
+}
+
+#social ul li .icon::before
+{
+  margin: 0em auto;
+  width: 2.5rem;
+  height: 2.5rem;
+}
+
+.icon#twitter::before
+{
+  background-image: url("social/twitter.svg");
+}
+
+.icon#facebook::before
+{
+  background-image: url("social/facebook.svg");
+}
+
+.icon#google-plus::before
+{
+  background-image: url("social/googleplus.svg");
+}
+
+/*
   Forms
  */
 
@@ -385,13 +503,10 @@
 [data-validation] .floating-input input:focus:invalid ~ .attention::before,
 [data-validation] .floating-input input:valid ~ .attention::before
 {
-  content: "";
   position: absolute;
-  display: block;
-  margin: 0.5rem;
+  margin: 0.3rem;
   height: 1.5rem;
   width: 1.5rem;
-  border: 0rem;
   top: 0.3rem;
   right: 0rem;
 }
@@ -403,17 +518,6 @@
   right: auto;
 }
 
-[data-validation] .floating-input input:focus:invalid ~ .attention::before
-{
-  background-image: url(icons/attention.svg);
-}
-
-[data-validation] .floating-input input:valid ~ .attention::before
-{
-  top: 0.5rem;
-  background-image: url(icons/checkmark.svg?approved#approved);
-}
-
 [data-validation] .floating-input input ~ .error-msg
 {
   margin-top: 0.5rem;
@@ -694,7 +798,6 @@
 #acceptable-ads ul button
 {
   position: absolute;
-  margin-top: 0.3rem;
   left: 0rem;
 }
 
@@ -837,6 +940,7 @@
 .col5 > *
 {
   display: inline-block;
+  vertical-align: middle;
 }
 
 .cols .col5
@@ -890,8 +994,8 @@
 
 .table.cols .state
 {
-  -moz-margin-start: 1.1rem;
-  -webkit-margin-start: 1.1rem;
+  -moz-margin-start: 1rem;
+  -webkit-margin-start: 1rem;
 }
 
 .table.cols .gear
@@ -931,15 +1035,6 @@
   color: #BBB;
 }
 
-#dialog .table.list li button[aria-checked="true"]::before
-{
-  content: "";
-  width: 1.3rem;
-  height: 1.3rem;
-  background-image: url(icons/checkmark.svg?default#default);
-  margin: 0rem;
-}
-
 #dialog .table.list li button .display
 {
   flex: none;
@@ -954,7 +1049,6 @@
 
 .tooltip
 {
-  display: inline-block;
   position: relative;
   margin: 0rem;
   -moz-margin-end: 1rem;
@@ -964,15 +1058,6 @@
   cursor: help;
 }
 
-.tooltip::before
-{
-  content: "";
-  width: 1.1rem;
-  height: 1.1rem;
-  display: block;
-  background-image: url(icons/tooltip.svg);
-}
-
 /* 
   Used for translatable screen reader only content.
   e.g.: Use instead of aria-label to avoid complex attribute value translation
@@ -1099,8 +1184,8 @@
 
 [role="tooltip"]
 {
-  right: -1rem;
-  margin-top: 1rem;
+  right: -0.8rem;
+  margin-top: 0.8rem;
   opacity: 1;
   padding: 0.2rem 1rem;
   position: absolute;
@@ -1116,7 +1201,7 @@
 html[dir="rtl"] [role="tooltip"]
 {
   right: auto;
-  left: -1rem;
+  left: -0.8rem;
 }
 
 [role="tooltip"],
@@ -1141,7 +1226,7 @@
 {
   position: absolute;
   right: 2.5rem;
-  top: -2.7rem;
+  top: -2rem;
   z-index: 1;
   visibility: hidden;
 }
@@ -1233,35 +1318,14 @@
   cursor: pointer;
 }
 
-.context-menu li[role="menuitem"] > *::before
+.context-menu li[role="menuitem"] .icon::before
 {
-  content: "";
   height: 1rem;
   width: 1rem;
   margin: 0rem 1.1rem;
   border: 0rem;
 }
 
-.context-menu .update-subscription::before
-{
-  background-image: url(icons/reload.svg);
-}
-
-.context-menu .website::before
-{
-  background-image: url(icons/globe.svg);
-}
-
-.context-menu .source::before
-{
-  background-image: url(icons/code.svg);
-}
-
-.context-menu .delete::before
-{
-  background-image: url(icons/trash.svg?default#default);
-}
-
 /*
   Help tab content
 */
@@ -1292,30 +1356,6 @@
   text-decoration: none;
 }
 
-#social ul li a::before
-{
-  display: block;
-  margin: 0em auto;
-  width: 2.5rem;
-  height: 2.5rem;
-  content: "";
-}
-
-#twitter::before
-{
-  background-image: url("social/twitter.svg");
-}
-
-#facebook::before
-{
-  background-image: url("social/facebook.svg");
-}
-
-#google-plus::before
-{
-  background-image: url("social/googleplus.svg");
-}
-
 /*
   Dialog
 */
@@ -1365,34 +1405,12 @@
   font-weight: 700;
 }
 
-#dialog-close,
-#hide-notification,
-#hide-tracking-warning
+.close
 {
-  border: 0rem;
-  padding: 0rem;
   margin: 0rem;
-  background-color: transparent;
   cursor: pointer;
 }
 
-#dialog-close::before,
-#hide-notification::after,
-#hide-tracking-warning::after
-{
-  content: "";
-  display: block;
-  height: 1rem;
-  width: 1rem;
-  border: 0rem;
-  background-image: url(icons/delete.svg?primary#primary);
-}
-
-#dialog-close:hover::before
-{
-  background-image: url(icons/delete.svg?primary-hover#primary-hover);
-}
-
 #dialog #dialog-body
 {
   max-height: 60vh;
@@ -1415,7 +1433,7 @@
   text-align: center;
 }
 
-[data-dialog="about"] button
+[data-dialog="about"] .content button
 {
   margin: 1.5rem auto 1.8rem auto;
 }
@@ -1499,28 +1517,3 @@
   flex: 1;
   text-align: center;
 }
-
-#hide-notification
-{
-  margin: 0rem 1rem;
-}
-
-#hide-notification::after
-{
-  background-image: url(icons/delete.svg?secondary#secondary);
-}
-
-#hide-tracking-warning::after
-{
-  background-image: url(icons/delete.svg?tertiary#tertiary);
-}
-
-#hide-notification:hover::after
-{
-  background-image: url(icons/delete.svg?secondary-hover#secondary-hover);
-}
-
-#hide-tracking-warning:hover::after
-{
-  background-image: url(icons/delete.svg?tertiary-hover#tertiary-hover);
-}