From a742ecb610692f761511f22d0141f8fb730b08dd Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 16 Aug 2015 17:28:23 +0200 Subject: GTK3 submarine themes: fix GtkScale support --- .../Blue-Submarine/gtk-3.0/assets/Makefile.am | 18 + .../gtk-3.0/assets/scale-slider-hor-dark.svg | 482 +++++++++++++++++++++ .../gtk-3.0/assets/scale-slider-hor.svg | 346 +++++++++++++++ .../assets/scale-slider-horizontal-insensitive.svg | 195 +++++++++ .../gtk-3.0/assets/scale-slider-horizontal.svg | 132 ++++++ .../assets/scale-slider-insensitive-hor.svg | 240 ++++++++++ .../assets/scale-slider-insensitive-ver.svg | 209 +++++++++ ...e-slider-marks-above-horizontal-insensitive.svg | 234 ++++++++++ .../assets/scale-slider-marks-above-horizontal.svg | 253 +++++++++++ ...ale-slider-marks-above-vertical-insensitive.svg | 234 ++++++++++ .../assets/scale-slider-marks-above-vertical.svg | 253 +++++++++++ ...e-slider-marks-below-horizontal-insensitive.svg | 171 ++++++++ .../assets/scale-slider-marks-below-horizontal.svg | 150 +++++++ ...ale-slider-marks-below-vertical-insensitive.svg | 214 +++++++++ .../assets/scale-slider-marks-below-vertical.svg | 233 ++++++++++ .../gtk-3.0/assets/scale-slider-ver.svg | 315 ++++++++++++++ .../assets/scale-slider-vertical-insensitive.svg | 168 +++++++ .../gtk-3.0/assets/scale-slider-vertical.svg | 132 ++++++ .../Blue-Submarine/gtk-3.0/assets/scale-slider.svg | 303 +++++++++++++ .../Blue-Submarine/gtk-3.0/gtk-widgets.css | 299 +++++++------ desktop-themes/Blue-Submarine/gtk-3.0/gtk.css | 6 +- .../Green-Submarine/gtk-3.0/assets/Makefile.am | 18 + .../gtk-3.0/assets/scale-slider-hor-dark.svg | 482 +++++++++++++++++++++ .../gtk-3.0/assets/scale-slider-hor.svg | 346 +++++++++++++++ .../assets/scale-slider-horizontal-insensitive.svg | 195 +++++++++ .../gtk-3.0/assets/scale-slider-horizontal.svg | 132 ++++++ .../assets/scale-slider-insensitive-hor.svg | 240 ++++++++++ .../assets/scale-slider-insensitive-ver.svg | 209 +++++++++ ...e-slider-marks-above-horizontal-insensitive.svg | 234 ++++++++++ .../assets/scale-slider-marks-above-horizontal.svg | 253 +++++++++++ ...ale-slider-marks-above-vertical-insensitive.svg | 234 ++++++++++ .../assets/scale-slider-marks-above-vertical.svg | 253 +++++++++++ ...e-slider-marks-below-horizontal-insensitive.svg | 171 ++++++++ .../assets/scale-slider-marks-below-horizontal.svg | 150 +++++++ ...ale-slider-marks-below-vertical-insensitive.svg | 214 +++++++++ .../assets/scale-slider-marks-below-vertical.svg | 233 ++++++++++ .../gtk-3.0/assets/scale-slider-ver.svg | 315 ++++++++++++++ .../assets/scale-slider-vertical-insensitive.svg | 168 +++++++ .../gtk-3.0/assets/scale-slider-vertical.svg | 132 ++++++ .../gtk-3.0/assets/scale-slider.svg | 303 +++++++++++++ .../Green-Submarine/gtk-3.0/gtk-widgets.css | 300 +++++++------ desktop-themes/Green-Submarine/gtk-3.0/gtk.css | 6 +- 42 files changed, 8929 insertions(+), 246 deletions(-) create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-hor-dark.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-hor.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-horizontal-insensitive.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-horizontal.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-insensitive-hor.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-insensitive-ver.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-ver.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-vertical-insensitive.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-vertical.svg create mode 100644 desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-hor-dark.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-hor.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-horizontal-insensitive.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-horizontal.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-insensitive-hor.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-insensitive-ver.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-ver.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-vertical-insensitive.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-vertical.svg create mode 100644 desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider.svg diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/Makefile.am b/desktop-themes/Blue-Submarine/gtk-3.0/assets/Makefile.am index df8be232..7a51d0b5 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/assets/Makefile.am +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/Makefile.am @@ -29,6 +29,24 @@ theme_DATA = \ radio-normal-ins.png \ radio-normal.png \ resize-grip.svg \ + scale-slider-hor-dark.svg \ + scale-slider-horizontal-insensitive.svg \ + scale-slider-horizontal.svg \ + scale-slider-hor.svg \ + scale-slider-insensitive-hor.svg \ + scale-slider-insensitive-ver.svg \ + scale-slider-marks-above-horizontal-insensitive.svg \ + scale-slider-marks-above-horizontal.svg \ + scale-slider-marks-above-vertical-insensitive.svg \ + scale-slider-marks-above-vertical.svg \ + scale-slider-marks-below-horizontal-insensitive.svg \ + scale-slider-marks-below-horizontal.svg \ + scale-slider-marks-below-vertical-insensitive.svg \ + scale-slider-marks-below-vertical.svg \ + scale-slider.svg \ + scale-slider-ver.svg \ + scale-slider-vertical-insensitive.svg \ + scale-slider-vertical.svg \ sidebar-radio-checked.svg \ sidebar-radio-prelight.svg \ sidebar-radio-selected-prelight.svg \ diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-hor-dark.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-hor-dark.svg new file mode 100644 index 00000000..367e735f --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-hor-dark.svg @@ -0,0 +1,482 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-hor.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-hor.svg new file mode 100644 index 00000000..88a22e3f --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-hor.svg @@ -0,0 +1,346 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-horizontal-insensitive.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-horizontal-insensitive.svg new file mode 100644 index 00000000..c719830b --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-horizontal-insensitive.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-horizontal.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-horizontal.svg new file mode 100644 index 00000000..acba2b18 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-horizontal.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-insensitive-hor.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-insensitive-hor.svg new file mode 100644 index 00000000..d2969ec0 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-insensitive-hor.svg @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-insensitive-ver.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-insensitive-ver.svg new file mode 100644 index 00000000..4a873bca --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-insensitive-ver.svg @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.svg new file mode 100644 index 00000000..a1a81ea9 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.svg new file mode 100644 index 00000000..5bbcc7e8 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.svg new file mode 100644 index 00000000..a9f93cc9 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.svg new file mode 100644 index 00000000..59f371d5 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.svg new file mode 100644 index 00000000..8c66b5ad --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.svg new file mode 100644 index 00000000..e82ce44b --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.svg new file mode 100644 index 00000000..4b49ae7f --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.svg @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.svg new file mode 100644 index 00000000..8083e110 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.svg @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-ver.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-ver.svg new file mode 100644 index 00000000..566f260e --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-ver.svg @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-vertical-insensitive.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-vertical-insensitive.svg new file mode 100644 index 00000000..5bf0d7d4 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-vertical-insensitive.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-vertical.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-vertical.svg new file mode 100644 index 00000000..b3e82cc6 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-vertical.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider.svg b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider.svg new file mode 100644 index 00000000..dbb871cd --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider.svg @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css index 754d9c4c..e7e28124 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css @@ -315,8 +315,6 @@ GtkComboBox, } GtkComboBox.combobox-entry .button, -GtkScale.slider, -GtkScale.slider.vertical, .notebook .button, .inline-toolbar.toolbar .button { background-image: -gtk-gradient (linear, left top, left bottom, @@ -336,21 +334,7 @@ GtkScale.slider.vertical, -unico-inner-stroke-color: shade (@theme_bg_color, 1.9); } -GtkScale.slider, -GtkScale.slider.vertical { - -unico-outer-stroke-width: 1px; - -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (alpha (shade (@theme_bg_color, 0.05), 0.05)), - to (alpha (shade (@theme_bg_color, 0.05), 0.09))); - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@button_bg_color, 1.66)), - to (shade (@button_bg_color, 1.415))); - -unico-inner-stroke-width: 1px 1px 0 1px; -} - GtkComboBox.combobox-entry .button:hover, -GtkScale.slider:hover, -GtkScale.slider.vertical:hover, .notebook .button:hover, .inline-toolbar.toolbar .button:hover { background-image: -gtk-gradient (linear, left top, left bottom, @@ -1401,15 +1385,6 @@ DbusmenuGtkMenu .menuitem.radio:active, to (shade (@theme_bg_color, 1.1)));; } -.menubar .menuitem GtkScale.trough { - background-color: @theme_bg_color; - background-image: none; - - -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 1.15))); -} - Genericmenuitem .menuitem .accelerator, DbusmenuGtkMenu .menuitem .accelerator, .menubar .menuitem .accelerator, @@ -1545,18 +1520,189 @@ DbusmenuGtkMenu .menuitem .accelerator:insensitive, -unico-inner-stroke-width: 1px; } -/************************* - * progressbar and scale * - *************************/ -GtkScale, +/************ + * GtkScale * + ************/ + +.scale { + -GtkScale-slider-length: 14; + -GtkRange-slider-width: 14; + -GtkRange-trough-border: 1; + -GtkWidget-focus-line-width: 0; +} + +.scale.slider, +.scale.slider:hover, +.scale.slider:insensitive { + border-width: 1px; + border-radius: 8px; + border-style: none; + color: alpha(@theme_base_color, 0.0); + background-color: alpha(@theme_base_color, 0.0); + /* background-image in -assets variant */ +} + +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; +} + +.toolbar .scale.trough, +.scale.trough { + margin: 7px 0; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (alpha (#000, 0.20)), + color-stop (0.20, alpha (#000, 0.16)), + to (alpha (#000, 0.06))); + border-style: none; + border-width: 0px; + border-radius: 8px; + box-shadow: inset 1px 1px alpha(#000, 0.08), + inset -1px -1px alpha(#000, 0.08); +} + +.scale.trough.vertical { + margin: 0 7px; +} + +.scale.trough:insensitive { + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (alpha (#000, 0.03)), + to (alpha (#000, 0.03))); +} + +.scale.progressbar { + background-color: @scale_progress_fill; + border-width: 1px; + border-radius: 3px; + border-style: none; +} + +.scale:insensitive, +.vertical.scale:insensitive { + background-color: transparent; +} + +.scale.mark { + color: mix(@theme_bg_color, @theme_text_color, 0.56); +} + +.menubar .menuitem .scale.highlight.left, +.scale.highlight.left { + background-image: -gtk-gradient (linear, + left top, left bottom, + from (shade (@scale_fill, 0.90)), + to (shade (@scale_fill, 1.31))); + border-style: none; + border-width: 0px; + border-radius: 8px; + box-shadow: inset 1px 1px alpha(#000, 0.08), + inset -1px -1px alpha(#000, 0.08); + color: @theme_selected_fg_color; + text-shadow: none; +} + +.menubar .menuitem .scale.highlight.bottom, +.scale.highlight.bottom { + background-image: -gtk-gradient (linear, + left top, right top, + from (shade (@scale_fill, 0.90)), + to (shade (@scale_fill, 1.31))); + border-style: none; + border-width: 0px; + border-radius: 8px; + box-shadow: inset 1px 1px alpha(#000, 0.08), + inset -1px -1px alpha(#000, 0.08); + color: @theme_selected_fg_color; + text-shadow: none; +} + +.scale.highlight.left:insensitive { + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@theme_bg_color, 0.85)), + to (shade (@theme_bg_color, 0.85))); + box-shadow: inset 1px 1px alpha(#000, 0.02), + inset -1px -1px alpha(#000, 0.02); +} + +.scale.highlight.bottom:insensitive { + background-image: -gtk-gradient (linear, left top, right top, + from (shade (@theme_bg_color, 0.85)), + to (shade (@theme_bg_color, 0.85))); + box-shadow: inset 1px 1px alpha(#000, 0.02), + inset -1px -1px alpha(#000, 0.02); +} + +GtkScale.slider, +GtkScale.slider.horizontal, +GtkScale.slider.horizontal:hover { + background-image: url("assets/scale-slider-hor.svg"); +} + +GtkScale.slider:insensitive, +GtkScale.slider.horizontal:insensitive { + background-image: url("assets/scale-slider-insensitive-hor.svg"); +} + +GtkScale.slider.vertical { + background-image: url("assets/scale-slider-ver.svg"); +} + +GtkScale.slider.vertical:insensitive { + background-image: url("assets/scale-slider-insensitive-ver.svg"); +} + +GtkScale.scale-has-marks-above.slider.horizontal, +GtkScale.scale-has-marks-above.slider.horizontal:hover { + background-image: url("assets/scale-slider-marks-above-horizontal.svg"); +} + +GtkScale.scale-has-marks-above.slider.horizontal:insensitive { + background-image: url("assets/scale-slider-marks-above-horizontal-insensitive.svg"); +} + +GtkScale.scale-has-marks-above.slider.vertical { + background-image: url("assets/scale-slider-marks-above-vertical.svg"); +} + +GtkScale.scale-has-marks-above.slider.vertical:insensitive { + background-image: url("assets/scale-slider-marks-above-vertical-insensitive.svg"); +} + +GtkScale.scale-has-marks-below.slider.horizontal, +GtkScale.scale-has-marks-below.slider.horizontal:hover { + background-image: url("assets/scale-slider-marks-below-horizontal.svg"); +} + +GtkScale.scale-has-marks-below.slider.horizontal:insensitive { + background-image: url("assets/scale-slider-marks-below-horizontal-insensitive.svg"); +} + +GtkScale.scale-has-marks-below.slider.vertical { + background-image: url("assets/scale-slider-marks-below-vertical.svg"); +} + +GtkScale.scale-has-marks-below.slider.vertical:insensitive { + background-image: url("assets/scale-slider-marks-below-vertical-insensitive.svg"); +} + +/*************** + * progressbar * + ***************/ GtkProgressBar { border-radius: 0; border-width: 1px; padding: 0; } -.menubar .menuitem .scale.highlight.left, -.scale.highlight.left, .progressbar, .progressbar row, .progressbar row:hover, @@ -1581,7 +1727,6 @@ GtkProgressBar { -unico-outer-stroke-width: 0; } -.scale.highlight.bottom, .progressbar.vertical { background-image: -gtk-gradient (linear, left top, right top, from (shade (@theme_selected_bg_color, 0.96)), @@ -1600,32 +1745,6 @@ GtkProgressBar { -unico-inner-stroke-width: 1px 0px 1px 1px; } -.scale.highlight.left:insensitive { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.95)), - to (shade (@theme_bg_color, 0.85))); - - -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 0.75))); - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.97)), - to (shade (@theme_bg_color, 0.865))); -} - -.scale.highlight.bottom:insensitive { - background-image: -gtk-gradient (linear, left top, right top, - from (shade (@theme_bg_color, 0.95)), - to (shade (@theme_bg_color, 0.85))); - - -unico-border-gradient: -gtk-gradient (linear, left top, right top, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 0.75))); - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, right top, - from (shade (@theme_bg_color, 0.97)), - to (shade (@theme_bg_color, 0.865))); -} - .trough, .trough row, .trough row:hover, @@ -1660,70 +1779,6 @@ GtkProgressBar { -unico-outer-stroke-width: 0; } -.scale.trough.horizontal { - border-radius: 8px; - background-image: none; - background-color: shade (@theme_bg_color, 0.9); - border-width: 0; - -unico-outer-stroke-width: 0 0 1px 0; - -unico-outer-stroke-color: alpha (@theme_base_color, 0.6); - -unico-inner-stroke-width: 1px 0 0 0; - - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 0.75))); -} - -.scale.trough.vertical { - border-radius: 8px; - background-image: none; - background-color: shade (@theme_bg_color, 0.9); - border-width: 0; - -unico-outer-stroke-width: 0 1px 0 0; - -unico-outer-stroke-color: alpha (@theme_base_color, 0.6); - -unico-inner-stroke-width: 0 0 0 1px; - - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, right top, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 0.75))); -} - -.scale.trough.vertical.highlight.bottom, -.scale.trough.horizontal.highlight.left { - background-color: alpha (@theme_selected_bg_color, 0.6); -} - -GtkScale { - -GtkRange-slider-width: 14; - -GtkRange-trough-border: 1; - -GtkScale-slider-length: 14; - - border-style: solid; - border-width: 1px; - border-radius: 8px; - - -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.8)), - to (shade (@theme_bg_color, 0.8))); - -unico-glow-radius: 0; - -unico-inner-stroke-width: 1px; - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (alpha (shade (@theme_bg_color, 0.6), 0.2)), - to (alpha (@theme_bg_color, 0.0))); -} - -GtkScale.vertical { - -GtkScale-slider-length: 14; - -unico-inner-stroke-width: 1px; - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, right top, - from (alpha (shade (@theme_bg_color, 0.6), 0.2)), - to (alpha (@theme_bg_color, 0.0))); -} - -GtkScale.mark { - border-color: shade (@theme_bg_color, 0.8); -} - /************* * scrollbar * *************/ diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css index 747014ae..b54474d2 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css @@ -51,7 +51,11 @@ @define-color backdrop_selected_bg_color shade (@theme_selected_bg_color, 1.12); @define-color backdrop_selected_fg_color @theme_selected_fg_color; -/* Zukitwo colors */ +@define-color scale_fill shade(@button_bg_active, 1.00); +@define-color scale_border_a @internal_element_color; +@define-color scale_border_b shade (@internal_element_color, 1.25); +@define-color scale_progress_fill @theme_selected_bg_color; + @define-color toolbar_gradient_base #CBD5D9; @define-color toolbar_gradient_final #C0CACE; @define-color toolbar_border #BBC5C9; diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am b/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am index 8c7eb224..a3e9fab9 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am @@ -29,6 +29,24 @@ theme_DATA = \ radio-normal-ins.png \ radio-normal.png \ resize-grip.svg \ + scale-slider-hor-dark.svg \ + scale-slider-horizontal-insensitive.svg \ + scale-slider-horizontal.svg \ + scale-slider-hor.svg \ + scale-slider-insensitive-hor.svg \ + scale-slider-insensitive-ver.svg \ + scale-slider-marks-above-horizontal-insensitive.svg \ + scale-slider-marks-above-horizontal.svg \ + scale-slider-marks-above-vertical-insensitive.svg \ + scale-slider-marks-above-vertical.svg \ + scale-slider-marks-below-horizontal-insensitive.svg \ + scale-slider-marks-below-horizontal.svg \ + scale-slider-marks-below-vertical-insensitive.svg \ + scale-slider-marks-below-vertical.svg \ + scale-slider.svg \ + scale-slider-ver.svg \ + scale-slider-vertical-insensitive.svg \ + scale-slider-vertical.svg \ sidebar-radio-checked.svg \ sidebar-radio-prelight.svg \ sidebar-radio-selected-prelight.svg \ diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-hor-dark.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-hor-dark.svg new file mode 100644 index 00000000..367e735f --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-hor-dark.svg @@ -0,0 +1,482 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-hor.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-hor.svg new file mode 100644 index 00000000..88a22e3f --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-hor.svg @@ -0,0 +1,346 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-horizontal-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-horizontal-insensitive.svg new file mode 100644 index 00000000..c719830b --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-horizontal-insensitive.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-horizontal.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-horizontal.svg new file mode 100644 index 00000000..acba2b18 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-horizontal.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-insensitive-hor.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-insensitive-hor.svg new file mode 100644 index 00000000..d2969ec0 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-insensitive-hor.svg @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-insensitive-ver.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-insensitive-ver.svg new file mode 100644 index 00000000..4a873bca --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-insensitive-ver.svg @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.svg new file mode 100644 index 00000000..a1a81ea9 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.svg new file mode 100644 index 00000000..5bbcc7e8 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.svg new file mode 100644 index 00000000..a9f93cc9 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.svg new file mode 100644 index 00000000..59f371d5 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.svg new file mode 100644 index 00000000..8c66b5ad --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.svg new file mode 100644 index 00000000..e82ce44b --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.svg new file mode 100644 index 00000000..4b49ae7f --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.svg @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.svg new file mode 100644 index 00000000..8083e110 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.svg @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-ver.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-ver.svg new file mode 100644 index 00000000..566f260e --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-ver.svg @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-vertical-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-vertical-insensitive.svg new file mode 100644 index 00000000..5bf0d7d4 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-vertical-insensitive.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-vertical.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-vertical.svg new file mode 100644 index 00000000..b3e82cc6 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-vertical.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider.svg new file mode 100644 index 00000000..dbb871cd --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider.svg @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css index 3775a898..f559a8b8 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css @@ -315,8 +315,6 @@ GtkComboBox, } GtkComboBox.combobox-entry .button, -GtkScale.slider, -GtkScale.slider.vertical, .notebook .button, .inline-toolbar.toolbar .button { background-image: -gtk-gradient (linear, left top, left bottom, @@ -336,21 +334,7 @@ GtkScale.slider.vertical, -unico-inner-stroke-color: shade (@theme_bg_color, 1.9); } -GtkScale.slider, -GtkScale.slider.vertical { - -unico-outer-stroke-width: 1px; - -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (alpha (shade (@theme_bg_color, 0.05), 0.05)), - to (alpha (shade (@theme_bg_color, 0.05), 0.09))); - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@button_bg_color, 1.66)), - to (shade (@button_bg_color, 1.415))); - -unico-inner-stroke-width: 1px 1px 0 1px; -} - GtkComboBox.combobox-entry .button:hover, -GtkScale.slider:hover, -GtkScale.slider.vertical:hover, .notebook .button:hover, .inline-toolbar.toolbar .button:hover { background-image: -gtk-gradient (linear, left top, left bottom, @@ -1407,15 +1391,6 @@ DbusmenuGtkMenu .menuitem.radio:active, to (shade (@theme_bg_color, 1.1)));; } -.menubar .menuitem GtkScale.trough { - background-color: @theme_bg_color; - background-image: none; - - -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 1.15))); -} - Genericmenuitem .menuitem .accelerator, DbusmenuGtkMenu .menuitem .accelerator, .menubar .menuitem .accelerator, @@ -1551,18 +1526,190 @@ DbusmenuGtkMenu .menuitem .accelerator:insensitive, -unico-inner-stroke-width: 1px; } -/************************* - * progressbar and scale * - *************************/ -GtkScale, +/************ + * GtkScale * + ************/ + +.scale { + -GtkScale-slider-length: 14; + -GtkRange-slider-width: 14; + -GtkRange-trough-border: 1; + -GtkWidget-focus-line-width: 0; +} + +.scale.slider, +.scale.slider:hover, +.scale.slider:insensitive { + border-width: 1px; + border-radius: 8px; + border-style: none; + color: alpha(@theme_base_color, 0.0); + background-color: alpha(@theme_base_color, 0.0); + /* background-image in -assets variant */ +} + +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; +} + +.toolbar .scale.trough, +.scale.trough { + margin: 7px 0; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (alpha (#000, 0.20)), + color-stop (0.20, alpha (#000, 0.16)), + to (alpha (#000, 0.06))); + border-style: none; + border-width: 0px; + border-radius: 8px; + box-shadow: inset 1px 1px alpha(#000, 0.08), + inset -1px -1px alpha(#000, 0.08); +} + +.scale.trough.vertical { + margin: 0 7px; +} + +.scale.trough:insensitive { + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (alpha (#000, 0.03)), + to (alpha (#000, 0.03))); +} + +.scale.progressbar { + background-color: @scale_progress_fill; + border-width: 1px; + border-radius: 3px; + border-style: none; +} + +.scale:insensitive, +.vertical.scale:insensitive { + background-color: transparent; +} + +.scale.mark { + color: mix(@theme_bg_color, @theme_text_color, 0.56); +} + +.menubar .menuitem .scale.highlight.left, +.scale.highlight.left { + background-image: -gtk-gradient (linear, + left top, left bottom, + from (shade (@scale_fill, 0.90)), + to (shade (@scale_fill, 1.31))); + border-style: none; + border-width: 0px; + border-radius: 8px; + box-shadow: inset 1px 1px alpha(#000, 0.08), + inset -1px -1px alpha(#000, 0.08); + color: @theme_selected_fg_color; + text-shadow: none; +} + +.menubar .menuitem .scale.highlight.bottom, +.scale.highlight.bottom { + background-image: -gtk-gradient (linear, + left top, right top, + from (shade (@scale_fill, 0.90)), + to (shade (@scale_fill, 1.31))); + border-style: none; + border-width: 0px; + border-radius: 8px; + box-shadow: inset 1px 1px alpha(#000, 0.08), + inset -1px -1px alpha(#000, 0.08); + color: @theme_selected_fg_color; + text-shadow: none; +} + +.scale.highlight.left:insensitive { + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@theme_bg_color, 0.85)), + to (shade (@theme_bg_color, 0.85))); + box-shadow: inset 1px 1px alpha(#000, 0.02), + inset -1px -1px alpha(#000, 0.02); +} + +.scale.highlight.bottom:insensitive { + background-image: -gtk-gradient (linear, left top, right top, + from (shade (@theme_bg_color, 0.85)), + to (shade (@theme_bg_color, 0.85))); + box-shadow: inset 1px 1px alpha(#000, 0.02), + inset -1px -1px alpha(#000, 0.02); +} + +GtkScale.slider, +GtkScale.slider.horizontal, +GtkScale.slider.horizontal:hover { + background-image: url("assets/scale-slider-hor.svg"); +} + +GtkScale.slider:insensitive, +GtkScale.slider.horizontal:insensitive { + background-image: url("assets/scale-slider-insensitive-hor.svg"); +} + +GtkScale.slider.vertical { + background-image: url("assets/scale-slider-ver.svg"); +} + +GtkScale.slider.vertical:insensitive { + background-image: url("assets/scale-slider-insensitive-ver.svg"); +} + +GtkScale.scale-has-marks-above.slider.horizontal, +GtkScale.scale-has-marks-above.slider.horizontal:hover { + background-image: url("assets/scale-slider-marks-above-horizontal.svg"); +} + +GtkScale.scale-has-marks-above.slider.horizontal:insensitive { + background-image: url("assets/scale-slider-marks-above-horizontal-insensitive.svg"); +} + +GtkScale.scale-has-marks-above.slider.vertical { + background-image: url("assets/scale-slider-marks-above-vertical.svg"); +} + +GtkScale.scale-has-marks-above.slider.vertical:insensitive { + background-image: url("assets/scale-slider-marks-above-vertical-insensitive.svg"); +} + +GtkScale.scale-has-marks-below.slider.horizontal, +GtkScale.scale-has-marks-below.slider.horizontal:hover { + background-image: url("assets/scale-slider-marks-below-horizontal.svg"); +} + +GtkScale.scale-has-marks-below.slider.horizontal:insensitive { + background-image: url("assets/scale-slider-marks-below-horizontal-insensitive.svg"); +} + +GtkScale.scale-has-marks-below.slider.vertical { + background-image: url("assets/scale-slider-marks-below-vertical.svg"); +} + +GtkScale.scale-has-marks-below.slider.vertical:insensitive { + background-image: url("assets/scale-slider-marks-below-vertical-insensitive.svg"); +} + +/*************** + * progressbar * + ***************/ + GtkProgressBar { border-radius: 0; border-width: 1px; padding: 0; } -.menubar .menuitem .scale.highlight.left, -.scale.highlight.left, .progressbar, .progressbar row, .progressbar row:hover, @@ -1587,7 +1734,6 @@ GtkProgressBar { -unico-outer-stroke-width: 0; } -.scale.highlight.bottom, .progressbar.vertical { background-image: -gtk-gradient (linear, left top, right top, from (shade (@theme_selected_bg_color, 0.96)), @@ -1606,32 +1752,6 @@ GtkProgressBar { -unico-inner-stroke-width: 1px 0px 1px 1px; } -.scale.highlight.left:insensitive { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.95)), - to (shade (@theme_bg_color, 0.85))); - - -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 0.75))); - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.97)), - to (shade (@theme_bg_color, 0.865))); -} - -.scale.highlight.bottom:insensitive { - background-image: -gtk-gradient (linear, left top, right top, - from (shade (@theme_bg_color, 0.95)), - to (shade (@theme_bg_color, 0.85))); - - -unico-border-gradient: -gtk-gradient (linear, left top, right top, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 0.75))); - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, right top, - from (shade (@theme_bg_color, 0.97)), - to (shade (@theme_bg_color, 0.865))); -} - .trough, .trough row, .trough row:hover, @@ -1666,70 +1786,6 @@ GtkProgressBar { -unico-outer-stroke-width: 0; } -.scale.trough.horizontal { - border-radius: 8px; - background-image: none; - background-color: shade (@theme_bg_color, 0.9); - border-width: 0; - -unico-outer-stroke-width: 0 0 1px 0; - -unico-outer-stroke-color: alpha (@theme_base_color, 0.6); - -unico-inner-stroke-width: 1px 0 0 0; - - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 0.75))); -} - -.scale.trough.vertical { - border-radius: 8px; - background-image: none; - background-color: shade (@theme_bg_color, 0.9); - border-width: 0; - -unico-outer-stroke-width: 0 1px 0 0; - -unico-outer-stroke-color: alpha (@theme_base_color, 0.6); - -unico-inner-stroke-width: 0 0 0 1px; - - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, right top, - from (shade (@theme_bg_color, 0.75)), - to (shade (@theme_bg_color, 0.75))); -} - -.scale.trough.vertical.highlight.bottom, -.scale.trough.horizontal.highlight.left { - background-color: alpha (@theme_selected_bg_color, 0.6); -} - -GtkScale { - -GtkRange-slider-width: 14; - -GtkRange-trough-border: 1; - -GtkScale-slider-length: 14; - - border-style: solid; - border-width: 1px; - border-radius: 8px; - - -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, - from (shade (@theme_bg_color, 0.8)), - to (shade (@theme_bg_color, 0.8))); - -unico-glow-radius: 0; - -unico-inner-stroke-width: 1px; - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, - from (alpha (shade (@theme_bg_color, 0.6), 0.2)), - to (alpha (@theme_bg_color, 0.0))); -} - -GtkScale.vertical { - -GtkScale-slider-length: 14; - -unico-inner-stroke-width: 1px; - -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, right top, - from (alpha (shade (@theme_bg_color, 0.6), 0.2)), - to (alpha (@theme_bg_color, 0.0))); -} - -GtkScale.mark { - border-color: shade (@theme_bg_color, 0.8); -} - /************* * scrollbar * *************/ diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk.css index c918a1f2..9fa48e34 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk.css @@ -51,7 +51,11 @@ @define-color backdrop_selected_bg_color shade (@theme_selected_bg_color, 1.12); @define-color backdrop_selected_fg_color @theme_selected_fg_color; -/* Zukitwo colors */ +@define-color scale_fill shade(@button_bg_active, 1.00); +@define-color scale_border_a @internal_element_color; +@define-color scale_border_b shade (@internal_element_color, 1.25); +@define-color scale_progress_fill @theme_selected_bg_color; + @define-color toolbar_gradient_base #CBD9D4; @define-color toolbar_gradient_final #C0CEC9; @define-color toolbar_border #BBC9C4; -- cgit v1.2.1