diff options
22 files changed, 244 insertions, 130 deletions
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 49207292..b1d49426 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/assets/Makefile.am +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/Makefile.am @@ -44,6 +44,14 @@ theme_DATA = \ scale-slider-hor.svg \ scale-slider-insensitive-hor.svg \ scale-slider-insensitive-ver.svg \ + scale-slider-marks-above-horizontal-insensitive.png \ + scale-slider-marks-above-horizontal.png \ + scale-slider-marks-above-vertical-insensitive.png \ + scale-slider-marks-above-vertical.png \ + scale-slider-marks-below-horizontal-insensitive.png \ + scale-slider-marks-below-horizontal.png \ + scale-slider-marks-below-vertical-insensitive.png \ + scale-slider-marks-below-vertical.png \ scale-slider-marks-above-horizontal-insensitive.svg \ scale-slider-marks-above-horizontal.svg \ scale-slider-marks-above-vertical-insensitive.svg \ diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.png b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.png Binary files differnew file mode 100644 index 00000000..9b4d4dfa --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.png diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.png b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.png Binary files differnew file mode 100644 index 00000000..41e8bc7d --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.png diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.png b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.png Binary files differnew file mode 100644 index 00000000..d8cfd70d --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.png diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.png b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.png Binary files differnew file mode 100644 index 00000000..04badcaa --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.png diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.png b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.png Binary files differnew file mode 100644 index 00000000..816d6665 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.png diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.png b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.png Binary files differnew file mode 100644 index 00000000..8fbdcbcd --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.png diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.png b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.png Binary files differnew file mode 100644 index 00000000..ae6a2e29 --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.png diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.png b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.png Binary files differnew file mode 100644 index 00000000..491817af --- /dev/null +++ b/desktop-themes/Blue-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.png diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css index 669e4c89..52a3c883 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css @@ -206,35 +206,35 @@ scale.vertical slider:disabled { scale.horizontal.scale-has-marks-above slider, scale.horizontal.scale-has-marks-above slider:hover { - background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal.png")); } scale.horizontal.scale-has-marks-above slider:disabled { - background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal-insensitive.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal-insensitive.png")); } scale.vertical.scale-has-marks-above slider { - background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical.png")); } scale.vertical.scale-has-marks-above slider:disabled { - background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical-insensitive.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical-insensitive.png")); } scale.horizontal.scale-has-marks-below slider, scale.horizontal.scale-has-marks-below slider:hover { - background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal.png")); } scale.horizontal.scale-has-marks-below slider:disabled { - background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal-insensitive.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal-insensitive.png")); } scale.vertical.scale-has-marks-below slider { - background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical.png")); } scale.vertical.scale-has-marks-below slider:disabled { - background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical-insensitive.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical-insensitive.png")); } 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 c5a80ee5..9e15f399 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css @@ -719,6 +719,33 @@ scale highlight.bottom:disabled { inset -1px -1px alpha(#000, 0.02); } +scale.vertical.scale-has-marks-below slider, +scale.horizontal.scale-has-marks-below slider, +scale.vertical.scale-has-marks-above slider, +scale.horizontal.scale-has-marks-above slider { + background-size: 100%; + background-repeat: no-repeat; + background-position: center; +} + +scale.vertical.scale-has-marks-below slider:hover, +scale.horizontal.scale-has-marks-below slider:hover, +scale.vertical.scale-has-marks-above slider:hover, +scale.horizontal.scale-has-marks-above slider:hover { + background-size: 90%; + background-repeat: no-repeat; + background-position: center; +} + +scale.vertical.fine-tune.scale-has-marks-below slider, +scale.horizontal.fine-tune.scale-has-marks-below slider, +scale.vertical.fine-tune.scale-has-marks-above slider, +scale.horizontal.fine-tune.scale-has-marks-above slider { + background-size: 75%; + background-repeat: no-repeat; + background-position: center; +} + /********** * Frames * **********/ @@ -3632,6 +3659,7 @@ headerbar:backdrop button { headerbar button:hover, headerbar button:checked, headerbar button:hover:active, +headerbar button.text-button:hover:active, headerbar button:checked:hover, headerbar button:checked:hover:active, headerbar button:hover:first-child, @@ -3704,6 +3732,8 @@ headerbar > button:disabled { -gtk-icon-shadow: none; } +headerbar > button.text-button:hover, +headerbar > button.text-button:focus, headerbar > button.text-button, headerbar > button.text-button.radio, headerbar > .linked > button.text-button, @@ -3711,7 +3741,8 @@ headerbar > .linked > button.text-button.radio { padding: 4px 6px; } -headerbar > button.image-button { +headerbar > button.image-button, +headerbar > button.image-button:focus { padding: 5px 5px 6px 5px; } @@ -3733,6 +3764,16 @@ headerbar > stackswitcher.linked.stack-switcher > button.text-button.radio:last- border-left-width: 0px; } +headerbar.titlebar > stackswitcher.linked.stack-switcher > button.text-button.radio.needs-attention > label { + background-color: transparent; + color: @theme_dark_fg_color; + border-radius: 3px; + box-shadow: inset 0px 1px shade (@info_fg_color, 1.3), + inset 1px 0px shade (@info_fg_color, 1.3), + inset -1px 0px shade (@info_fg_color, 1.3), + inset 0px -1px shade (@info_fg_color, 1.3); +} + headerbar title { font: Bold 11; color: @theme_text_dark_color; @@ -4686,71 +4727,71 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical { } /* middle buttons */ -.dialog-action-area.linked button, -.dialog-action-area.linked button:focus, -.dialog-action-area.linked button:hover, -.dialog-action-area.linked button:focus:hover, -.dialog-action-area.linked button:focus:hover:active, -.dialog-action-area.linked button:checked, -.dialog-action-area.linked button:checked:hover, -.dialog-action-area.linked button:checked:hover:active, -.dialog-action-area.linked button:disabled { - border-right-width: 0px; - border-left-width: 0px; - border-width: 1px 0; +.dialog-action-area.linked > button.text-button, +.dialog-action-area.linked > button.text-button:focus, +.dialog-action-area.linked > button.text-button:hover, +.dialog-action-area.linked > button.text-button:hover:active, +.dialog-action-area.linked > button.text-button:focus:hover, +.dialog-action-area.linked > button.text-button:focus:hover:active, +.dialog-action-area.linked > button.text-button:checked, +.dialog-action-area.linked > button.text-button:checked:hover, +.dialog-action-area.linked > button.text-button:checked:hover:active, +.dialog-action-area.linked > button.text-button:disabled { + border-width: 1px 1px 1px 0px; border-radius: 0; - padding: 6px 2px; + padding: 8px 6px; + margin: 0px 0px 0px -2px; + min-height: 16px; + min-width: 16px; } /* left button */ -.dialog-action-area.linked button:first-child, -.dialog-action-area.linked button:focus:first-child, -.dialog-action-area.linked button:hover:first-child, -.dialog-action-area.linked button:focus:hover:first-child, -.dialog-action-area.linked button:focus:hover:active:first-child, -.dialog-action-area.linked button:checked:first-child, -.dialog-action-area.linked button:checked:hover:first-child, -.dialog-action-area.linked button:checked:hover:active:first-child, -.dialog-action-area.linked button:disabled:first-child { +.dialog-action-area.linked > button.text-button:first-child, +.dialog-action-area.linked > button.text-button:focus:first-child, +.dialog-action-area.linked > button.text-button:hover:first-child, +.dialog-action-area.linked > button.text-button:hover:active:first-child, +.dialog-action-area.linked > button.text-button:focus:hover:first-child, +.dialog-action-area.linked > button.text-button:focus:hover:active:first-child, +.dialog-action-area.linked > button.text-button:checked:first-child, +.dialog-action-area.linked > button.text-button:checked:hover:first-child, +.dialog-action-area.linked > button.text-button:checked:hover:active:first-child, +.dialog-action-area.linked > button.text-button:disabled:first-child { border-radius: 6px 0 0 6px; - border-width: 1px; - border-right-width: 0; - padding: 6px 2px; + border-width: 1px 1px 1px 1px; } /* right button */ -.dialog-action-area.linked button:last-child, -.dialog-action-area.linked button:focus:last-child, -.dialog-action-area.linked button:hover:last-child, -.dialog-action-area.linked button:focus:hover:last-child, -.dialog-action-area.linked button:focus:hover:active:last-child, -.dialog-action-area.linked button:checked:last-child, -.dialog-action-area.linked button:checked:hover:last-child, -.dialog-action-area.linked button:checked:hover:active:last-child, -.dialog-action-area.linked button:disabled:last-child { - border-width: 1px; +.dialog-action-area.linked > button.text-button:last-child, +.dialog-action-area.linked > button.text-button:focus:last-child, +.dialog-action-area.linked > button.text-button:hover:last-child, +.dialog-action-area.linked > button.text-button:hover:active:last-child, +.dialog-action-area.linked > button.text-button:focus:hover:last-child, +.dialog-action-area.linked > button.text-button:focus:hover:active:last-child, +.dialog-action-area.linked > button.text-button:checked:last-child, +.dialog-action-area.linked > button.text-button:checked:hover:last-child, +.dialog-action-area.linked > button.text-button:checked:hover:active:last-child, +.dialog-action-area.linked > button.text-button:disabled:last-child { + margin: 0px 0px 0px -2px; + border-width: 1px 1px 1px 0px; border-radius: 0 6px 6px 0; - border-left-width: 0; - padding: 6px 2px; } /* single button */ -.dialog-action-area.linked button:only-child, -.dialog-action-area.linked button:focus:only-child, -.dialog-action-area.linked button:hover:only-child, -.dialog-action-area.linked button:focus:hover:only-child, -.dialog-action-area.linked button:focus:hover:active:only-child, -.dialog-action-area.linked button:checked:only-child, -.dialog-action-area.linked button:checked:hover:only-child, -.dialog-action-area.linked button:checked:hover:active:only-child, -.dialog-action-area.linked button:disabled:last-child { - padding: 6px 2px; +.dialog-action-area.linked > button.text-button:only-child, +.dialog-action-area.linked > button.text-button:focus:only-child, +.dialog-action-area.linked > button.text-button:hover:only-child, +.dialog-action-area.linked > button.text-button:hover:active:only-child, +.dialog-action-area.linked > button.text-button:focus:hover:only-child, +.dialog-action-area.linked > button.text-button:focus:hover:active:only-child, +.dialog-action-area.linked > button.text-button:checked:only-child, +.dialog-action-area.linked > button.text-button:checked:hover:only-child, +.dialog-action-area.linked > button.text-button:checked:hover:active:only-child, +.dialog-action-area.linked > button.text-button:disabled:last-child { border-width: 1px; - border-radius: 6px; + border-image-width: 1px; } -.dialog-action-area.linked button:only-child { - border-width: 0px; +.dialog-action-area.linked > button.text-button { background-image: -gtk-gradient (linear, left top, left bottom, from (@button_gradient1), @@ -4763,29 +4804,37 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical { inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } -.dialog-action-area.linked button:focus:only-child { +.dialog-action-area.linked > button.text-button:focus { box-shadow: inset 0px 1px shade (@theme_selected_bg_color, 1.3), inset 1px 0px shade (@theme_selected_bg_color, 1.3), inset -1px 0px shade (@theme_selected_bg_color, 1.3), inset 0px -1px shade (@theme_selected_bg_color, 1.3); } -.dialog-action-area.linked button:hover:only-child { +.dialog-action-area.linked > button.text-button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), color-stop (0.48, shade(@button_gradient2, 1.03)), color-stop (0.52, shade(@button_gradient3, 1.03)), to (shade(@button_gradient4, 1.01))); + box-shadow: inset 0px 1px shade (@theme_selected_bg_color, 1.3), + inset 1px 0px shade (@theme_selected_bg_color, 1.3), + inset -1px 0px shade (@theme_selected_bg_color, 1.3), + inset 0px -1px shade (@theme_selected_bg_color, 1.3); } -.dialog-action-area.linked button:active:only-child { +.dialog-action-area.linked > button.text-button:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), color-stop (0.50, shade (@theme_bg_color, 1.00)), color-stop (0.50, shade (@theme_bg_color, 0.95)), to (shade (@theme_bg_color, 0.80))); + box-shadow: inset 0px 1px shade (@theme_selected_bg_color, 1.3), + inset 1px 0px shade (@theme_selected_bg_color, 1.3), + inset -1px 0px shade (@theme_selected_bg_color, 1.3), + inset 0px -1px shade (@theme_selected_bg_color, 1.3); } .dialog-action-area.linked button.suggested-action, @@ -4795,7 +4844,7 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical { box-shadow: none; } -.dialog-action-area.linked button label { +.dialog-action-area.linked > button.text-button label { padding: 2px 0px 0px 0px; } 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 64e19502..18718211 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am @@ -44,6 +44,14 @@ theme_DATA = \ scale-slider-hor.svg \ scale-slider-insensitive-hor.svg \ scale-slider-insensitive-ver.svg \ + scale-slider-marks-above-horizontal-insensitive.png \ + scale-slider-marks-above-horizontal.png \ + scale-slider-marks-above-vertical-insensitive.png \ + scale-slider-marks-above-vertical.png \ + scale-slider-marks-below-horizontal-insensitive.png \ + scale-slider-marks-below-horizontal.png \ + scale-slider-marks-below-vertical-insensitive.png \ + scale-slider-marks-below-vertical.png \ scale-slider-marks-above-horizontal-insensitive.svg \ scale-slider-marks-above-horizontal.svg \ scale-slider-marks-above-vertical-insensitive.svg \ diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.png Binary files differnew file mode 100644 index 00000000..9b4d4dfa --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal-insensitive.png diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.png Binary files differnew file mode 100644 index 00000000..41e8bc7d --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-horizontal.png diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.png Binary files differnew file mode 100644 index 00000000..d8cfd70d --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical-insensitive.png diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.png Binary files differnew file mode 100644 index 00000000..04badcaa --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-above-vertical.png diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.png Binary files differnew file mode 100644 index 00000000..816d6665 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal-insensitive.png diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.png Binary files differnew file mode 100644 index 00000000..8fbdcbcd --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-horizontal.png diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.png Binary files differnew file mode 100644 index 00000000..ae6a2e29 --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical-insensitive.png diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.png Binary files differnew file mode 100644 index 00000000..491817af --- /dev/null +++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/scale-slider-marks-below-vertical.png 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 669e4c89..52a3c883 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 @@ -206,35 +206,35 @@ scale.vertical slider:disabled { scale.horizontal.scale-has-marks-above slider, scale.horizontal.scale-has-marks-above slider:hover { - background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal.png")); } scale.horizontal.scale-has-marks-above slider:disabled { - background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal-insensitive.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal-insensitive.png")); } scale.vertical.scale-has-marks-above slider { - background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical.png")); } scale.vertical.scale-has-marks-above slider:disabled { - background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical-insensitive.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical-insensitive.png")); } scale.horizontal.scale-has-marks-below slider, scale.horizontal.scale-has-marks-below slider:hover { - background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal.png")); } scale.horizontal.scale-has-marks-below slider:disabled { - background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal-insensitive.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal-insensitive.png")); } scale.vertical.scale-has-marks-below slider { - background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical.png")); } scale.vertical.scale-has-marks-below slider:disabled { - background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical-insensitive.svg")); + background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical-insensitive.png")); } 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 a637a5d2..0efd4546 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css @@ -719,6 +719,33 @@ scale highlight.bottom:disabled { inset -1px -1px alpha(#000, 0.02); } +scale.vertical.scale-has-marks-below slider, +scale.horizontal.scale-has-marks-below slider, +scale.vertical.scale-has-marks-above slider, +scale.horizontal.scale-has-marks-above slider { + background-size: 100%; + background-repeat: no-repeat; + background-position: center; +} + +scale.vertical.scale-has-marks-below slider:hover, +scale.horizontal.scale-has-marks-below slider:hover, +scale.vertical.scale-has-marks-above slider:hover, +scale.horizontal.scale-has-marks-above slider:hover { + background-size: 90%; + background-repeat: no-repeat; + background-position: center; +} + +scale.vertical.fine-tune.scale-has-marks-below slider, +scale.horizontal.fine-tune.scale-has-marks-below slider, +scale.vertical.fine-tune.scale-has-marks-above slider, +scale.horizontal.fine-tune.scale-has-marks-above slider { + background-size: 75%; + background-repeat: no-repeat; + background-position: center; +} + /********** * Frames * **********/ @@ -3632,6 +3659,7 @@ headerbar:backdrop button { headerbar button:hover, headerbar button:checked, headerbar button:hover:active, +headerbar button.text-button:hover:active, headerbar button:checked:hover, headerbar button:checked:hover:active, headerbar button:hover:first-child, @@ -3704,6 +3732,8 @@ headerbar > button:disabled { -gtk-icon-shadow: none; } +headerbar > button.text-button:hover, +headerbar > button.text-button:focus, headerbar > button.text-button, headerbar > button.text-button.radio, headerbar > .linked > button.text-button, @@ -3711,7 +3741,8 @@ headerbar > .linked > button.text-button.radio { padding: 4px 6px; } -headerbar > button.image-button { +headerbar > button.image-button, +headerbar > button.image-button:focus { padding: 5px 5px 6px 5px; } @@ -3733,6 +3764,16 @@ headerbar > stackswitcher.linked.stack-switcher > button.text-button.radio:last- border-left-width: 0px; } +headerbar.titlebar > stackswitcher.linked.stack-switcher > button.text-button.radio.needs-attention > label { + background-color: transparent; + color: @theme_dark_fg_color; + border-radius: 3px; + box-shadow: inset 0px 1px shade (@info_fg_color, 1.3), + inset 1px 0px shade (@info_fg_color, 1.3), + inset -1px 0px shade (@info_fg_color, 1.3), + inset 0px -1px shade (@info_fg_color, 1.3); +} + headerbar title { font: Bold 11; color: @theme_text_dark_color; @@ -4686,71 +4727,71 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical { } /* middle buttons */ -.dialog-action-area.linked button, -.dialog-action-area.linked button:focus, -.dialog-action-area.linked button:hover, -.dialog-action-area.linked button:focus:hover, -.dialog-action-area.linked button:focus:hover:active, -.dialog-action-area.linked button:checked, -.dialog-action-area.linked button:checked:hover, -.dialog-action-area.linked button:checked:hover:active, -.dialog-action-area.linked button:disabled { - border-right-width: 0px; - border-left-width: 0px; - border-width: 1px 0; +.dialog-action-area.linked > button.text-button, +.dialog-action-area.linked > button.text-button:focus, +.dialog-action-area.linked > button.text-button:hover, +.dialog-action-area.linked > button.text-button:hover:active, +.dialog-action-area.linked > button.text-button:focus:hover, +.dialog-action-area.linked > button.text-button:focus:hover:active, +.dialog-action-area.linked > button.text-button:checked, +.dialog-action-area.linked > button.text-button:checked:hover, +.dialog-action-area.linked > button.text-button:checked:hover:active, +.dialog-action-area.linked > button.text-button:disabled { + border-width: 1px 1px 1px 0px; border-radius: 0; - padding: 6px 2px; + padding: 8px 6px; + margin: 0px 0px 0px -2px; + min-height: 16px; + min-width: 16px; } /* left button */ -.dialog-action-area.linked button:first-child, -.dialog-action-area.linked button:focus:first-child, -.dialog-action-area.linked button:hover:first-child, -.dialog-action-area.linked button:focus:hover:first-child, -.dialog-action-area.linked button:focus:hover:active:first-child, -.dialog-action-area.linked button:checked:first-child, -.dialog-action-area.linked button:checked:hover:first-child, -.dialog-action-area.linked button:checked:hover:active:first-child, -.dialog-action-area.linked button:disabled:first-child { +.dialog-action-area.linked > button.text-button:first-child, +.dialog-action-area.linked > button.text-button:focus:first-child, +.dialog-action-area.linked > button.text-button:hover:first-child, +.dialog-action-area.linked > button.text-button:hover:active:first-child, +.dialog-action-area.linked > button.text-button:focus:hover:first-child, +.dialog-action-area.linked > button.text-button:focus:hover:active:first-child, +.dialog-action-area.linked > button.text-button:checked:first-child, +.dialog-action-area.linked > button.text-button:checked:hover:first-child, +.dialog-action-area.linked > button.text-button:checked:hover:active:first-child, +.dialog-action-area.linked > button.text-button:disabled:first-child { border-radius: 6px 0 0 6px; - border-width: 1px; - border-right-width: 0; - padding: 6px 2px; + border-width: 1px 1px 1px 1px; } /* right button */ -.dialog-action-area.linked button:last-child, -.dialog-action-area.linked button:focus:last-child, -.dialog-action-area.linked button:hover:last-child, -.dialog-action-area.linked button:focus:hover:last-child, -.dialog-action-area.linked button:focus:hover:active:last-child, -.dialog-action-area.linked button:checked:last-child, -.dialog-action-area.linked button:checked:hover:last-child, -.dialog-action-area.linked button:checked:hover:active:last-child, -.dialog-action-area.linked button:disabled:last-child { - border-width: 1px; +.dialog-action-area.linked > button.text-button:last-child, +.dialog-action-area.linked > button.text-button:focus:last-child, +.dialog-action-area.linked > button.text-button:hover:last-child, +.dialog-action-area.linked > button.text-button:hover:active:last-child, +.dialog-action-area.linked > button.text-button:focus:hover:last-child, +.dialog-action-area.linked > button.text-button:focus:hover:active:last-child, +.dialog-action-area.linked > button.text-button:checked:last-child, +.dialog-action-area.linked > button.text-button:checked:hover:last-child, +.dialog-action-area.linked > button.text-button:checked:hover:active:last-child, +.dialog-action-area.linked > button.text-button:disabled:last-child { + margin: 0px 0px 0px -2px; + border-width: 1px 1px 1px 0px; border-radius: 0 6px 6px 0; - border-left-width: 0; - padding: 6px 2px; } /* single button */ -.dialog-action-area.linked button:only-child, -.dialog-action-area.linked button:focus:only-child, -.dialog-action-area.linked button:hover:only-child, -.dialog-action-area.linked button:focus:hover:only-child, -.dialog-action-area.linked button:focus:hover:active:only-child, -.dialog-action-area.linked button:checked:only-child, -.dialog-action-area.linked button:checked:hover:only-child, -.dialog-action-area.linked button:checked:hover:active:only-child, -.dialog-action-area.linked button:disabled:last-child { - padding: 6px 2px; +.dialog-action-area.linked > button.text-button:only-child, +.dialog-action-area.linked > button.text-button:focus:only-child, +.dialog-action-area.linked > button.text-button:hover:only-child, +.dialog-action-area.linked > button.text-button:hover:active:only-child, +.dialog-action-area.linked > button.text-button:focus:hover:only-child, +.dialog-action-area.linked > button.text-button:focus:hover:active:only-child, +.dialog-action-area.linked > button.text-button:checked:only-child, +.dialog-action-area.linked > button.text-button:checked:hover:only-child, +.dialog-action-area.linked > button.text-button:checked:hover:active:only-child, +.dialog-action-area.linked > button.text-button:disabled:last-child { border-width: 1px; - border-radius: 6px; + border-image-width: 1px; } -.dialog-action-area.linked button:only-child { - border-width: 0px; +.dialog-action-area.linked > button.text-button { background-image: -gtk-gradient (linear, left top, left bottom, from (@button_gradient1), @@ -4763,39 +4804,47 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical { inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } -.dialog-action-area.linked button:focus:only-child { +.dialog-action-area.linked > button.text-button:focus { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), inset 0px -1px shade(@selected_bg_color, 0.93); } -.dialog-action-area.linked button:hover:only-child { +.dialog-action-area.linked > button.text-button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), color-stop (0.48, shade(@button_gradient2, 1.03)), color-stop (0.52, shade(@button_gradient3, 1.03)), to (shade(@button_gradient4, 1.01))); + box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), + inset 1px 0px shade(@selected_bg_color, 0.97), + inset -1px 0px shade(@selected_bg_color, 0.93), + inset 0px -1px shade(@selected_bg_color, 0.93); } -.dialog-action-area.linked button:active:only-child { +.dialog-action-area.linked > button.text-button:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), color-stop (0.50, shade (@theme_bg_color, 1.00)), color-stop (0.50, shade (@theme_bg_color, 0.95)), to (shade (@theme_bg_color, 0.80))); + box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), + inset 1px 0px shade(@selected_bg_color, 0.97), + inset -1px 0px shade(@selected_bg_color, 0.93), + inset 0px -1px shade(@selected_bg_color, 0.93); } -.dialog-action-area.linked button.suggested-action, -.dialog-action-area.linked button.suggested-action:active, -.dialog-action-area.linked button.suggested-action:checked, -.dialog-action-area.linked button.suggested-action:disabled { +.dialog-action-area.linked > button.suggested-action, +.dialog-action-area.linked > button.suggested-action:active, +.dialog-action-area.linked > button.suggested-action:checked, +.dialog-action-area.linked > button.suggested-action:disabled { box-shadow: none; } -.dialog-action-area.linked button label { +.dialog-action-area.linked > button.text-button label { padding: 2px 0px 0px 0px; } |
