From cb981f0fd5588c224f3b97ae3ad8a01a96034069 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Fri, 17 Apr 2015 17:10:11 +0200 Subject: GreenLaguna GTK3: adjust buttons --- .../gtk-3.0/assets/button-active-border.svg | 65 +++++++++++++++++++--- .../GreenLaguna/gtk-3.0/assets/button-border.svg | 65 +++++++++++++++++++--- .../assets/button-default-active-border.svg | 65 +++++++++++++++++++--- .../gtk-3.0/assets/button-default-border.svg | 63 ++++++++++++++++++--- .../GreenLaguna/gtk-3.0/gtk-widgets-assets.css | 50 +++++++++++++++-- desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css | 2 +- 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"> @@ -42,6 +42,53 @@ x2="2.9802322e-08" y2="2.9802322e-08" gradientUnits="userSpaceOnUse" /> + + + + + + + + + @@ -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)" /> 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"> @@ -42,6 +42,53 @@ x2="2.9802322e-08" y2="2.9802322e-08" gradientUnits="userSpaceOnUse" /> + + + + + + + + + @@ -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)" /> 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"> @@ -38,6 +38,53 @@ x2="2.9802322e-08" y2="2.9802322e-08" gradientUnits="userSpaceOnUse" /> + + + + + + + + + @@ -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)" /> 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"> @@ -38,6 +38,53 @@ x2="2.9802322e-08" y2="2.9802322e-08" gradientUnits="userSpaceOnUse" /> + + + + + + + + + @@ -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)" /> 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 c502a7ee..5eecfa2c 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 9625382b..ccb84b09 100644 --- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css @@ -890,7 +890,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; -- cgit v1.2.1