From 89728b5b472faa684e60c6fbe47d6c2128331e63 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 20 Jun 2016 20:48:29 +0200 Subject: 3.18: fix sidebar-button --- common/gtk-3.0/3.18/gtk-dark.css | 38 +++++++++++----------- common/gtk-3.0/3.18/gtk-darker.css | 38 +++++++++++----------- common/gtk-3.0/3.18/gtk-solid-dark.css | 38 +++++++++++----------- common/gtk-3.0/3.18/gtk-solid-darker.css | 38 +++++++++++----------- common/gtk-3.0/3.18/gtk-solid.css | 38 +++++++++++----------- common/gtk-3.0/3.18/gtk.css | 38 +++++++++++----------- common/gtk-3.0/3.18/sass/_transparent_widgets.scss | 21 +++++++----- 7 files changed, 126 insertions(+), 123 deletions(-) (limited to 'common') diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index a6d91ac..d55f265 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -3731,6 +3731,25 @@ NautilusWindow GtkPlacesSidebar.sidebar { NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon, NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon { color: inherit; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button { + color: #BAC3CF; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover { + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active { + background-clip: padding-box; + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: rgba(26, 28, 34, 0.35); + background-color: #5294E2; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage { + opacity: 0.5; } GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, NautilusWindow GtkPlacesSidebar.sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator { @@ -3740,25 +3759,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar, NautilusWindow.maximized GtkPlacesSidebar.sidebar { background-color: #353945; } -GtkFileChooserDialog .sidebar-button.button, -NautilusWindow .sidebar-button.button { - color: #BAC3CF; } - GtkFileChooserDialog .sidebar-button.button:hover, - NautilusWindow .sidebar-button.button:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); } - GtkFileChooserDialog .sidebar-button.button:active, - NautilusWindow .sidebar-button.button:active { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: #5294E2; } - GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, - NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { - opacity: 0.5; } - NemoWindow.csd.background, NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight, MarlinViewWindow.csd.background, diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index aeba0b1..3ab3579 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -3724,6 +3724,25 @@ NautilusWindow GtkPlacesSidebar.sidebar { NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon, NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon { color: inherit; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button { + color: #BAC3CF; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover { + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active { + background-clip: padding-box; + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: rgba(26, 28, 34, 0.35); + background-color: #5294E2; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage { + opacity: 0.5; } GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, NautilusWindow GtkPlacesSidebar.sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator { @@ -3733,25 +3752,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar, NautilusWindow.maximized GtkPlacesSidebar.sidebar { background-color: #353945; } -GtkFileChooserDialog .sidebar-button.button, -NautilusWindow .sidebar-button.button { - color: #BAC3CF; } - GtkFileChooserDialog .sidebar-button.button:hover, - NautilusWindow .sidebar-button.button:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); } - GtkFileChooserDialog .sidebar-button.button:active, - NautilusWindow .sidebar-button.button:active { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: #5294E2; } - GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, - NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { - opacity: 0.5; } - NemoWindow.csd.background, NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight, MarlinViewWindow.csd.background, diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index b9f9f39..e806814 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -3731,6 +3731,25 @@ NautilusWindow GtkPlacesSidebar.sidebar { NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon, NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon { color: inherit; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button { + color: #BAC3CF; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover { + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active { + background-clip: padding-box; + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: rgba(26, 28, 34, 0.4); + background-color: #5294E2; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage { + opacity: 0.5; } GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, NautilusWindow GtkPlacesSidebar.sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator { @@ -3740,25 +3759,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar, NautilusWindow.maximized GtkPlacesSidebar.sidebar { background-color: #353945; } -GtkFileChooserDialog .sidebar-button.button, -NautilusWindow .sidebar-button.button { - color: #BAC3CF; } - GtkFileChooserDialog .sidebar-button.button:hover, - NautilusWindow .sidebar-button.button:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(119, 127, 151, 0.5); } - GtkFileChooserDialog .sidebar-button.button:active, - NautilusWindow .sidebar-button.button:active { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: #5294E2; } - GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, - NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { - opacity: 0.5; } - NemoWindow.csd.background, NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight, MarlinViewWindow.csd.background, diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 99f247a..7865fd7 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -3724,6 +3724,25 @@ NautilusWindow GtkPlacesSidebar.sidebar { NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon, NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon { color: inherit; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button { + color: #BAC3CF; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover { + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active { + background-clip: padding-box; + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: rgba(26, 28, 34, 0.4); + background-color: #5294E2; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage { + opacity: 0.5; } GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, NautilusWindow GtkPlacesSidebar.sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator { @@ -3733,25 +3752,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar, NautilusWindow.maximized GtkPlacesSidebar.sidebar { background-color: #353945; } -GtkFileChooserDialog .sidebar-button.button, -NautilusWindow .sidebar-button.button { - color: #BAC3CF; } - GtkFileChooserDialog .sidebar-button.button:hover, - NautilusWindow .sidebar-button.button:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(119, 127, 151, 0.5); } - GtkFileChooserDialog .sidebar-button.button:active, - NautilusWindow .sidebar-button.button:active { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: #5294E2; } - GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, - NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { - opacity: 0.5; } - NemoWindow.csd.background, NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight, MarlinViewWindow.csd.background, diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 1eacc5f..1a60533 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -3728,6 +3728,25 @@ NautilusWindow GtkPlacesSidebar.sidebar { NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon, NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon { color: inherit; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button { + color: #BAC3CF; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover { + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active { + background-clip: padding-box; + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: rgba(26, 28, 34, 0.4); + background-color: #5294E2; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage { + opacity: 0.5; } GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, NautilusWindow GtkPlacesSidebar.sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator { @@ -3737,25 +3756,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar, NautilusWindow.maximized GtkPlacesSidebar.sidebar { background-color: #353945; } -GtkFileChooserDialog .sidebar-button.button, -NautilusWindow .sidebar-button.button { - color: #BAC3CF; } - GtkFileChooserDialog .sidebar-button.button:hover, - NautilusWindow .sidebar-button.button:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(119, 127, 151, 0.5); } - GtkFileChooserDialog .sidebar-button.button:active, - NautilusWindow .sidebar-button.button:active { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: #5294E2; } - GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, - NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { - opacity: 0.5; } - NemoWindow.csd.background, NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight, MarlinViewWindow.csd.background, diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 5aff150..1aa537a 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -3728,6 +3728,25 @@ NautilusWindow GtkPlacesSidebar.sidebar { NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon, NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon { color: inherit; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button { + color: #BAC3CF; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover { + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active { + background-clip: padding-box; + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: rgba(26, 28, 34, 0.35); + background-color: #5294E2; } + GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage, + NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage { + opacity: 0.5; } GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, NautilusWindow GtkPlacesSidebar.sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator { @@ -3737,25 +3756,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar, NautilusWindow.maximized GtkPlacesSidebar.sidebar { background-color: #353945; } -GtkFileChooserDialog .sidebar-button.button, -NautilusWindow .sidebar-button.button { - color: #BAC3CF; } - GtkFileChooserDialog .sidebar-button.button:hover, - NautilusWindow .sidebar-button.button:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); } - GtkFileChooserDialog .sidebar-button.button:active, - NautilusWindow .sidebar-button.button:active { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: #5294E2; } - GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage, - NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage { - opacity: 0.5; } - NemoWindow.csd.background, NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight, MarlinViewWindow.csd.background, diff --git a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss index d3c049c..aeae067 100644 --- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss @@ -47,21 +47,24 @@ NautilusWindow { } } + .sidebar-button.button { + color: $dark_sidebar_fg; + + &:hover { @include button(osd-hover); } + &:active { + background-clip: padding-box; + @include button(osd-active); + } + + &:not(:hover):not(:active) > GtkImage { opacity: 0.5 }; + } + .separator { color: transparent; } .scrollbar { @extend %dark_sidebar_scrollbar } } &.maximized GtkPlacesSidebar.sidebar { background-color: opacify($dark_sidebar_bg, 1); } - - .sidebar-button.button { - color: $dark_sidebar_fg; - - &:hover { @include button(osd-hover); } - &:active { @include button(osd-active); } - - &:not(:hover):not(:active) > GtkImage { opacity: 0.5 }; - } } -- cgit v1.2.3