GreenLaguna GTK3: adjust buttons

6 files changed, 268 insertions, 42 deletions

diff --git a/desktop-themes/GreenLaguna/gtk-3.0/assets/button-active-border.svg b/desktop-themes/GreenLaguna/gtk-3.0/assets/button-active-border.svg
index eda77928..39079036 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/assets/button-active-border.svg
+++ b/desktop-themes/GreenLaguna/gtk-3.0/assets/button-active-border.svg
@@ -14,7 +14,7 @@
    height="16px"
    id="svg33222"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="button-active-border.svg">
   <defs
      id="defs33224">
@@ -42,6 +42,53 @@
        x2="2.9802322e-08"
        y2="2.9802322e-08"
        gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Colorize"
+       id="filter3755">
+      <feComposite
+         in2="SourceGraphic"
+         operator="arithmetic"
+         k1="0"
+         k2="1"
+         result="composite1"
+         id="feComposite3757" />
+      <feColorMatrix
+         in="composite1"
+         values="1"
+         type="saturate"
+         result="colormatrix1"
+         id="feColorMatrix3759" />
+      <feFlood
+         flood-opacity="0.447059"
+         flood-color="rgb(0,158,87)"
+         result="flood1"
+         id="feFlood3761" />
+      <feBlend
+         in="flood1"
+         in2="colormatrix1"
+         mode="multiply"
+         result="blend1"
+         id="feBlend3763" />
+      <feBlend
+         in2="blend1"
+         mode="screen"
+         result="blend2"
+         id="feBlend3765" />
+      <feColorMatrix
+         in="blend2"
+         values="1"
+         type="saturate"
+         result="colormatrix2"
+         id="feColorMatrix3767" />
+      <feComposite
+         in="colormatrix2"
+         in2="SourceGraphic"
+         operator="in"
+         k2="1"
+         result="composite2"
+         id="feComposite3769" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -50,17 +97,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.086455"
-     inkscape:cx="-3.7298819"
-     inkscape:cy="8.7791051"
+     inkscape:zoom="17.298058"
+     inkscape:cx="7.6521559"
+     inkscape:cy="8.6760192"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="848"
-     inkscape:window-height="689"
-     inkscape:window-x="532"
-     inkscape:window-y="316"
+     inkscape:window-width="484"
+     inkscape:window-height="655"
+     inkscape:window-x="1432"
+     inkscape:window-y="36"
      inkscape:window-maximized="0"
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true" />
@@ -88,6 +135,6 @@
        height="15"
        width="15"
        id="rect17861"
-       style="color:#000000;fill:none;stroke:url(#linearGradient3766);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:none;stroke:url(#linearGradient3766);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter3755)" />
   </g>
 </svg>
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/assets/button-border.svg b/desktop-themes/GreenLaguna/gtk-3.0/assets/button-border.svg
index 118d12f3..d71cfcdc 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/assets/button-border.svg
+++ b/desktop-themes/GreenLaguna/gtk-3.0/assets/button-border.svg
@@ -14,7 +14,7 @@
    height="16px"
    id="svg33222"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="button-border.svg">
   <defs
      id="defs33224">
@@ -42,6 +42,53 @@
        x2="2.9802322e-08"
        y2="2.9802322e-08"
        gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Colorize"
+       id="filter3387">
+      <feComposite
+         in2="SourceGraphic"
+         operator="arithmetic"
+         k1="0"
+         k2="1"
+         result="composite1"
+         id="feComposite3389" />
+      <feColorMatrix
+         in="composite1"
+         values="1"
+         type="saturate"
+         result="colormatrix1"
+         id="feColorMatrix3391" />
+      <feFlood
+         flood-opacity="0.447059"
+         flood-color="rgb(0,159,87)"
+         result="flood1"
+         id="feFlood3393" />
+      <feBlend
+         in="flood1"
+         in2="colormatrix1"
+         mode="multiply"
+         result="blend1"
+         id="feBlend3395" />
+      <feBlend
+         in2="blend1"
+         mode="screen"
+         result="blend2"
+         id="feBlend3397" />
+      <feColorMatrix
+         in="blend2"
+         values="1"
+         type="saturate"
+         result="colormatrix2"
+         id="feColorMatrix3399" />
+      <feComposite
+         in="colormatrix2"
+         in2="SourceGraphic"
+         operator="in"
+         k2="1"
+         result="composite2"
+         id="feComposite3401" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -50,17 +97,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="5.9495018"
-     inkscape:cy="4.7426064"
+     inkscape:zoom="17.092403"
+     inkscape:cx="8.1510305"
+     inkscape:cy="7.1990728"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="860"
-     inkscape:window-height="732"
-     inkscape:window-x="702"
-     inkscape:window-y="221"
+     inkscape:window-width="477"
+     inkscape:window-height="658"
+     inkscape:window-x="501"
+     inkscape:window-y="40"
      inkscape:window-maximized="0"
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true" />
@@ -88,6 +135,6 @@
        height="15"
        width="15"
        id="rect17861"
-       style="color:#000000;fill:none;stroke:url(#linearGradient3766);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:none;stroke:url(#linearGradient3766);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter3387)" />
   </g>
 </svg>
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/assets/button-default-active-border.svg b/desktop-themes/GreenLaguna/gtk-3.0/assets/button-default-active-border.svg
index 873160c4..3f02a37b 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/assets/button-default-active-border.svg
+++ b/desktop-themes/GreenLaguna/gtk-3.0/assets/button-default-active-border.svg
@@ -14,7 +14,7 @@
    height="16px"
    id="svg33222"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="button-default-active-border.svg">
   <defs
      id="defs33224">
@@ -38,6 +38,53 @@
        x2="2.9802322e-08"
        y2="2.9802322e-08"
        gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Colorize"
+       id="filter3914">
+      <feComposite
+         in2="SourceGraphic"
+         operator="arithmetic"
+         k1="0"
+         k2="1"
+         result="composite1"
+         id="feComposite3916" />
+      <feColorMatrix
+         in="composite1"
+         values="1"
+         type="saturate"
+         result="colormatrix1"
+         id="feColorMatrix3918" />
+      <feFlood
+         flood-opacity="0.521569"
+         flood-color="rgb(0,159,87)"
+         result="flood1"
+         id="feFlood3920" />
+      <feBlend
+         in="flood1"
+         in2="colormatrix1"
+         mode="multiply"
+         result="blend1"
+         id="feBlend3922" />
+      <feBlend
+         in2="blend1"
+         mode="screen"
+         result="blend2"
+         id="feBlend3924" />
+      <feColorMatrix
+         in="blend2"
+         values="1"
+         type="saturate"
+         result="colormatrix2"
+         id="feColorMatrix3926" />
+      <feComposite
+         in="colormatrix2"
+         in2="SourceGraphic"
+         operator="in"
+         k2="1"
+         result="composite2"
+         id="feComposite3928" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -46,17 +93,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.678616"
-     inkscape:cx="5.9367863"
-     inkscape:cy="8.7791051"
+     inkscape:zoom="19.661755"
+     inkscape:cx="8"
+     inkscape:cy="8"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="685"
-     inkscape:window-height="565"
-     inkscape:window-x="540"
-     inkscape:window-y="288"
+     inkscape:window-width="502"
+     inkscape:window-height="562"
+     inkscape:window-x="926"
+     inkscape:window-y="40"
      inkscape:window-maximized="0"
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true" />
@@ -84,6 +131,6 @@
        height="15"
        width="15"
        id="rect17861"
-       style="color:#000000;fill:none;stroke:url(#linearGradient3766);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:none;stroke:url(#linearGradient3766);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter3914)" />
   </g>
 </svg>
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/assets/button-default-border.svg b/desktop-themes/GreenLaguna/gtk-3.0/assets/button-default-border.svg
index c63e5b55..1d62a1a0 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/assets/button-default-border.svg
+++ b/desktop-themes/GreenLaguna/gtk-3.0/assets/button-default-border.svg
@@ -14,7 +14,7 @@
    height="16px"
    id="svg33222"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="button-default-border.svg">
   <defs
      id="defs33224">
@@ -38,6 +38,53 @@
        x2="2.9802322e-08"
        y2="2.9802322e-08"
        gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Colorize"
+       id="filter3418">
+      <feComposite
+         in2="SourceGraphic"
+         operator="arithmetic"
+         k1="0"
+         k2="1"
+         result="composite1"
+         id="feComposite3420" />
+      <feColorMatrix
+         in="composite1"
+         values="1"
+         type="saturate"
+         result="colormatrix1"
+         id="feColorMatrix3422" />
+      <feFlood
+         flood-opacity="0.521569"
+         flood-color="rgb(0,159,87)"
+         result="flood1"
+         id="feFlood3424" />
+      <feBlend
+         in="flood1"
+         in2="colormatrix1"
+         mode="multiply"
+         result="blend1"
+         id="feBlend3426" />
+      <feBlend
+         in2="blend1"
+         mode="screen"
+         result="blend2"
+         id="feBlend3428" />
+      <feColorMatrix
+         in="blend2"
+         values="1"
+         type="saturate"
+         result="colormatrix2"
+         id="feColorMatrix3430" />
+      <feComposite
+         in="colormatrix2"
+         in2="SourceGraphic"
+         operator="in"
+         k2="1"
+         result="composite2"
+         id="feComposite3432" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -46,17 +93,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.172911"
+     inkscape:zoom="16.991666"
      inkscape:cx="7.6412569"
-     inkscape:cy="8.7791051"
+     inkscape:cy="8.745943"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="772"
-     inkscape:window-height="672"
-     inkscape:window-x="410"
-     inkscape:window-y="193"
+     inkscape:window-width="477"
+     inkscape:window-height="644"
+     inkscape:window-x="20"
+     inkscape:window-y="33"
      inkscape:window-maximized="0"
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true" />
@@ -84,6 +131,6 @@
        height="15"
        width="15"
        id="rect17861"
-       style="color:#000000;fill:none;stroke:url(#linearGradient3766);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:none;stroke:url(#linearGradient3766);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter3418)" />
   </g>
 </svg>
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
index 87022687..d8db9838 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
@@ -65,6 +65,7 @@ GtkScale.scale-has-marks-above.slider.vertical:insensitive {
 	border-image: url("assets/button-border.svg") 3 / 3px stretch;
 }
 
+.button:hover,
 .button:active,
 .button:hover:active {
 	border-image: url("assets/button-active-border.svg") 3 / 3px stretch;
@@ -74,27 +75,64 @@ GtkScale.scale-has-marks-above.slider.vertical:insensitive {
 	border-image: url("assets/button-default-border.svg") 3 / 3px stretch;
 }
 
+.button.default:hover,
 .button.default:active {
 	border-image: url("assets/button-default-active-border.svg") 3 / 3px stretch;
 }
 
-.toolbar .button:hover,
-.primary-toolbar .button:hover,
-.primary-toolbar .toolbar .button:hover,
-.primary-toolbar.toolbar .button:hover,
 .toolbar .button:active,
 .primary-toolbar .button:active,
 .primary-toolbar .toolbar .button:active,
 .primary-toolbar.toolbar .button:active,
 .toolbar GtkComboBox .button,
 .primary-toolbar .toolbar GtkComboBox .button,
+.primary-toolbar.toolbar GtkComboBox .button/*,
 .toolbar .button:active:hover,
 .primary-toolbar .toolbar .button:active:hover,
-.primary-toolbar.toolbar .button:active:hover,
-.primary-toolbar .toolbar GtkComboBox .button:hover {
+.primary-toolbar.toolbar .button:active:hover */ {
 	border-image: url("assets/toolbar-button-border.svg") 3 / 3px stretch;
 }
 
+.toolbar .button:hover,
+.primary-toolbar .button:hover,
+.primary-toolbar .toolbar .button:hover,
+.primary-toolbar.toolbar .button:hover,
+.primary-toolbar .toolbar GtkComboBox .button:hover,
+.primary-toolbar.toolbar GtkComboBox .button:hover,
+.titlebar .titlebutton:hover,
+.header-bar.frame.titlebar .button.image-button.titlebutton:hover,
+.button.text-button.titlebutton:hover,
+.toolbar .button:active:hover,
+.primary-toolbar .toolbar .button:active:hover,
+.primary-toolbar.toolbar .button:active:hover,
+.toolbar .button:hover:first-child,
+.primary-toolbar .button:hover:first-child,
+.primary-toolbar .toolbar .button:hover:first-child,
+.primary-toolbar.toolbar .button:hover:first-child,
+.titlebar .titlebutton:hover:first-child,
+.header-bar.frame.titlebar .button.image-button.titlebutton:hover:first-child,
+.button.text-button.titlebutton:hover:first-child,
+.toolbar .button:active:hover:first-child,
+.primary-toolbar .toolbar .button:active:hover:first-child,
+.primary-toolbar.toolbar .button:active:hover:first-child,
+.toolbar .button:hover:last-child,
+.primary-toolbar .button:hover:last-child,
+.primary-toolbar .toolbar .button:hover:last-child,
+.primary-toolbar.toolbar .button:hover:last-child,
+.titlebar .titlebutton:hover:last-child,
+.header-bar.frame.titlebar .button.image-button.titlebutton:hover:last-child,
+.button.text-button.titlebutton:hover:last-child,
+.toolbar .button:active:hover:last-child,
+.primary-toolbar .toolbar .button:active:hover:last-child,
+.primary-toolbar.toolbar .button:active:hover:last-child {
+	border-image: url("assets/button-active-border.svg") 3 / 3px stretch;
+}
+
+/* overrride for osd */
+.osd.toolbar .button:hover {
+	border-image: none;
+}
+
 GtkSwitch.trough:active {
 	border-image: url("assets/switch-trough-border-active.svg") 3 / 3px stretch;
 }
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index 7347dc23..0c68054d 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -919,7 +919,7 @@ GtkTreeMenu .menuitem * {
 
 /* ie. mate-control-center */
 .button.flat {
-    transition: all 400ms ease-out;
+    transition: all 800ms ease-out;
     padding: 0px;
     border-color: transparent;
     background-color: transparent;