GTK+-3.20 Submarine themes: adjust check and radio buttons

6 files changed, 98 insertions, 57 deletions

diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked-prelight.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked-prelight.svg
index 91b8c7ad..59eb2174 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked-prelight.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked-prelight.svg
@@ -13,8 +13,8 @@
    height="12"
    id="svg26761"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="checkbox-menuitem-checked.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="checkbox-menuitem-checked-prelight.svg">
   <defs
      id="defs26763" />
   <sodipodi:namedview
@@ -25,8 +25,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.197802"
-     inkscape:cx="-7.3168318"
-     inkscape:cy="8"
+     inkscape:cx="6.4588022"
+     inkscape:cy="6.2267269"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -52,7 +52,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -64,7 +64,7 @@
     <path
        sodipodi:nodetypes="ccc"
        d="M 1,10.285715 3.9948567,13.5 11,6"
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       style="fill:none;stroke:#7cbea7;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
        id="path6301-5"
        inkscape:connector-curvature="0" />
   </g>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-prelight.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-prelight.svg
index 063024cd..8500ebdc 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-prelight.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-prelight.svg
@@ -13,8 +13,8 @@
    height="12"
    id="svg26761"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="checkbox-menuitem-mixed-insensitive.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="checkbox-menuitem-mixed-prelight.svg">
   <defs
      id="defs26763" />
   <sodipodi:namedview
@@ -25,8 +25,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.197802"
-     inkscape:cx="-4.9680489"
-     inkscape:cy="8"
+     inkscape:cx="5.8156484"
+     inkscape:cy="7.909901"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -52,7 +52,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -62,7 +62,7 @@
      inkscape:groupmode="layer"
      transform="translate(0,-4)">
     <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1"
+       style="color:#000000;fill:#7cbea7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1"
        id="rect5494"
        width="12"
        height="2"
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-prelight.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-prelight.svg
index bb028c73..8d8a47eb 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-prelight.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-prelight.svg
@@ -13,8 +13,8 @@
    height="12"
    id="svg27352"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="radio-menuitem-checked.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="radio-menuitem-checked-prelight.svg">
   <defs
      id="defs27354" />
   <sodipodi:namedview
@@ -25,8 +25,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.197802"
-     inkscape:cx="-14.479703"
-     inkscape:cy="8"
+     inkscape:cx="5.0879827"
+     inkscape:cy="7.909901"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -52,7 +52,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -63,13 +63,13 @@
      transform="translate(0,-4)">
     <path
        sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#7cbea7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="path5784-4"
        sodipodi:cx="660.96808"
        sodipodi:cy="255.0668"
        sodipodi:rx="4.5078058"
        sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
+       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 0 1 -4.5078,7.29379 4.5078058,7.2937827 0 0 1 -4.50781,-7.29379 4.5078058,7.2937827 0 0 1 4.50781,-7.29378 4.5078058,7.2937827 0 0 1 4.5078,7.29378 z"
        transform="matrix(0.77643096,0,0,0.47986074,-507.19608,-112.89654)" />
   </g>
 </svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed-prelight.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed-prelight.svg
index 2c2ad1ad..d8481a40 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed-prelight.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed-prelight.svg
@@ -13,8 +13,8 @@
    height="12"
    id="svg27352"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="radio-menuitem-mixed.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="radio-menuitem-mixed-prelight.svg">
   <defs
      id="defs27354" />
   <sodipodi:namedview
@@ -25,8 +25,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.197802"
-     inkscape:cx="-20.936881"
-     inkscape:cy="8"
+     inkscape:cx="5.523882"
+     inkscape:cy="7.909901"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -52,7 +52,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -62,7 +62,7 @@
      inkscape:groupmode="layer"
      transform="translate(0,-4)">
     <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#7cbea7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect5494"
        width="6"
        height="2"
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css
index 81b5a417..5909715c 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css
@@ -3,6 +3,7 @@
  *************************/
 
 check,
+.check,
 .view.check,
 .view.cell check,
 check row:selected,
@@ -11,6 +12,7 @@ check row:selected:focus {
 }
 
 check:disabled,
+.check:disabled,
 .view.check:disabled,
 check row:selected:disabled,
 check row:selected:focus:disabled {
@@ -19,6 +21,7 @@ check row:selected:focus:disabled {
 }
 
 check:checked,
+.check:checked,
 .view.check:checked,
 check row:selected:checked,
 check row:selected:focus:checked {
@@ -27,6 +30,7 @@ check row:selected:focus:checked {
 }
 
 check:checked:disabled,
+.check:checked:disabled,
 .view.check:checked:disabled,
 check row:selected:checked:disabled,
 check row:selected:focus:checked:disabled {
@@ -35,6 +39,7 @@ check row:selected:focus:checked:disabled {
 }
 
 check:indeterminate,
+.check:indeterminate,
 .view.check:indeterminate,
 check row:selected:indeterminate,
 check row:selected:focus:indeterminate {
@@ -43,6 +48,7 @@ check row:selected:focus:indeterminate {
 }
 
 check:indeterminate:disabled,
+.check:indeterminate:disabled,
 .view.check:indeterminate:disabled,
 check row:selected:indeterminate:disabled,
 check row:selected:focus:indeterminate:disabled {
@@ -51,6 +57,7 @@ check row:selected:focus:indeterminate:disabled {
 }
 
 radio,
+.radio,
 .view.radio,
 .view.cell radio,
 radio row:selected,
@@ -59,6 +66,7 @@ radio row:selected:focus {
 }
 
 radio:disabled,
+.radio:disabled,
 .view.radio:disabled,
 radio row:selected:disabled,
 radio row:selected:focus:disabled {
@@ -66,6 +74,7 @@ radio row:selected:focus:disabled {
 }
 
 radio:checked,
+.radio:checked,
 .view.radio:checked,
 .view.cell radio:checked,
 radio row:selected:checked,
@@ -74,6 +83,7 @@ radio row:selected:focus:checked {
 }
 
 radio:checked:disabled,
+.radio:checked:disabled,
 .view.radio:checked:disabled,
 radio row:selected:checked:disabled,
 radio row:selected:focus:checked:disabled {
@@ -81,6 +91,7 @@ radio row:selected:focus:checked:disabled {
 }
 
 radio:indeterminate,
+.radio:indeterminate,
 .view.radio:indeterminate,
 radio row:selected:indeterminate,
 radio row:selected:focus:indeterminate {
@@ -89,6 +100,7 @@ radio row:selected:focus:indeterminate {
 }
 
 radio:indeterminate,
+.radio:indeterminate,
 .view.radio:indeterminate,
 radio row:selected:indeterminate,
 radio row:selected:focus:indeterminate {
@@ -96,27 +108,26 @@ radio row:selected:focus:indeterminate {
     background-color: transparent;
 }
 
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
+.sidebar radio:checked,
+.sidebar radio:checked:focus,
+.sidebar radio:checked:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
 }
 
-.sidebar .view.radio:hover {
+.sidebar radio:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
 }
 
-.sidebar .view.radio:selected:checked,
-.sidebar .view.radio:selected:checked:focus {
+.sidebar radio:selected:checked,
+.sidebar radio:selected:checked:focus {
     -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
 }
 
-.sidebar .view.radio:selected:hover,
-.sidebar .view.radio:selected:focus {
+.sidebar radio:selected:hover,
+.sidebar radio:selected:focus {
     -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected-prelight.svg"));
 }
 
-
 /* Now draw menu check and radio items */
 
 menuitem radio:hover,
@@ -129,59 +140,73 @@ menuitem check:disabled {
     border-image: none;
 }
 
-menuitem radio {
+menuitem radio,
+menuitem .radio {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-unselected.svg"));
 }
 
-menuitem radio:checked {
+menuitem radio:checked,
+menuitem .radio:checked {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked.svg"));
 }
 
-menuitem radio:checked:hover {
+menuitem radio:checked:hover,
+menuitem .radio:checked:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-prelight.svg"));
 }
 
-menuitem radio:checked:disabled {
+menuitem radio:checked:disabled,
+menuitem .radio:checked:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-insensitive.svg"));
 }
 
-menuitem radio:indeterminate {
+menuitem radio:indeterminate,
+menuitem .radio:indeterminate {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed.svg"));
 }
 
-menuitem radio:indeterminate:hover {
+menuitem radio:indeterminate:hover,
+menuitem .radio:indeterminate:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-prelight.svg"));
 }
 
-menuitem radio:indeterminate:disabled {
+menuitem radio:indeterminate:disabled,
+menuitem .radio:indeterminate:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-insensitive.svg"));
 }
 
-menuitem check {
+menuitem check,
+menuitem .check {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-unchecked.svg"));
 }
 
-menuitem check:checked{
+menuitem check:checked,
+menuitem .check:checked{
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked.svg"));
 }
 
-menuitem check:checked:hover {
+menuitem check:checked:hover,
+menuitem .check:checked:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-prelight.svg"));
 }
 
-menuitem check:checked:disabled {
+menuitem check:checked:disabled,
+menuitem .check:checked:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-insensitive.svg"));
 }
 
-menuitem check:indeterminate {
+menuitem check:indeterminate,
+menuitem .check:indeterminate {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed.svg"));
 }
 
-menuitem check:indeterminate:hover {
+menuitem check:indeterminate:hover,
+menuitem .check:indeterminate:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-prelight.svg"));
 }
 
-menuitem check:indeterminate:disabled {
+menuitem check:indeterminate:disabled,
+menuitem .check:indeterminate:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-insensitive.svg"));
 }
 
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/menu.css b/desktop-themes/Green-Submarine/gtk-3.0/menu.css
index 1d12a279..6f07a2e6 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/menu.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/menu.css
@@ -80,11 +80,13 @@ menubar > menuitem,
     min-height: 18px;
 }
 
+/* for firefox */
+menubar:hover,
 menubar > menuitem:hover,
 .menubar > menuitem:hover {
     background-color: shade (@theme_bg_dark_color, 1.2);
     border-radius: 6px;
-    color: shade (@theme_selected_bg_color, 1.6);
+    color: shade (@theme_selected_bg_color, 1.2);
     text-shadow: none;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
@@ -117,7 +119,7 @@ menu > menuitem,
 /* fixes for firefox menus */
 menuitem:hover,
 menuitem label:hover {
-    color: shade (@theme_selected_bg_color, 1.6);
+    color: shade (@theme_selected_bg_color, 1.2);
     text-shadow: none;
 }
 
@@ -130,7 +132,7 @@ menu > menuitem:hover,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
                                      to   (shade(@menu_bg_dark_color, 1.17)));
-    color: shade (@theme_selected_bg_color, 1.6);
+    color: shade (@theme_selected_bg_color, 1.2);
     text-shadow: none;
     border-radius: 6px;
     border-width: 1px;
@@ -345,12 +347,22 @@ menuitem check:checked,
 menuitem radio:checked,
 menuitem check:disabled,
 menuitem radio:disabled,
-menuitem check:active:disabled,
-menuitem radio:active:disabled,
 menuitem check:checked:disabled,
 menuitem radio:checked:disabled,
 menuitem check:indeterminate:disabled,
-menuitem radio:indeterminate:disabled {
+menuitem radio:indeterminate:disabled,
+menuitem .check,
+menuitem .radio,
+menuitem .check:hover,
+menuitem .radio:hover,
+menuitem .check:checked,
+menuitem .radio:checked,
+menuitem .check:disabled,
+menuitem .radio:disabled,
+menuitem .check:checked:disabled,
+menuitem .radio:checked:disabled,
+menuitem .check:indeterminate:disabled,
+menuitem .radio:indeterminate:disabled {
     border-width: 0px;
     border-style: none;
     background-image: none;
@@ -363,12 +375,16 @@ menuitem radio:indeterminate:disabled {
 
 menuitem check:disabled,
 menuitem radio:disabled,
-menuitem check:active:disabled,
-menuitem radio:active:disabled,
 menuitem check:checked:disabled,
 menuitem radio:checked:disabled,
 menuitem check:indeterminate:disabled,
-menuitem radio:indeterminate:disabled {
+menuitem radio:indeterminate:disabled,
+menuitem .check:disabled,
+menuitem .radio:disabled,
+menuitem .check:checked:disabled,
+menuitem .radio:checked:disabled,
+menuitem .check:indeterminate:disabled,
+menuitem .radio:indeterminate:disabled {
     color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.6);
     text-shadow: none;
 }