Issue 5990 - Fix broken SVG icons in Chrome

skin/desktop-options.css

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 164 matching lines @@
   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?1#off);

[Thomas Greiner, 2017/11/20 17:39:06]

Rather than using arbitrary numbers which could mistakenly be duplicated and
thereby break it again, why not simply use the same ID?

i.e. icons/checkbox.svg?off#off

[saroyanm, 2017/11/20 18:42:25]

I agree, done.

+  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?2#on);
+  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?1#on);
+  background-image: url(icons/toggle.svg?on#on);
 }
 
 button[role="checkbox"][aria-checked="false"].toggle
 {
-  background-image: url(icons/toggle.svg?2#off);
+  background-image: url(icons/toggle.svg?off#off);
 }
 
 button[role="checkbox"][aria-checked="true"].toggle
 {
-  background-image: url(icons/toggle.svg?3#on);
+  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-image: none;
 }
 
 button.delete::before
 {
-  background-image: url(icons/trash.svg?1#default);
+  background-image: url(icons/trash.svg?default#default);
 }
 
 button.delete:hover::before
 {
-  background-image: url(icons/trash.svg?2#hover);
+  background-image: url(icons/trash.svg?hover#hover);
 }
 
 button.gear::before
 {
-  background-image: url(icons/gear.svg?1#default);
+  background-image: url(icons/gear.svg?default#default);
 }
 
 button.gear:hover::before
 {
-  background-image: url(icons/gear.svg?2#hover);
+  background-image: url(icons/gear.svg?hover#hover);
 }
 
 button.gear,
 button.delete
 {
   border: 0px;
   padding: 0px;
   background-color: transparent;
 }
 
@@ skipping 141 matching lines @@
 }
 
 [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?1#approved);
+  background-image: url(icons/checkmark.svg?approved#approved);
 }
 
 [data-validation] .floating-input input ~ .error-msg
 {
   margin-top: 0.5rem;
   color: #C11D27;
   display: block;
   visibility: hidden;
 }
 
@@ skipping 475 matching lines @@
 #dialog .table.list li button[aria-checked="true"]
 {
   color: #BBB;
 }
 
 #dialog .table.list li button[aria-checked="true"]::before
 {
   content: "";
   width: 1.3rem;
   height: 1.3rem;
-  background-image: url(icons/checkmark.svg?2#default);
+  background-image: url(icons/checkmark.svg?default#default);
   margin: 0rem;
 }
 
 #dialog .table.list li button .display
 {
   flex: none;
   margin: 0rem 0.8rem;
   text-transform: none;
   font-weight: 400;
 }
@@ skipping 307 matching lines @@
   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?3#default);
+  background-image: url(icons/trash.svg?default#default);
 }
 
 /*
   Help tab content
 */
 
 html:not([lang="zh"]) #social-chinese,
 html[lang="zh"] #social-general
 {
   display: none;
@@ skipping 103 matching lines @@
 }
 
 #dialog-close::before,
 #hide-notification::after
 {
   content: "";
   display: block;
   height: 1rem;
   width: 1rem;
   border: 0rem;
-  background-image: url(icons/delete.svg?1#primary);
+  background-image: url(icons/delete.svg?primary#primary);
 }
 
 #dialog-close:hover::before
 {
-  background-image: url(icons/delete.svg?2#primary-hover);
+  background-image: url(icons/delete.svg?primary-hover#primary-hover);
 }
 
 #dialog #dialog-body
 {
   max-height: 60vh;
   overflow: auto;
 }
 
 .dialog-content
 {
@@ skipping 96 matching lines @@
   text-align: center;
 }
 
 #hide-notification
 {
   margin: 0rem 1rem;
 }
 
 #hide-notification::after
 {
-  background-image: url(icons/delete.svg?3#secondary);
+  background-image: url(icons/delete.svg?secondary#secondary);
 }
 
 #hide-notification:hover::after
 {
-  background-image: url(icons/delete.svg?4#secondary-hover);
-}
+  background-image: url(icons/delete.svg?secondary-hover#secondary-hover);
+}