From 10510d838ed46d0af197c7f94cfc465f20f3f1d7 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 4 Jun 2016 15:06:20 +0200 Subject: GTK+-3.20 Menta themes: fix GtkScale API breakage with stable gtk+ --- desktop-themes/Menta/gtk-3.0/assets/Makefile.am | 6 +- .../Menta/gtk-3.0/assets/slider-hover.png | Bin 840 -> 0 bytes .../Menta/gtk-3.0/assets/slider-hover.svg | 1148 ++++++++++++++++++++ desktop-themes/Menta/gtk-3.0/assets/slider-ins.png | Bin 836 -> 0 bytes desktop-themes/Menta/gtk-3.0/assets/slider-ins.svg | 1148 ++++++++++++++++++++ desktop-themes/Menta/gtk-3.0/assets/slider.png | Bin 888 -> 0 bytes desktop-themes/Menta/gtk-3.0/assets/slider.svg | 1127 +++++++++++++++++++ .../Menta/gtk-3.0/gtk-widgets-assets.css | 66 +- desktop-themes/Menta/gtk-3.0/gtk-widgets.css | 35 +- 9 files changed, 3477 insertions(+), 53 deletions(-) delete mode 100644 desktop-themes/Menta/gtk-3.0/assets/slider-hover.png create mode 100644 desktop-themes/Menta/gtk-3.0/assets/slider-hover.svg delete mode 100644 desktop-themes/Menta/gtk-3.0/assets/slider-ins.png create mode 100644 desktop-themes/Menta/gtk-3.0/assets/slider-ins.svg delete mode 100644 desktop-themes/Menta/gtk-3.0/assets/slider.png create mode 100644 desktop-themes/Menta/gtk-3.0/assets/slider.svg (limited to 'desktop-themes/Menta') diff --git a/desktop-themes/Menta/gtk-3.0/assets/Makefile.am b/desktop-themes/Menta/gtk-3.0/assets/Makefile.am index 270742a2..9b971738 100644 --- a/desktop-themes/Menta/gtk-3.0/assets/Makefile.am +++ b/desktop-themes/Menta/gtk-3.0/assets/Makefile.am @@ -48,9 +48,9 @@ theme_DATA = \ sidebar-radio-prelight.svg \ sidebar-radio-selected-prelight.svg \ sidebar-radio-selected.svg \ - slider-hover.png \ - slider-ins.png \ - slider.png \ + slider-hover.svg \ + slider-ins.svg \ + slider.svg \ switch-off-ins.png \ switch-off-ins.svg \ switch-off.png \ diff --git a/desktop-themes/Menta/gtk-3.0/assets/slider-hover.png b/desktop-themes/Menta/gtk-3.0/assets/slider-hover.png deleted file mode 100644 index a24d60f6..00000000 Binary files a/desktop-themes/Menta/gtk-3.0/assets/slider-hover.png and /dev/null differ diff --git a/desktop-themes/Menta/gtk-3.0/assets/slider-hover.svg b/desktop-themes/Menta/gtk-3.0/assets/slider-hover.svg new file mode 100644 index 00000000..e3d2db90 --- /dev/null +++ b/desktop-themes/Menta/gtk-3.0/assets/slider-hover.svg @@ -0,0 +1,1148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/desktop-themes/Menta/gtk-3.0/assets/slider-ins.png b/desktop-themes/Menta/gtk-3.0/assets/slider-ins.png deleted file mode 100644 index f31f5c90..00000000 Binary files a/desktop-themes/Menta/gtk-3.0/assets/slider-ins.png and /dev/null differ diff --git a/desktop-themes/Menta/gtk-3.0/assets/slider-ins.svg b/desktop-themes/Menta/gtk-3.0/assets/slider-ins.svg new file mode 100644 index 00000000..41bf0127 --- /dev/null +++ b/desktop-themes/Menta/gtk-3.0/assets/slider-ins.svg @@ -0,0 +1,1148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/desktop-themes/Menta/gtk-3.0/assets/slider.png b/desktop-themes/Menta/gtk-3.0/assets/slider.png deleted file mode 100644 index 3fdda2c9..00000000 Binary files a/desktop-themes/Menta/gtk-3.0/assets/slider.png and /dev/null differ diff --git a/desktop-themes/Menta/gtk-3.0/assets/slider.svg b/desktop-themes/Menta/gtk-3.0/assets/slider.svg new file mode 100644 index 00000000..88ca1730 --- /dev/null +++ b/desktop-themes/Menta/gtk-3.0/assets/slider.svg @@ -0,0 +1,1127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css index 6451b88d..710774de 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css @@ -158,115 +158,111 @@ switch:checked:disabled { /********************* * GtkScale's slider * *********************/ + scale.horizontal contents:only-child > trough > slider, scale slider { - background-image: url("assets/slider.png"); + background-image: url("assets/slider.svg"); background-repeat: no-repeat; } scale slider:hover { - background-image: url("assets/slider-hover.png"); + background-image: url("assets/slider-hover.svg"); background-repeat: no-repeat; } scale slider:disabled, scale slider:disabled:hover { - background-image: url("assets/slider-ins.png"); + background-image: url("assets/slider-ins.svg"); background-repeat: no-repeat; } -scale.horizontal.scale-has-marks-above.color slider, -scale.horizontal.scale-has-marks-above slider { +scale.horizontal.color.marks-before slider, +scale.horizontal.marks-before slider { background-image: url("assets/scale-slider-marks-above-horizontal.png"); background-repeat: no-repeat; } -scale.horizontal.scale-has-marks-above.color slider:hover, -scale.horizontal.scale-has-marks-above slider:hover { +scale.horizontal.color.marks-before slider:hover, +scale.horizontal.marks-before slider:hover { background-image: url("assets/scale-slider-marks-above-horizontal-active.png"); background-repeat: no-repeat; } -scale.horizontal.scale-has-marks-above.color slider:active, -scale.horizontal.scale-has-marks-above.color slider:active:hover, -scale.horizontal.scale-has-marks-above slider:active, -scale.horizontal.scale-has-marks-above slider:active:hover { +scale.horizontal.color.marks-before slider:active, +scale.horizontal.color.marks-before slider:active:hover, +scale.horizontal.marks-before slider:active, +scale.horizontal.marks-before slider:active:hover { background-image: url("assets/scale-slider-marks-above-horizontal-active.png"); background-repeat: no-repeat; } -scale.horizontal.scale-has-marks-above.color slider:disabled, -scale.horizontal.scale-has-marks-above slider:disabled { +scale.horizontal.color.marks-before slider:disabled, +scale.horizontal.marks-before slider:disabled { background-image: url("assets/scale-slider-marks-above-horizontal-insensitive.png"); background-repeat: no-repeat; } -scale.vertical.scale-has-marks-above slider { +scale.vertical.marks-before slider { background-image: url("assets/scale-slider-marks-above-vertical.png"); background-repeat: no-repeat; } -scale.vertical.scale-has-marks-above slider:hover { +scale.vertical.marks-before slider:hover { background-image: url("assets/scale-slider-marks-above-vertical-active.png"); background-repeat: no-repeat; } -scale.vertical.scale-has-marks-above slider:active, -scale.vertical.scale-has-marks-above slider:active:hover { +scale.vertical.marks-before slider:active, +scale.vertical.marks-before slider:active:hover { background-image: url("assets/scale-slider-marks-above-vertical-active.png"); background-repeat: no-repeat; } -scale.vertical.scale-has-marks-above slider:disabled, -scale.vertical.scale-has-marks-above slider:disabled:hover { +scale.vertical.marks-before slider:disabled, +scale.vertical.marks-before slider:disabled:hover { background-image: url("assets/scale-slider-marks-above-vertical-insensitive.png"); background-repeat: no-repeat; } -scale.horizontal contents:first-child:not(:only-child) slider, -scale.horizontal.scale-has-marks-below slider { +scale.horizontal.marks-after slider { background-image: url("assets/scale-slider-marks-below-horizontal.png"); background-repeat: no-repeat; } -scale.horizontal contents:first-child:not(:only-child) slider:hover, -scale.horizontal.scale-has-marks-below slider:hover { +scale.horizontal.marks-after slider:hover { background-image: url("assets/scale-slider-marks-below-horizontal-active.png"); background-repeat: no-repeat; } -scale.horizontal contents:first-child:not(:only-child) slider:hover, -scale.horizontal contents:first-child:not(:only-child) slider:active:hover, -scale.horizontal.scale-has-marks-below slider:active, -scale.horizontal.scale-has-marks-below slider:active:hover { +scale.horizontal.marks-after slider:active, +scale.horizontal.marks-after slider:active:hover { background-image: url("assets/scale-slider-marks-below-horizontal-active.png"); background-repeat: no-repeat; } -scale.horizontal contents:first-child:not(:only-child) slider:disabled, -scale.horizontal.scale-has-marks-below slider:disabled:hover { +scale.horizontal.marks-after slider:disabled:hover { background-image: url("assets/scale-slider-marks-below-horizontal-active.png"); background-repeat: no-repeat; } -scale.vertical.scale-has-marks-below slider { +scale.vertical.marks-after slider { background-image: url("assets/scale-slider-marks-below-vertical.png"); background-repeat: no-repeat; } -scale.vertical.scale-has-marks-below slider:hover { +scale.vertical.marks-after slider:hover { background-image: url("assets/scale-slider-marks-below-vertical-active.png"); background-repeat: no-repeat; } -scale.vertical.scale-has-marks-below slider:active, -scale.vertical.scale-has-marks-below slider:active:hover { +scale.vertical.marks-after slider:active, +scale.vertical.marks-after slider:active:hover { background-image: url("assets/scale-slider-marks-below-vertical-active.png"); background-repeat: no-repeat; } -scale.vertical.scale-has-marks-below slider:disabled, -scale.vertical.scale-has-marks-below slider:disabled:hover { +scale.vertical.marks-after slider:disabled, +scale.vertical.marks-after slider:disabled:hover { background-image: url("assets/scale-slider-marks-below-vertical-insensitive.png"); background-repeat: no-repeat; } diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css index 87c6ef11..0b463129 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css @@ -1030,13 +1030,18 @@ scale slider:disabled { scale.vertical slider, scale.horizontal slider { - background-size: 100%; + background-size: 105%; background-repeat: no-repeat; background-position: center; min-width: 18px; margin: -9px 0px -9px 0px; } +scale.vertical slider:hover, +scale.horizontal slider:hover { + background-size: 110%; +} + scale.horizontal slider { min-width: 18px; margin: -9px 0px -9px 0px; @@ -1047,20 +1052,24 @@ scale.vertical slider { margin: 0px -9px 0px -9px; } -scale.horizontal.scale-has-marks-above.color, -scale.vertical.scale-has-marks-below.color { +scale.horizontal.marks-after slider { + min-height: 22px; +} + +scale.horizontal.color.marks-before, +scale.vertical.color.marks-after { margin: 0px 0px 0px 0px; padding: 0px; } -scale.scale-has-marks-above.color trough, -scale.scale-has-marks-below.color trough { +scale.horizontal.color.marks-before trough, +scale.vertical.color.marks-after trough { border-color: @scale_highlight_border; border-radius: 3px; background-repeat: no-repeat; } -scale.vertical.scale-has-marks-below.color slider { +scale.vertical.color.marks-after slider { min-height: 20px; min-width: 22px; padding: 0px; @@ -1070,11 +1079,7 @@ scale.vertical.scale-has-marks-below.color slider { margin: 0px 0px 0px 0px; } -scale.horizontal contents:first-child:not(:only-child) slider { - min-height: 22px; -} - -scale.horizontal.scale-has-marks-above.color slider { +scale.horizontal.color.marks-before slider { min-height: 14px; min-width: 20px; margin: 0px 0px 0px 0px; @@ -1084,13 +1089,13 @@ scale.horizontal.scale-has-marks-above.color slider { background-position: center; } -scale.horizontal.scale-has-marks-above.color slider:hover, -scale.vertical.scale-has-marks-below.color slider:hover { +scale.horizontal.color.marks-before slider:hover, +scale.vertical.color.marks-after slider:hover { background-size: 105%; } -scale.horizontal.scale-has-marks-above.color.fine-tune slider, -scale.vertical.scale-has-marks-below.color.fine-tune slider, +scale.horizontal.color.marks-before.fine-tune slider, +scale.vertical.color.marks-after.fine-tune slider, scale.vertical.fine-tune slider:active, scale.vertical.fine-tune slider:active:hover, scale.horizontal.fine-tune slider:active, -- cgit v1.2.1