From 0bdbbfddbf6f68c5dc4cacd7a43f89eef28face2 Mon Sep 17 00:00:00 2001 From: eudaimon Date: Tue, 23 Jan 2024 11:31:21 +0100 Subject: [PATCH] Other libadwaita improvements --- gtk-3.0/gtk.css | 6 ++++-- gtk-4.0/gtk.css | 18 +++++++++--------- source/common/common_common.scss | 7 +------ source/common/desktops.scss | 11 ++++++++++- source/gtk3/gtk-new.css | 6 ++++-- source/gtk4/_common.scss | 23 +++++++++++++++++------ source/gtk4/gtk-new.css | 18 +++++++++--------- 7 files changed, 54 insertions(+), 35 deletions(-) diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 8c0fef7..d07ec15 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -9,8 +9,6 @@ label:disabled selection, .selection-mode button.titlebutton:disabled, label:dis .selection-mode button.titlebutton:backdrop, label:backdrop:selected, calendar:backdrop:selected, row:backdrop:selected, treeview.view:backdrop:selected, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, .entry:backdrop:selected, spinbutton:not(.vertical) selection:backdrop, entry selection:backdrop, flowbox flowboxchild:backdrop:selected, .view text selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop:focus, textview text selection:backdrop, .view:backdrop:selected, iconview:backdrop:selected, .view text:backdrop:selected, iconview text:backdrop:selected, textview text:backdrop:selected { color: #d1ff96; background-color: #669900; } -.nemo-desktop-window stack { background: none; border: none; } - * { padding: 0; -GtkToolButton-icon-spacing: 4; -GtkTextView-error-underline-color: #CC0000; -GtkScrolledWindow-scrollbar-spacing: 0; -GtkToolItemGroup-expander-size: 11; -GtkWidget-text-handle-width: 20; -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 0px; -gtk-secondary-caret-color: #669900; } /*************** Base States * */ @@ -1530,6 +1528,8 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co .nemo-desktop-window notebook { border: none; } +.nemo-desktop-window stack { background: none; border: none; } + .nautilus-window .top-bar { background-color: #507800; color: #d1ff96; } .nautilus-window .top-bar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; } @@ -1538,6 +1538,8 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co .nautilus-window .nautilus-list-view columnview, .nautilus-window .nautilus-list-view listview, .nautilus-window .nautilus-list-view cell { padding: 0; margin: 0; } +.nautilus-window .nautilus-list-view scrolledwindow columnview { padding-right: 1em; } + .nautilus-window .nautilus-list-view row { margin: 0; } #NautilusPathBar button, #NautilusPathBar menubutton { margin: 0; } diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css index 8ff96ec..1ba539f 100644 --- a/gtk-4.0/gtk.css +++ b/gtk-4.0/gtk.css @@ -16,8 +16,6 @@ label:disabled > selection, label:disabled:selected, calendar > grid > label.day label:backdrop:selected, calendar > grid > label.day-number:backdrop:selected, row:backdrop:selected, columnview.view:backdrop:selected, treeview.view:backdrop:selected, modelbutton.flat:backdrop:selected, modelbutton.flat:backdrop:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop), modelbutton.flat:backdrop:focus:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop), .entry:backdrop:selected, gridview > child:backdrop:selected, flowbox > flowboxchild:backdrop:selected, .view:backdrop:selected, iconview:backdrop:selected, textview > text:backdrop:selected { color: #d1ff96; background-color: #669900; } -.nemo-desktop-window stack { background: none; border: none; } - /*************** Base States * */ .background { color: #EDF0F5; background-color: #3f3e3e; } @@ -934,7 +932,7 @@ notebook:focus:focus-visible > header > tabs > tab:checked { outline-color: tran /************** Scrollbars * */ scrollbar { border: 2px solid; background-color: #393838; border-left-color: #232222; border-top-color: #232222; border-right-color: #656464; border-bottom-color: #656464; transition: none; } -scrollbar > range > trough > slider { padding: 0; background-image: none; min-width: 10px; min-height: 10px; border: 2px solid; border-radius: 0px; outline: none; background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; } +scrollbar > range > trough > slider { padding: 0; margin: 0; background-image: none; min-width: 10px; min-height: 10px; border: 2px solid; border-radius: 0px; outline: none; background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; } scrollbar > range > trough > slider:hover { background-color: #5e675e; border-left-color: #9ca29c; border-top-color: #9ca29c; border-right-color: #414741; border-bottom-color: #414741; } @@ -942,7 +940,7 @@ scrollbar > range > trough > slider:hover:active { background-color: #88cc00; bo scrollbar > range > trough > slider:disabled { background-color: #493e37; border-left-color: #776e69; border-top-color: #776e69; border-right-color: #2e2722; border-bottom-color: #2e2722; } -scrollbar > range > trough { outline: none; } +scrollbar > range > trough { outline: none; margin: 0; padding: 0; } scrollbar > range { outline: none; } @@ -1259,6 +1257,8 @@ listview > row.expander .row-header, list > row.expander .row-header { padding: listview.horizontal row.separator, list.horizontal row.separator { border-left: 1px solid #575859; } +scrolledwindow listview, scrolledwindow list { padding-right: 1em; } + row { transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } row { outline: 0 solid transparent; outline-offset: 4px; } @@ -1281,10 +1281,6 @@ row:selected { outline-color: rgba(255, 255, 255, 0.3); } columnview > listview > row { padding: 0; } -columnview > listview > row > cell { padding: 2px; } - -columnview > listview > row > cell:not(:first-child) { border-left: 1px solid transparent; } - columnview.data-table > listview > row > cell { padding-top: 2px; padding-bottom: 2px; } treeexpander { border-spacing: 4px; } @@ -1391,7 +1387,7 @@ stacksidebar row.needs-attention > label { background-size: 6px 6px, 0 0; } separator.sidebar { background-color: #252525; } /********************** Navigation Sidebar * */ -.navigation-sidebar { padding: 1px 0; } +.navigation-sidebar { padding-top: 1px; padding-bottom: 1px; } .navigation-sidebar > separator { margin: 1px; } @@ -1683,6 +1679,8 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co .nemo-desktop-window notebook { border: none; } +.nemo-desktop-window stack { background: none; border: none; } + .nautilus-window .top-bar { background-color: #507800; color: #d1ff96; } .nautilus-window .top-bar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; } @@ -1691,6 +1689,8 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co .nautilus-window .nautilus-list-view columnview, .nautilus-window .nautilus-list-view listview, .nautilus-window .nautilus-list-view cell { padding: 0; margin: 0; } +.nautilus-window .nautilus-list-view scrolledwindow columnview { padding-right: 1em; } + .nautilus-window .nautilus-list-view row { margin: 0; } #NautilusPathBar button, #NautilusPathBar menubutton { margin: 0; } diff --git a/source/common/common_common.scss b/source/common/common_common.scss index eb899c7..e89a511 100644 --- a/source/common/common_common.scss +++ b/source/common/common_common.scss @@ -57,11 +57,6 @@ $popover_radius: $window_radius; } } -// To avoid a frame around the desktop in Cinnamon desktop - -.nemo-desktop-window stack { - background: none; - border: none; -} + diff --git a/source/common/desktops.scss b/source/common/desktops.scss index b22da63..eab81d9 100644 --- a/source/common/desktops.scss +++ b/source/common/desktops.scss @@ -37,11 +37,17 @@ XfdesktopIconView.view:active { } - +// To avoid a frame around the desktop in Cinnamon desktop .nemo-desktop-window notebook { border: none; } +.nemo-desktop-window stack { + background: none; + border: none; +} + +// Nautilus improvements .nautilus-window { .top-bar { background-color: $titlebar_active_bg; @@ -61,6 +67,9 @@ XfdesktopIconView.view:active { padding: 0; margin: 0; } + scrolledwindow columnview { + padding-right: 1em; + } row { margin: 0; } diff --git a/source/gtk3/gtk-new.css b/source/gtk3/gtk-new.css index 8c0fef7..d07ec15 100644 --- a/source/gtk3/gtk-new.css +++ b/source/gtk3/gtk-new.css @@ -9,8 +9,6 @@ label:disabled selection, .selection-mode button.titlebutton:disabled, label:dis .selection-mode button.titlebutton:backdrop, label:backdrop:selected, calendar:backdrop:selected, row:backdrop:selected, treeview.view:backdrop:selected, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, .entry:backdrop:selected, spinbutton:not(.vertical) selection:backdrop, entry selection:backdrop, flowbox flowboxchild:backdrop:selected, .view text selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop:focus, textview text selection:backdrop, .view:backdrop:selected, iconview:backdrop:selected, .view text:backdrop:selected, iconview text:backdrop:selected, textview text:backdrop:selected { color: #d1ff96; background-color: #669900; } -.nemo-desktop-window stack { background: none; border: none; } - * { padding: 0; -GtkToolButton-icon-spacing: 4; -GtkTextView-error-underline-color: #CC0000; -GtkScrolledWindow-scrollbar-spacing: 0; -GtkToolItemGroup-expander-size: 11; -GtkWidget-text-handle-width: 20; -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 0px; -gtk-secondary-caret-color: #669900; } /*************** Base States * */ @@ -1530,6 +1528,8 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co .nemo-desktop-window notebook { border: none; } +.nemo-desktop-window stack { background: none; border: none; } + .nautilus-window .top-bar { background-color: #507800; color: #d1ff96; } .nautilus-window .top-bar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; } @@ -1538,6 +1538,8 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co .nautilus-window .nautilus-list-view columnview, .nautilus-window .nautilus-list-view listview, .nautilus-window .nautilus-list-view cell { padding: 0; margin: 0; } +.nautilus-window .nautilus-list-view scrolledwindow columnview { padding-right: 1em; } + .nautilus-window .nautilus-list-view row { margin: 0; } #NautilusPathBar button, #NautilusPathBar menubutton { margin: 0; } diff --git a/source/gtk4/_common.scss b/source/gtk4/_common.scss index 480af00..0ad7d11 100644 --- a/source/gtk4/_common.scss +++ b/source/gtk4/_common.scss @@ -2012,7 +2012,7 @@ scrollbar { border: $border_width solid; @include relief($scrollbar_bg_color, sunken); - transition: $_scrollbar_transition; + transition: none; // scrollbar border //&.top { border-bottom: 1px solid $borders_color; } @@ -2023,6 +2023,7 @@ scrollbar { > range > trough > slider { //@extend %button_basic; padding: 0; + margin: 0; background-image: none; min-width: $_slider_width; @@ -2042,7 +2043,11 @@ scrollbar { &:disabled { @include relief($insensitive_bg_color); } } - > range > trough {outline: none;} //cancelling libadwaita + > range > trough { + outline: none; + margin: 0; + padding: 0; + } //cancelling libadwaita > range {outline: none;} //cancelling libadwaita > range.fine-tune { > trough > slider { @@ -2787,6 +2792,9 @@ list { &.separators:not(.horizontal) > row:not(.separator) { //border-bottom: 1px solid $_treeview_borders_color; } + scrolledwindow & { + padding-right: 1em; + } } @@ -2828,13 +2836,16 @@ columnview { // align horizontal sizing with header buttons > cell { - padding: 2px; + //padding: 2px; &:not(:first-child) { - border-left: 1px solid transparent; + //border-left: 1px solid transparent; } } } + // scrolledwindow & { + // padding-right: 1em; + // } // make column separators visible when :show-column-separators is true &.column-separators > listview > row > cell { @@ -3139,8 +3150,8 @@ separator.sidebar { **********************/ .navigation-sidebar { - padding: $menu-margin 0; //only vertical padding. horizontal row size would clip - + padding-top: $menu-margin; //only vertical padding. horizontal row size would clip + padding-bottom: $menu-margin; > separator { margin: $menu-margin; } diff --git a/source/gtk4/gtk-new.css b/source/gtk4/gtk-new.css index 8ff96ec..1ba539f 100644 --- a/source/gtk4/gtk-new.css +++ b/source/gtk4/gtk-new.css @@ -16,8 +16,6 @@ label:disabled > selection, label:disabled:selected, calendar > grid > label.day label:backdrop:selected, calendar > grid > label.day-number:backdrop:selected, row:backdrop:selected, columnview.view:backdrop:selected, treeview.view:backdrop:selected, modelbutton.flat:backdrop:selected, modelbutton.flat:backdrop:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop), modelbutton.flat:backdrop:focus:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop), .entry:backdrop:selected, gridview > child:backdrop:selected, flowbox > flowboxchild:backdrop:selected, .view:backdrop:selected, iconview:backdrop:selected, textview > text:backdrop:selected { color: #d1ff96; background-color: #669900; } -.nemo-desktop-window stack { background: none; border: none; } - /*************** Base States * */ .background { color: #EDF0F5; background-color: #3f3e3e; } @@ -934,7 +932,7 @@ notebook:focus:focus-visible > header > tabs > tab:checked { outline-color: tran /************** Scrollbars * */ scrollbar { border: 2px solid; background-color: #393838; border-left-color: #232222; border-top-color: #232222; border-right-color: #656464; border-bottom-color: #656464; transition: none; } -scrollbar > range > trough > slider { padding: 0; background-image: none; min-width: 10px; min-height: 10px; border: 2px solid; border-radius: 0px; outline: none; background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; } +scrollbar > range > trough > slider { padding: 0; margin: 0; background-image: none; min-width: 10px; min-height: 10px; border: 2px solid; border-radius: 0px; outline: none; background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; } scrollbar > range > trough > slider:hover { background-color: #5e675e; border-left-color: #9ca29c; border-top-color: #9ca29c; border-right-color: #414741; border-bottom-color: #414741; } @@ -942,7 +940,7 @@ scrollbar > range > trough > slider:hover:active { background-color: #88cc00; bo scrollbar > range > trough > slider:disabled { background-color: #493e37; border-left-color: #776e69; border-top-color: #776e69; border-right-color: #2e2722; border-bottom-color: #2e2722; } -scrollbar > range > trough { outline: none; } +scrollbar > range > trough { outline: none; margin: 0; padding: 0; } scrollbar > range { outline: none; } @@ -1259,6 +1257,8 @@ listview > row.expander .row-header, list > row.expander .row-header { padding: listview.horizontal row.separator, list.horizontal row.separator { border-left: 1px solid #575859; } +scrolledwindow listview, scrolledwindow list { padding-right: 1em; } + row { transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } row { outline: 0 solid transparent; outline-offset: 4px; } @@ -1281,10 +1281,6 @@ row:selected { outline-color: rgba(255, 255, 255, 0.3); } columnview > listview > row { padding: 0; } -columnview > listview > row > cell { padding: 2px; } - -columnview > listview > row > cell:not(:first-child) { border-left: 1px solid transparent; } - columnview.data-table > listview > row > cell { padding-top: 2px; padding-bottom: 2px; } treeexpander { border-spacing: 4px; } @@ -1391,7 +1387,7 @@ stacksidebar row.needs-attention > label { background-size: 6px 6px, 0 0; } separator.sidebar { background-color: #252525; } /********************** Navigation Sidebar * */ -.navigation-sidebar { padding: 1px 0; } +.navigation-sidebar { padding-top: 1px; padding-bottom: 1px; } .navigation-sidebar > separator { margin: 1px; } @@ -1683,6 +1679,8 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co .nemo-desktop-window notebook { border: none; } +.nemo-desktop-window stack { background: none; border: none; } + .nautilus-window .top-bar { background-color: #507800; color: #d1ff96; } .nautilus-window .top-bar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; } @@ -1691,6 +1689,8 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co .nautilus-window .nautilus-list-view columnview, .nautilus-window .nautilus-list-view listview, .nautilus-window .nautilus-list-view cell { padding: 0; margin: 0; } +.nautilus-window .nautilus-list-view scrolledwindow columnview { padding-right: 1em; } + .nautilus-window .nautilus-list-view row { margin: 0; } #NautilusPathBar button, #NautilusPathBar menubutton { margin: 0; }