From be930a0cde4a9a6cda76c0a4343e4eb59e6430f9 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Tue, 27 Oct 2015 18:38:52 +0100 Subject: osd and titlebutton fixes --- common/gtk-3.0/3.16/gtk-contained-dark.css | 12 ++++++++---- common/gtk-3.0/3.16/gtk-contained-darker.css | 12 ++++++++---- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 12 ++++++++---- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 12 ++++++++---- common/gtk-3.0/3.16/gtk-contained-solid.css | 12 ++++++++---- common/gtk-3.0/3.16/gtk-contained.css | 12 ++++++++---- common/gtk-3.0/3.16/sass/_common.scss | 6 ++++-- 7 files changed, 52 insertions(+), 26 deletions(-) (limited to 'common/gtk-3.0/3.16') diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 2674cef..d083279 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -2557,12 +2561,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2583,7 +2586,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index b0b08cb..4de7a2e 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -2560,12 +2564,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2586,7 +2589,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 9b21e44..4adad11 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -2557,12 +2561,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2583,7 +2586,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index 3e141e9..d2e4ac6 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -2560,12 +2564,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2586,7 +2589,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index 0c303a5..f47276b 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -2560,12 +2564,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2586,7 +2589,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 73e399d..83b64a9 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -2560,12 +2564,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2586,7 +2589,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 1ee78e4..92856f5 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -473,6 +473,7 @@ $_dot_color: $selected_bg_color; &:hover { @include button(osd-hover); @extend %linked; + &, &:first-child, &:last-child { box-shadow: none; } } &:active, &:checked { background-clip: padding-box; @@ -489,6 +490,7 @@ $_dot_color: $selected_bg_color; box-shadow: none; &:hover { @include button(osd-hover); + &, &:first-child, &:last-child { box-shadow: none; } } &:insensitive { @include button(osd-insensitive); @@ -2844,11 +2846,10 @@ GtkVolumeButton.button { padding: 8px; } } .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; @include button(undecorated); background-color: transparentize($header_bg, 1); - border-width: 0; &:hover { @include button(header-hover); @@ -2863,6 +2864,7 @@ GtkVolumeButton.button { padding: 8px; } background-color: transparent; background-position: center; background-repeat: no-repeat; + border-width: 0; &:backdrop { opacity: 1; } } -- cgit v1.2.3