[gimp] icons: force colors on some icons.

[Jehan <jehanp src gnome org>]

commit 5d5bbeb88b6519c434e7ad1653b1374cb06704ea
Author: Jehan <jehan girinstud io>
Date:   Sat Jun 23 11:47:19 2018 +0200

    icons: force colors on some icons.
    
    Sometimes even within symbolic icons, parts of the design must keep
    fixed colors, when they are semantic. For instance this is the case for
    the color-picker-(black|gray|white) icons or the gimp-default-colors.
    
    The trick used by GTK+ to recolor is by supplying an additional CSS
    style to icons which overrides inline CSS thanks to "! important"
    keyword. Our own trick to circumvent this trick is to set "!important"
    in inline CSS when one wishes not to have it overrided by the general
    colors.
    Right now I am doing the edit by hand with vim because Inkscape doesn't
    seem to validate this keyword if I add it manually in its XML editor. So
    what I did is add the "color-important" label on such object, and I will
    later modify my SVG export tool to add !important on such object "fill"
    values at export time.

 .../scalable/gimp-color-picker-black-symbolic.svg  |  2 +-
 .../scalable/gimp-color-picker-gray-symbolic.svg   |  2 +-
 .../scalable/gimp-color-picker-white-symbolic.svg  |  2 +-
 .../scalable/gimp-default-colors-symbolic.svg      |  4 +--
 icons/Symbolic/symbolic-scalable.svg               | 29 +++++++++++++---------
 5 files changed, 22 insertions(+), 17 deletions(-)
---
diff --git a/icons/Symbolic/scalable/gimp-color-picker-black-symbolic.svg 
b/icons/Symbolic/scalable/gimp-color-picker-black-symbolic.svg
index fd402952e3..a84df176c9 100644
--- a/icons/Symbolic/scalable/gimp-color-picker-black-symbolic.svg
+++ b/icons/Symbolic/scalable/gimp-color-picker-black-symbolic.svg
@@ -176,7 +176,7 @@
          height="6"
          width="6"
          id="rect13014-5-5"
-         style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5" />
+         style="display:inline;opacity:1;fill:#000000 
!important;fill-opacity:1;stroke:none;stroke-width:1.5" />
     </g>
   </g>
 </svg>
diff --git a/icons/Symbolic/scalable/gimp-color-picker-gray-symbolic.svg 
b/icons/Symbolic/scalable/gimp-color-picker-gray-symbolic.svg
index db2a67eb63..c578faa65c 100644
--- a/icons/Symbolic/scalable/gimp-color-picker-gray-symbolic.svg
+++ b/icons/Symbolic/scalable/gimp-color-picker-gray-symbolic.svg
@@ -176,7 +176,7 @@
          height="6"
          width="6"
          id="rect13014-5-9"
-         style="display:inline;opacity:1;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1.5" />
+         style="display:inline;opacity:1;fill:#7f7f7f 
!important;fill-opacity:1;stroke:none;stroke-width:1.5" />
     </g>
   </g>
 </svg>
diff --git a/icons/Symbolic/scalable/gimp-color-picker-white-symbolic.svg 
b/icons/Symbolic/scalable/gimp-color-picker-white-symbolic.svg
index b72654176b..84ebc7b78d 100644
--- a/icons/Symbolic/scalable/gimp-color-picker-white-symbolic.svg
+++ b/icons/Symbolic/scalable/gimp-color-picker-white-symbolic.svg
@@ -176,7 +176,7 @@
          height="6"
          width="6"
          id="rect13014-5"
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5" />
+         style="display:inline;opacity:1;fill:#ffffff 
!important;fill-opacity:1;stroke:none;stroke-width:1.5" />
     </g>
   </g>
 </svg>
diff --git a/icons/Symbolic/scalable/gimp-default-colors-symbolic.svg 
b/icons/Symbolic/scalable/gimp-default-colors-symbolic.svg
index 8cc4537e33..b00feeefc7 100644
--- a/icons/Symbolic/scalable/gimp-default-colors-symbolic.svg
+++ b/icons/Symbolic/scalable/gimp-default-colors-symbolic.svg
@@ -140,7 +140,7 @@
          x="5"
          y="1045.3622" />
       <rect
-         
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
 fill markers"
+         style="opacity:1;fill:#ffffff 
!important;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
 fill markers"
          id="rect9128-9"
          width="5"
          height="5"
@@ -154,7 +154,7 @@
          x="0"
          y="1040.3622" />
       <rect
-         
style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
 fill markers"
+         style="opacity:1;fill:#000000 
!important;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
 fill markers"
          id="rect9128-9-4"
          width="5"
          height="5"
diff --git a/icons/Symbolic/symbolic-scalable.svg b/icons/Symbolic/symbolic-scalable.svg
index 4db71e28cb..38e6962815 100644
--- a/icons/Symbolic/symbolic-scalable.svg
+++ b/icons/Symbolic/symbolic-scalable.svg
@@ -49,13 +49,13 @@
      inkscape:window-height="741"
      id="namedview88"
      showgrid="true"
-     inkscape:zoom="2.0000001"
-     inkscape:cx="171.91047"
-     inkscape:cy="181.10166"
+     inkscape:zoom="1.0000001"
+     inkscape:cx="1024.9098"
+     inkscape:cy="183.81292"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="tools"
+     inkscape:current-layer="stock"
      showborder="false"
      inkscape:snap-nodes="true"
      inkscape:snap-bbox="true"
@@ -31242,12 +31242,13 @@
          d="m 10,1046.3622 v 8 h 8 v -8 z m 1,1 h 6 v 6 h -6 z"
          style="fill:url(#linearGradient7875);fill-opacity:1;stroke:none;stroke-width:1.33517039" />
       <rect
-         style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5"
+         style="display:inline;opacity:1;fill:#000000 !important;fill-opacity:1;stroke:none;stroke-width:1.5"
          id="rect13014-5-5"
          width="6"
          height="6"
          x="11"
-         y="1047.3622" />
+         y="1047.3622"
+         inkscape:label="color-important" />
     </g>
     <g
        id="gimp-color-picker-white"
@@ -31285,12 +31286,13 @@
          d="m 10,1046.3622 v 8 h 8 v -8 z m 1,1 h 6 v 6 h -6 z"
          style="fill:url(#linearGradient7855);fill-opacity:1;stroke:none;stroke-width:1.33517039" />
       <rect
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5"
+         style="display:inline;opacity:1;fill:#ffffff !important;fill-opacity:1;stroke:none;stroke-width:1.5"
          id="rect13014-5"
          width="6"
          height="6"
          x="11"
-         y="1047.3622" />
+         y="1047.3622"
+         inkscape:label="color-important" />
     </g>
     <g
        id="gimp-color-picker-gray"
@@ -31328,12 +31330,13 @@
          d="m 10,1046.3622 v 8 h 8 v -8 z m 1,1 h 6 v 6 h -6 z"
          style="fill:url(#linearGradient7837);fill-opacity:1;stroke:none;stroke-width:1.33517039" />
       <rect
-         style="display:inline;opacity:1;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1.5"
+         style="display:inline;opacity:1;fill:#7f7f7f !important;fill-opacity:1;stroke:none;stroke-width:1.5"
          id="rect13014-5-9"
          width="6"
          height="6"
          x="11"
-         y="1047.3622" />
+         y="1047.3622"
+         inkscape:label="color-important" />
     </g>
     <g
        transform="matrix(0.75,0,0,0.75,474.40162,-356.10295)"
@@ -32622,7 +32625,8 @@
          height="5"
          width="5"
          id="rect9128-9"
-         
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
 fill markers" />
+         style="opacity:1;fill:#ffffff 
!important;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
 fill markers"
+         inkscape:label="color-important" />
       <rect
          y="1040.3622"
          x="0"
@@ -32636,7 +32640,8 @@
          height="5"
          width="5"
          id="rect9128-9-4"
-         
style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
 fill markers" />
+         style="opacity:1;fill:#000000 
!important;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
 fill markers"
+         inkscape:label="color-important" />
     </g>
     <rect
        
style="opacity:0;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.61777443;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
 fill markers"