From ee864708c34027a1e3b0ad6aff38c1c3b4c3463d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 19 Feb 2016 11:06:17 +0100 Subject: adapt to changes in GTK+ 3.19.x --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 276 +++++++++++++++++++++ 1 file changed, 276 insertions(+) create mode 100644 common/gtk-3.0/3.20/sass/_transparent_widgets.scss (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss new file mode 100644 index 0000000..3083f38 --- /dev/null +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -0,0 +1,276 @@ +.titlebar separator { + color: $header_border; //fixes separator in gnome-tweak-tool +} + +NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar + +GtkFileChooserDialog *, +NautilusWindow *, +NemoWindow { + //-GtkPaned-handle-size: 0; +} + +@if $variant==dark { + GtkFileChooserDialog, + NautilusWindow , + NemoWindow { + .sidebar { border-right: 1px solid $dark_sidebar_border; } + + .sidebar:dir(rtl) { border-left: 1px solid $dark_sidebar_border; } + } +} + +// Dark transparent sidebars +GtkFileChooserDialog, +NautilusWindow { + + &.csd.background, placessidebar list { background-color: transparent; } + + placessidebar.sidebar { + background-color: $dark_sidebar_bg; + + row.sidebar-placeholder-row { border: 1px solid $selected_bg_color; } + + row.sidebar-new-bookmark-row { background-color: lighten($dark_sidebar_bg, 10%); } + + row.activatable { + border: none; + color: $dark_sidebar_fg; + + .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); } + + &:hover { background-color: transparentize($dark_sidebar_fg, 0.85); } + + &:selected, &:selected:hover, &:active:hover { + @extend %selected_items; + .sidebar-icon { color: inherit; } + } + } + + separator { color: transparent; } + + scrollbar { @extend %dark_sidebar_scrollbar } + } + + &.maximized placessidebar.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) > image { opacity: 0.5 }; + } +} + + +NemoWindow, +MarlinViewWindow { + + &.csd.background, + .source-list, .source-list.view, .source-list.view:hover { background-color: transparent; } + + .sidebar, .source-list.sidebar.view { + background-color: $dark_sidebar_bg; + + .view, row { + background-color: transparent; + color: $dark_sidebar_fg; + + &.cell:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } + + &.frame { + color: $dark_sidebar_fg; + } + + separator { color: transparent; } + + scrollbar { @extend %dark_sidebar_scrollbar } + } + &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } + +} + +NemoWindow.background > GtkGrid > paned > separator, +MarlinViewWindow.background > GtkBox > paned > separator { background-color: $dark_sidebar_border } + +// Fix Nautilus transparency issues +NautilusWindow NautilusWindowSlot { background-color: $base_color; } +NautilusDesktopWindow NautilusWindowSlot { background-color: transparent; } + +GtkFileChooserDialog { + + &.background.csd, &.background { background-color: $dark_sidebar_bg } + scrolledwindow.sidebar { background-color: transparent } + + // Yeah, this is ugly, but prevents a transparent background in the image preview box + paned > .vertical > .horizontal { background-color: $bg_color; } + + // fix for non gnome environments + .dialog-action-box { background-color: $bg_color } + + .dialog-vbox > .frame { + color: $dark_sidebar_fg; + border-color: transparent; + } + GtkFileChooserWidget > actionbar > revealer > .action-bar.frame { + background-color: transparent; + border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%)); + } + + GtkFileChooserWidget > actionbar > revealer > .action-bar.frame, + .dialog-vbox > .frame { + + button { @extend %dark_sidebar_button; } + entry { @extend %dark_sidebar_entry; } + + @extend %osd_check_radio; + + label, combobox { color: $dark_sidebar_fg; } + } +} + +// +// Paned Headerbars +// +FeedReaderreaderUI.background.csd, +GeditWindow.background.csd { + + > .titlebar .pane-separator, + &.maximized > .titlebar .pane-separator, + > .titlebar .pane-separator:backdrop, + &.maximized > .titlebar .pane-separator:backdrop { background-color: $header_border; } + + > .titlebar > headerbar.titlebar { + background-color: $header_bg; + + &:backdrop { background-color: $header_bg_backdrop; } + } + + &.maximized > .titlebar > headerbar.titlebar { + background-color: opacify($header_bg, 1); + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } +} + +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; +} + +// Gedit +GeditWindow.background { + &.csd { background-color: transparent; } + + .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } + .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } +} + +.gedit-bottom-panel-paned { background-color: $base_color; } + +.gedit-document-panel { + background-color: $dark_sidebar_bg; + + .maximized & { background-color: opacify($dark_sidebar_bg, 1); } + + row { color: $dark_sidebar_fg; } + + row { + background-color: transparentize($dark_sidebar_fg, 1); + border: solid transparentize($dark_sidebar_fg, 1); + border-width: 3px 2px 3px 2px; + } + row:hover { + border: solid transparentize($dark_sidebar_fg, 0.85); + border-width: 3px 2px 3px 2px; + background-color: transparentize($dark_sidebar_fg, 0.85); + } + row:active { + color: $selected_fg_color; + background-color: $selected_bg_color; + border: solid $selected_bg_color; + border-width: 3px 2px 3px 2px; + + button { color: $selected_fg_color; } + } + row:selected, row:selected:hover { + color: $selected_fg_color; + background-color: $selected_bg_color; + border: solid $selected_bg_color; + border-width: 3px 2px 3px 2px; + } + .prelight-row button:active { + color: $dark_sidebar_fg; + } +} + +GeditFileBrowserWidget { + background-color: $dark_sidebar_bg; + + .maximized & { background-color: opacify($dark_sidebar_bg, 1); } + + scrollbar { @extend %dark_sidebar_scrollbar; } + + .horizontal { + background-color: transparent; + border-color: darken($dark_sidebar_bg, 7%); + + button { @extend %dark_sidebar_button; } + combobox { color: $dark_sidebar_fg; } + } +} + +GeditWindow.background.csd GeditFileBrowserView.view { + + background-color: transparent; + color: $dark_sidebar_fg; + + &.expander { + color: $dark_sidebar_fg; + &:hover { color: $selected_bg_color; } + } +} + +%dark_sidebar_button { + @include button(osd); + + &:hover { @include button(osd-hover); } + &:active, &:checked { @include button(osd-active); } + &:disabled { @include button(osd-insensitive); } +} + +%dark_sidebar_entry { + @include entry(osd); + + &:focus { @include entry(osd-focus); } + &:disabled { @include entry(osd-insensitive); } +} + +%dark_sidebar_scrollbar { + + &.overlay-indicator:not(.dragging):not(.hovering) slider { + background-color: lighten($dark_sidebar_fg, 15%); + border: 1px solid transparentize(black, 0.7); + } + slider { + background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3); + + &:hover { background-color: lighten($dark_sidebar_fg, 20%); } + + &:hover:active { background-color: $selected_bg_color; } + + &:disabled { + background-color: transparent; + } + } + trough { + background-color: transparentize(black, 0.8); + border: none; + } +} -- cgit v1.2.3 From 75b37adf83773c02e0954fc4f9a532e0c73273dd Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 19 Feb 2016 11:06:17 +0100 Subject: re-enable some application styling --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 255 +++++++++------------ 1 file changed, 110 insertions(+), 145 deletions(-) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 3083f38..3734c75 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -1,32 +1,27 @@ -.titlebar separator { - color: $header_border; //fixes separator in gnome-tweak-tool -} - -NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar - -GtkFileChooserDialog *, -NautilusWindow *, -NemoWindow { - //-GtkPaned-handle-size: 0; -} - -@if $variant==dark { - GtkFileChooserDialog, - NautilusWindow , - NemoWindow { - .sidebar { border-right: 1px solid $dark_sidebar_border; } +//NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar - .sidebar:dir(rtl) { border-left: 1px solid $dark_sidebar_border; } - } +//GtkFileChooserDialog, +//NemoWindow, +.nautilus-window { + paned > separator { background: $dark_sidebar_bg; } } // Dark transparent sidebars -GtkFileChooserDialog, -NautilusWindow { +//GtkFileChooserDialog, +.nautilus-window { &.csd.background, placessidebar list { background-color: transparent; } placessidebar.sidebar { + + &:dir(ltr) { margin-right: -1px; } + &:dir(rtl) { margin-left: -1px; } + + @if $variant=='dark' { + &:dir(ltr) { border-right: 1px solid $dark_sidebar_border; } + &:dir(rtl) { border-left: 1px solid $dark_sidebar_border; } + } + background-color: $dark_sidebar_bg; row.sidebar-placeholder-row { border: 1px solid $selected_bg_color; } @@ -47,7 +42,7 @@ NautilusWindow { } } - separator { color: transparent; } + separator { background-color: transparent; } scrollbar { @extend %dark_sidebar_scrollbar } } @@ -65,112 +60,82 @@ NautilusWindow { } -NemoWindow, -MarlinViewWindow { - - &.csd.background, - .source-list, .source-list.view, .source-list.view:hover { background-color: transparent; } - - .sidebar, .source-list.sidebar.view { - background-color: $dark_sidebar_bg; - - .view, row { - background-color: transparent; - color: $dark_sidebar_fg; - - &.cell:selected { - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - - &.frame { - color: $dark_sidebar_fg; - } - - separator { color: transparent; } - - scrollbar { @extend %dark_sidebar_scrollbar } - } - &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } - -} +//NemoWindow, +//MarlinViewWindow { +// +// &.csd.background, +// .source-list, .source-list.view, .source-list.view:hover { background-color: transparent; } +// +// .sidebar, .source-list.sidebar.view { +// background-color: $dark_sidebar_bg; +// +// .view, row { +// background-color: transparent; +// color: $dark_sidebar_fg; +// +// &.cell:selected { +// background-color: $selected_bg_color; +// color: $selected_fg_color; +// } +// } +// +// &.frame { +// color: $dark_sidebar_fg; +// } +// +// separator { color: transparent; } +// +// scrollbar { @extend %dark_sidebar_scrollbar } +// } +// &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } +// +//} -NemoWindow.background > GtkGrid > paned > separator, -MarlinViewWindow.background > GtkBox > paned > separator { background-color: $dark_sidebar_border } +//NemoWindow.background > GtkGrid > paned > separator, +//MarlinViewWindow.background > GtkBox > paned > separator { background-color: $dark_sidebar_border } // Fix Nautilus transparency issues -NautilusWindow NautilusWindowSlot { background-color: $base_color; } -NautilusDesktopWindow NautilusWindowSlot { background-color: transparent; } - -GtkFileChooserDialog { - - &.background.csd, &.background { background-color: $dark_sidebar_bg } - scrolledwindow.sidebar { background-color: transparent } - - // Yeah, this is ugly, but prevents a transparent background in the image preview box - paned > .vertical > .horizontal { background-color: $bg_color; } - - // fix for non gnome environments - .dialog-action-box { background-color: $bg_color } - - .dialog-vbox > .frame { - color: $dark_sidebar_fg; - border-color: transparent; - } - GtkFileChooserWidget > actionbar > revealer > .action-bar.frame { - background-color: transparent; - border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%)); - } - - GtkFileChooserWidget > actionbar > revealer > .action-bar.frame, - .dialog-vbox > .frame { - - button { @extend %dark_sidebar_button; } - entry { @extend %dark_sidebar_entry; } - - @extend %osd_check_radio; - - label, combobox { color: $dark_sidebar_fg; } - } -} +//.nautilus-window NautilusWindowSlot { background-color: $base_color; } +//GtkFileChooserDialog { // -// Paned Headerbars +// &.background.csd, &.background { background-color: $dark_sidebar_bg } +// scrolledwindow.sidebar { background-color: transparent } // -FeedReaderreaderUI.background.csd, -GeditWindow.background.csd { - - > .titlebar .pane-separator, - &.maximized > .titlebar .pane-separator, - > .titlebar .pane-separator:backdrop, - &.maximized > .titlebar .pane-separator:backdrop { background-color: $header_border; } - - > .titlebar > headerbar.titlebar { - background-color: $header_bg; - - &:backdrop { background-color: $header_bg_backdrop; } - } - - &.maximized > .titlebar > headerbar.titlebar { - background-color: opacify($header_bg, 1); - - &:backdrop { background-color: opacify($header_bg_backdrop, 1); } - } -} - -FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; -} +// // Yeah, this is ugly, but prevents a transparent background in the image preview box +// paned > .vertical > .horizontal { background-color: $bg_color; } +// +// // fix for non gnome environments +// .dialog-action-box { background-color: $bg_color } +// +// .dialog-vbox > .frame { +// color: $dark_sidebar_fg; +// border-color: transparent; +// } +// GtkFileChooserWidget > actionbar > revealer > .action-bar.frame { +// background-color: transparent; +// border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%)); +// } +// +// GtkFileChooserWidget > actionbar > revealer > .action-bar.frame, +// .dialog-vbox > .frame { +// +// button { @extend %dark_sidebar_button; } +// entry { @extend %dark_sidebar_entry; } +// +// @extend %osd_check_radio; +// +// label, combobox { color: $dark_sidebar_fg; } +// } +//} // Gedit -GeditWindow.background { - &.csd { background-color: transparent; } - - .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } - .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } -} +//GeditWindow.background { +// &.csd { background-color: transparent; } +// +// .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } +// .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } +//} .gedit-bottom-panel-paned { background-color: $base_color; } @@ -210,32 +175,32 @@ GeditWindow.background { } } -GeditFileBrowserWidget { - background-color: $dark_sidebar_bg; - - .maximized & { background-color: opacify($dark_sidebar_bg, 1); } - - scrollbar { @extend %dark_sidebar_scrollbar; } - - .horizontal { - background-color: transparent; - border-color: darken($dark_sidebar_bg, 7%); - - button { @extend %dark_sidebar_button; } - combobox { color: $dark_sidebar_fg; } - } -} - -GeditWindow.background.csd GeditFileBrowserView.view { - - background-color: transparent; - color: $dark_sidebar_fg; +//GeditFileBrowserWidget { +// background-color: $dark_sidebar_bg; +// +// .maximized & { background-color: opacify($dark_sidebar_bg, 1); } +// +// scrollbar { @extend %dark_sidebar_scrollbar; } +// +// .horizontal { +// background-color: transparent; +// border-color: darken($dark_sidebar_bg, 7%); +// +// button { @extend %dark_sidebar_button; } +// combobox { color: $dark_sidebar_fg; } +// } +//} - &.expander { - color: $dark_sidebar_fg; - &:hover { color: $selected_bg_color; } - } -} +//GeditWindow.background.csd GeditFileBrowserView.view { +// +// background-color: transparent; +// color: $dark_sidebar_fg; +// +// &.expander { +// color: $dark_sidebar_fg; +// &:hover { color: $selected_bg_color; } +// } +//} %dark_sidebar_button { @include button(osd); -- cgit v1.2.3 From bf1be44a2c0bc8e8079fd516e0e6519a9bc87969 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 26 Feb 2016 00:10:22 +0100 Subject: updates --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 3734c75..ed3f0db 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -3,7 +3,12 @@ //GtkFileChooserDialog, //NemoWindow, .nautilus-window { - paned > separator { background: $dark_sidebar_bg; } + paned > separator { + background: $dark_sidebar_border; + + &:dir(ltr) { margin-left: -1px; } + &:dir(rtl) { margin-right: -1px; } + } } // Dark transparent sidebars @@ -14,14 +19,6 @@ placessidebar.sidebar { - &:dir(ltr) { margin-right: -1px; } - &:dir(rtl) { margin-left: -1px; } - - @if $variant=='dark' { - &:dir(ltr) { border-right: 1px solid $dark_sidebar_border; } - &:dir(rtl) { border-left: 1px solid $dark_sidebar_border; } - } - background-color: $dark_sidebar_bg; row.sidebar-placeholder-row { border: 1px solid $selected_bg_color; } @@ -49,14 +46,20 @@ &.maximized placessidebar.sidebar { background-color: opacify($dark_sidebar_bg, 1); } - .sidebar-button.button { + button.sidebar-button { color: $dark_sidebar_fg; &:hover { @include button(osd-hover); } - &:active { @include button(osd-active); } + &:active { @include button(active); } &:not(:hover):not(:active) > image { opacity: 0.5 }; } + + searchbar { + // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=724096 + border-color: transparent; + box-shadow: inset 0 -1px $borders_color; + } } -- cgit v1.2.3 From acdba71700a71a7042cab93f8a0649086b34ea40 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 3 Mar 2016 16:55:05 +0100 Subject: tweak nautilus searchbar --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 6 ------ 1 file changed, 6 deletions(-) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index ed3f0db..26238af 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -54,12 +54,6 @@ &:not(:hover):not(:active) > image { opacity: 0.5 }; } - - searchbar { - // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=724096 - border-color: transparent; - box-shadow: inset 0 -1px $borders_color; - } } -- cgit v1.2.3 From 0c833c9a23993c69d2700723694e0781b0ac26b3 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Tue, 8 Mar 2016 12:18:14 +0100 Subject: cleanup --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 26238af..0a0dfab 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -91,9 +91,6 @@ //NemoWindow.background > GtkGrid > paned > separator, //MarlinViewWindow.background > GtkBox > paned > separator { background-color: $dark_sidebar_border } -// Fix Nautilus transparency issues -//.nautilus-window NautilusWindowSlot { background-color: $base_color; } - //GtkFileChooserDialog { // // &.background.csd, &.background { background-color: $dark_sidebar_bg } @@ -127,13 +124,6 @@ //} // Gedit -//GeditWindow.background { -// &.csd { background-color: transparent; } -// -// .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } -// .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } -//} - .gedit-bottom-panel-paned { background-color: $base_color; } .gedit-document-panel { -- cgit v1.2.3 From c5e9156df500fd123e4964a2495c2f6d95996a4f Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 10 Mar 2016 17:05:42 +0100 Subject: more nautilus fixes --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 0a0dfab..1e8177c 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -46,7 +46,7 @@ &.maximized placessidebar.sidebar { background-color: opacify($dark_sidebar_bg, 1); } - button.sidebar-button { + row:not(:selected) button.sidebar-button { color: $dark_sidebar_fg; &:hover { @include button(osd-hover); } -- cgit v1.2.3 From 866ae993eb6b3009e0849c7a67c41672e3c59b9c Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Mar 2016 00:02:11 +0100 Subject: update gedit style --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 69 ++++++---------------- 1 file changed, 17 insertions(+), 52 deletions(-) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 1e8177c..42d08a4 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -131,64 +131,29 @@ .maximized & { background-color: opacify($dark_sidebar_bg, 1); } - row { color: $dark_sidebar_fg; } - row { + color: $dark_sidebar_fg; background-color: transparentize($dark_sidebar_fg, 1); - border: solid transparentize($dark_sidebar_fg, 1); - border-width: 3px 2px 3px 2px; - } - row:hover { - border: solid transparentize($dark_sidebar_fg, 0.85); - border-width: 3px 2px 3px 2px; - background-color: transparentize($dark_sidebar_fg, 0.85); - } - row:active { - color: $selected_fg_color; - background-color: $selected_bg_color; - border: solid $selected_bg_color; - border-width: 3px 2px 3px 2px; - button { color: $selected_fg_color; } - } - row:selected, row:selected:hover { - color: $selected_fg_color; - background-color: $selected_bg_color; - border: solid $selected_bg_color; - border-width: 3px 2px 3px 2px; - } - .prelight-row button:active { - color: $dark_sidebar_fg; + &:hover { + background-color: transparentize($dark_sidebar_fg, 0.85); + } + &:active { + color: $selected_fg_color; + background-color: $selected_bg_color; + + button { color: $selected_fg_color; } + } + &:selected, &:selected:hover { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + &:hover:not(:selected) button:active { + color: $dark_sidebar_fg; + } } } -//GeditFileBrowserWidget { -// background-color: $dark_sidebar_bg; -// -// .maximized & { background-color: opacify($dark_sidebar_bg, 1); } -// -// scrollbar { @extend %dark_sidebar_scrollbar; } -// -// .horizontal { -// background-color: transparent; -// border-color: darken($dark_sidebar_bg, 7%); -// -// button { @extend %dark_sidebar_button; } -// combobox { color: $dark_sidebar_fg; } -// } -//} - -//GeditWindow.background.csd GeditFileBrowserView.view { -// -// background-color: transparent; -// color: $dark_sidebar_fg; -// -// &.expander { -// color: $dark_sidebar_fg; -// &:hover { color: $selected_bg_color; } -// } -//} - %dark_sidebar_button { @include button(osd); -- cgit v1.2.3 From c73bd06f590e6d249de9f79aa8e1d8d36bb6f115 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Mar 2016 12:11:31 +0100 Subject: fix a thing --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 42d08a4..3390c96 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -31,6 +31,7 @@ .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); } + &.has-open-popup, &:hover { background-color: transparentize($dark_sidebar_fg, 0.85); } &:selected, &:selected:hover, &:active:hover { -- cgit v1.2.3 From bb58312bdc5f94c9d63881287a21ab73ae510e98 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Tue, 22 Mar 2016 12:24:30 +0100 Subject: lots of fixes --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 3390c96..5dd29cf 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -21,22 +21,26 @@ background-color: $dark_sidebar_bg; - row.sidebar-placeholder-row { border: 1px solid $selected_bg_color; } - - row.sidebar-new-bookmark-row { background-color: lighten($dark_sidebar_bg, 10%); } + row.sidebar-new-bookmark-row { + &, image { color: $selected_bg_color; } + } - row.activatable { + row { border: none; color: $dark_sidebar_fg; - .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); } + &:not(:selected):not(:disabled):not(:active):not(.sidebar-new-bookmark-row) { + .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); } + } &.has-open-popup, &:hover { background-color: transparentize($dark_sidebar_fg, 0.85); } + &:disabled { + &, label, image { color: transparentize($dark_sidebar_fg, 0.6); } + } &:selected, &:selected:hover, &:active:hover { @extend %selected_items; - .sidebar-icon { color: inherit; } } } -- cgit v1.2.3 From c796620e8ab8744e9ce08eccc796b1e9a1c9d97f Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 23 Mar 2016 15:07:19 +0100 Subject: fixes --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 5dd29cf..11722bf 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -21,26 +21,39 @@ background-color: $dark_sidebar_bg; - row.sidebar-new-bookmark-row { - &, image { color: $selected_bg_color; } - } - row { border: none; color: $dark_sidebar_fg; - &:not(:selected):not(:disabled):not(:active):not(.sidebar-new-bookmark-row) { - .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); } - } + .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); } &.has-open-popup, &:hover { background-color: transparentize($dark_sidebar_fg, 0.85); } + &:disabled { &, label, image { color: transparentize($dark_sidebar_fg, 0.6); } } + &:selected.has-open-popup, &:selected, &:selected:hover, &:active:hover { @extend %selected_items; + + .sidebar-icon { color: inherit; } + } + + &.sidebar-new-bookmark-row { + color: $selected_bg_color; + + .sidebar-icon { color: inherit; } + } + + &:drop(active):not(:disabled) { + &, label, .sidebar-icon { color: $drop_target_color; } + + &:selected { + &, label, .sidebar-icon { color: $selected_fg_color; } + background-color: $drop_target_color; + } } } -- cgit v1.2.3 From 73dabfebd980f9fa8417e7072a3ad4394a62666a Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 23 Mar 2016 22:13:21 +0100 Subject: bring back dark sidebars in filechooser dialog --- common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 53 ++++++++-------------- 1 file changed, 19 insertions(+), 34 deletions(-) (limited to 'common/gtk-3.0/3.20/sass/_transparent_widgets.scss') diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 11722bf..0a39e43 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -1,18 +1,19 @@ //NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar -//GtkFileChooserDialog, //NemoWindow, .nautilus-window { paned > separator { - background: $dark_sidebar_border; + background-image: linear-gradient(to top, $dark_sidebar_border); &:dir(ltr) { margin-left: -1px; } &:dir(rtl) { margin-right: -1px; } } } +filechooser paned > separator { background-image: linear-gradient(to top, $dark_sidebar_border); } + // Dark transparent sidebars -//GtkFileChooserDialog, +filechooser, .nautilus-window { &.csd.background, placessidebar list { background-color: transparent; } @@ -109,37 +110,21 @@ //NemoWindow.background > GtkGrid > paned > separator, //MarlinViewWindow.background > GtkBox > paned > separator { background-color: $dark_sidebar_border } -//GtkFileChooserDialog { -// -// &.background.csd, &.background { background-color: $dark_sidebar_bg } -// scrolledwindow.sidebar { background-color: transparent } -// -// // Yeah, this is ugly, but prevents a transparent background in the image preview box -// paned > .vertical > .horizontal { background-color: $bg_color; } -// -// // fix for non gnome environments -// .dialog-action-box { background-color: $bg_color } -// -// .dialog-vbox > .frame { -// color: $dark_sidebar_fg; -// border-color: transparent; -// } -// GtkFileChooserWidget > actionbar > revealer > .action-bar.frame { -// background-color: transparent; -// border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%)); -// } -// -// GtkFileChooserWidget > actionbar > revealer > .action-bar.frame, -// .dialog-vbox > .frame { -// -// button { @extend %dark_sidebar_button; } -// entry { @extend %dark_sidebar_entry; } -// -// @extend %osd_check_radio; -// -// label, combobox { color: $dark_sidebar_fg; } -// } -//} +filechooser { + + actionbar { + color: $dark_sidebar_fg; + background-color: $dark_sidebar_bg; + border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%)); + + button { @extend %dark_sidebar_button; } + entry { @extend %dark_sidebar_entry; } + + @extend %osd_check_radio; + + label, combobox { color: $dark_sidebar_fg; } + } +} // Gedit .gedit-bottom-panel-paned { background-color: $base_color; } -- cgit v1.2.3