mirrors/Simplewaita
1
0
Fork 0
mirror of https://git.disroot.org/eudaimon/Simplewaita.git synced 2026-03-10 04:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Even more gtk4 and libadwaita improvements

Browse source
This commit is contained in:
eudaimon 2024-01-23 12:05:42 +01:00
parent 0bdbbfddbf
commit 18fe83e839
7 changed files with 72 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/common/desktops.scss
View file

@ -67,9 +67,6 @@ XfdesktopIconView.view:active {
padding: 0;
margin: 0;
}
scrolledwindow columnview {
padding-right: 1em;
}
row {
margin: 0;
}

2
source/gtk3/_common.scss
View file

@ -611,7 +611,7 @@ button {
&.image-button { min-width: 34px; }
color: $osd_fg_color;
border-radius: 0;
border-radius: $button_radius;
@include button(osd);

4
source/gtk3/gtk-new.css
View file

@ -202,7 +202,7 @@ row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(di
row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected calendar.flat.button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop { color: #EDF0F5; }
calendar.osd.button, button.osd { min-width: 26px; min-height: 32px; color: #66cbec; border-radius: 0; border-width: 2px; color: #66cbec; background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; box-shadow: none; }
calendar.osd.button, button.osd { min-width: 26px; min-height: 32px; color: #66cbec; border-radius: 0px; border-width: 2px; color: #66cbec; background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; box-shadow: none; }
calendar.osd.image-button.button, button.osd.image-button { min-width: 34px; }
@ -1538,8 +1538,6 @@ 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; }

27
source/gtk4/_common.scss
View file

@ -337,6 +337,7 @@ entry {
// entry error and warning style
@each $e_type, $e_color in (error, $error_color),
(success, $success_color),
(warning, $warning_color) {
&.#{$e_type} {
color: $e_color;
@ -397,6 +398,9 @@ entry {
&.error { color: $error_color; }
.linked & {
margin: 0; //for libadwaita
}
}
treeview entry {
@ -584,7 +588,7 @@ button {
}
color: $osd_fg_color;
border-radius: 5px;
border-radius: $button_radius;
@include button(osd);
@ -758,7 +762,7 @@ button {
}
%linked_not_right {
border-right-style: none;
//border-right-style: none;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
@ -774,6 +778,7 @@ button {
&:not(:first-child) { @extend %linked_not_right; }
&:not(:last-child) { @extend %linked_not_left; }
}
margin: 0;
}
%linked_not_top {
@ -782,12 +787,13 @@ button {
}
%linked_not_bottom {
border-bottom-style: none;
//border-bottom-style: none;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
%linked_vertical {
margin: 0;
&:not(:first-child) { @extend %linked_not_top; }
&:not(:last-child) { @extend %linked_not_bottom; }
@ -2289,6 +2295,7 @@ treeview.view radio:selected { &:selected, &:focus, & { @extend %radio; }} // Th
border: $border_width solid;// $borders_color;
@include relief($dark_fill, sunken);
outline: none; //cancelling libadwaita
border-radius: $button_radius;
//padding:1px;
//headerbar & { background-color: darken($dark_fill,8%); } //3504
@ -2347,6 +2354,7 @@ scale {
// those are inside the trough node, I need them to show their own border over the trough one, so negative margin
> trough {
transition: $focus_transition;
border-radius: $button_radius;
//> fill,
//> highlight { margin: -1px; }
@ -2414,6 +2422,7 @@ scale {
border-width: $border_width;
border-style: solid;
border-radius: $button_radius;
box-shadow: none; //overwriting adwaita
@include button(normal);
&:hover { @include button(hover); }
@ -2770,6 +2779,12 @@ separator {
/*********
* Lists *
*********/
// this is to prevent transient scrollbars to appear on top of content (or even controls!)
scrolledwindow > viewport {
padding-right: 1em;
}
listview,
list {
color: $text_color;
@ -2792,9 +2807,9 @@ list {
&.separators:not(.horizontal) > row:not(.separator) {
//border-bottom: 1px solid $_treeview_borders_color;
}
scrolledwindow & {
padding-right: 1em;
}
//scrolledwindow & {
// padding-right: 1em;
//}
}

34
source/gtk4/gtk-new.css
View file

@ -170,6 +170,16 @@ spinbutton.vertical > text.error:focus-within, spinbutton.error:focus-within:not
spinbutton.vertical > text.error > selection, spinbutton.error:not(.vertical) > selection, entry.error > selection { background-color: #CC0000; }
spinbutton.vertical > text.success, spinbutton.success:not(.vertical), entry.success { color: #33d17a; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; }
spinbutton.vertical > text.success, spinbutton.success:not(.vertical), entry.success { outline: 0 solid transparent; outline-offset: 4px; }
spinbutton.vertical > text.success:focus-within, spinbutton.success:focus-within:not(.vertical), entry.success:focus-within { outline-color: transparent; outline-width: 0; outline-offset: -2px; }
spinbutton.vertical > text.success:focus-within, spinbutton.success:focus-within:not(.vertical), entry.success:focus-within { background-color: #323232; border-left-color: #279e5c; border-top-color: #279e5c; border-right-color: #9be8be; border-bottom-color: #9be8be; }
spinbutton.vertical > text.success > selection, spinbutton.success:not(.vertical) > selection, entry.success > selection { background-color: #33d17a; }
spinbutton.vertical > text.warning, spinbutton.warning:not(.vertical), entry.warning { color: #f57900; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; }
spinbutton.vertical > text.warning, spinbutton.warning:not(.vertical), entry.warning { outline: 0 solid transparent; outline-offset: 4px; }
@ -202,6 +212,8 @@ spinbutton.vertical > text progress > trough > progress, spinbutton:not(.vertica
spinbutton.vertical > text.error, spinbutton.error:not(.vertical), entry.error { color: #CC0000; }
.linked spinbutton.vertical > text, .linked spinbutton:not(.vertical), .linked entry { margin: 0; }
treeview entry:focus-within:dir(rtl), treeview entry:focus-within:dir(ltr) { background-color: #323232; transition-property: color, background; }
treeview entry.flat, treeview entry { border-radius: 0; background-image: none; background-color: #323232; }
@ -254,7 +266,7 @@ dropdown:drop(active) button.combo, combobox:drop(active) button.combo, splitbut
row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled), row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled) { color: #d1ff96; border-color: transparent; }
button.osd { min-width: 26px; min-height: 32px; color: #66cbec; border-radius: 5px; border-width: 2px; color: #66cbec; background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; box-shadow: none; }
button.osd { min-width: 26px; min-height: 32px; color: #66cbec; border-radius: 0px; border-width: 2px; color: #66cbec; background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; box-shadow: none; }
button.osd.image-button { min-width: 30px; }
@ -350,11 +362,15 @@ stacksidebar row.needs-attention > label:dir(rtl), stackswitcher > button.needs-
.linked:not(.vertical) > filechooserbutton > combobox:dir(rtl):not(:last-child) > box > button.combo, .linked:not(.vertical) > appchooserbutton > combobox:dir(rtl):not(:last-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(rtl):not(:last-child) > box > button.combo, .linked:not(.vertical) > filechooserbutton > combobox:dir(ltr):not(:first-child) > box > button.combo, .linked:not(.vertical) > appchooserbutton > combobox:dir(ltr):not(:first-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(ltr):not(:first-child) > box > button.combo, dropdown.linked button:nth-child(2):dir(ltr), combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > menubutton:dir(rtl):not(:last-child) > button, .linked:not(.vertical) > dropdown:dir(rtl):not(:last-child) > button, .linked:not(.vertical) > colorbutton:dir(rtl):not(:last-child) > button, .linked:not(.vertical) > fontbutton:dir(rtl):not(:last-child) > button, .linked:not(.vertical) > filechooserbutton:dir(rtl):not(:last-child) > button, .linked:not(.vertical) > menubutton:dir(ltr):not(:first-child) > button, .linked:not(.vertical) > dropdown:dir(ltr):not(:first-child) > button, .linked:not(.vertical) > colorbutton:dir(ltr):not(:first-child) > button, .linked:not(.vertical) > fontbutton:dir(ltr):not(:first-child) > button, .linked:not(.vertical) > filechooserbutton:dir(ltr):not(:first-child) > button, .linked:not(.vertical) > button:dir(rtl):not(:last-child), .linked:not(.vertical) > button:dir(ltr):not(:first-child) { border-top-left-radius: 0; border-bottom-left-radius: 0; }
.linked:not(.vertical) > filechooserbutton > combobox:dir(rtl):not(:first-child) > box > button.combo, .linked:not(.vertical) > appchooserbutton > combobox:dir(rtl):not(:first-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(rtl):not(:first-child) > box > button.combo, .linked:not(.vertical) > filechooserbutton > combobox:dir(ltr):not(:last-child) > box > button.combo, .linked:not(.vertical) > appchooserbutton > combobox:dir(ltr):not(:last-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(ltr):not(:last-child) > box > button.combo, dropdown.linked button:nth-child(2):dir(rtl), combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > menubutton:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > dropdown:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > colorbutton:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > fontbutton:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > filechooserbutton:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > menubutton:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > dropdown:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > colorbutton:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > fontbutton:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > filechooserbutton:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > button:dir(rtl):not(:first-child), .linked:not(.vertical) > button:dir(ltr):not(:last-child) { border-right-style: none; border-top-right-radius: 0; border-bottom-right-radius: 0; }
.linked:not(.vertical) > filechooserbutton > combobox:dir(rtl):not(:first-child) > box > button.combo, .linked:not(.vertical) > appchooserbutton > combobox:dir(rtl):not(:first-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(rtl):not(:first-child) > box > button.combo, .linked:not(.vertical) > filechooserbutton > combobox:dir(ltr):not(:last-child) > box > button.combo, .linked:not(.vertical) > appchooserbutton > combobox:dir(ltr):not(:last-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(ltr):not(:last-child) > box > button.combo, dropdown.linked button:nth-child(2):dir(rtl), combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > menubutton:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > dropdown:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > colorbutton:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > fontbutton:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > filechooserbutton:dir(rtl):not(:first-child) > button, .linked:not(.vertical) > menubutton:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > dropdown:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > colorbutton:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > fontbutton:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > filechooserbutton:dir(ltr):not(:last-child) > button, .linked:not(.vertical) > button:dir(rtl):not(:first-child), .linked:not(.vertical) > button:dir(ltr):not(:last-child) { border-top-right-radius: 0; border-bottom-right-radius: 0; }
.linked:not(.vertical) > button { margin: 0; }
.linked.vertical > filechooserbutton > combobox:not(:first-child) > box > button.combo, .linked.vertical > appchooserbutton > combobox:not(:first-child) > box > button.combo, .linked.vertical > combobox:not(:first-child) > box > button.combo, .linked.vertical > menubutton:not(:first-child) > button, .linked.vertical > dropdown:not(:first-child) > button, .linked.vertical > colorbutton:not(:first-child) > button, .linked.vertical > fontbutton:not(:first-child) > button, .linked.vertical > filechooserbutton:not(:first-child) > button, .linked.vertical > button:not(:first-child) { border-top-left-radius: 0; border-top-right-radius: 0; }
.linked.vertical > filechooserbutton > combobox:not(:last-child) > box > button.combo, .linked.vertical > appchooserbutton > combobox:not(:last-child) > box > button.combo, .linked.vertical > combobox:not(:last-child) > box > button.combo, .linked.vertical > menubutton:not(:last-child) > button, .linked.vertical > dropdown:not(:last-child) > button, .linked.vertical > colorbutton:not(:last-child) > button, .linked.vertical > fontbutton:not(:last-child) > button, .linked.vertical > filechooserbutton:not(:last-child) > button, .linked.vertical > button:not(:last-child) { border-bottom-style: none; border-bottom-left-radius: 0; border-bottom-right-radius: 0; }
.linked.vertical > filechooserbutton > combobox:not(:last-child) > box > button.combo, .linked.vertical > appchooserbutton > combobox:not(:last-child) > box > button.combo, .linked.vertical > combobox:not(:last-child) > box > button.combo, .linked.vertical > menubutton:not(:last-child) > button, .linked.vertical > dropdown:not(:last-child) > button, .linked.vertical > colorbutton:not(:last-child) > button, .linked.vertical > fontbutton:not(:last-child) > button, .linked.vertical > filechooserbutton:not(:last-child) > button, .linked.vertical > button:not(:last-child) { border-bottom-left-radius: 0; border-bottom-right-radius: 0; }
.linked.vertical > button { margin: 0; }
.scale-popup button:hover, button.link, button.link:hover, button.link:active, button.link:checked, modelbutton.flat:not(:hover):not(:active):not(:checked):not(:disabled) { background-color: transparent; background-image: none; border-color: transparent; text-shadow: none; -gtk-icon-shadow: none; }
@ -1053,7 +1069,7 @@ treeview.view radio:indeterminate:selected, radio:indeterminate { -gtk-icon-sour
treeview.view check:selected:focus, treeview.view check:selected, treeview.view radio:selected:focus, treeview.view radio:selected { color: #d1ff96; }
/************ GtkScale * */
levelbar > trough, progressbar > trough, scale > trough > fill, scale > trough { border: 2px solid; background-color: #323131; border-left-color: #1e1d1d; border-top-color: #1e1d1d; border-right-color: #5a5959; border-bottom-color: #5a5959; outline: none; }
levelbar > trough, progressbar > trough, scale > trough > fill, scale > trough { border: 2px solid; background-color: #323131; border-left-color: #1e1d1d; border-top-color: #1e1d1d; border-right-color: #5a5959; border-bottom-color: #5a5959; outline: none; border-radius: 0px; }
levelbar > trough:disabled, progressbar > trough:disabled, scale > trough > fill:disabled, scale > trough:disabled { background-color: #493e37; border-left-color: #2e2722; border-top-color: #2e2722; border-right-color: #776e69; border-bottom-color: #776e69; }
@ -1071,7 +1087,7 @@ scale > trough { outline: 0 solid transparent; outline-offset: 16px; }
scale:focus:focus-visible > trough { outline-color: transparent; outline-width: 0; outline-offset: 10px; }
scale > trough { transition: none; }
scale > trough { transition: none; border-radius: 0px; }
scale.fine-tune > trough > slider, scale.fine-tune > trough > slider:active, scale.fine-tune > trough > slider:hover, scale.fine-tune > trough > slider:focus { background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; }
@ -1079,7 +1095,7 @@ scale > trough > fill { background-color: #4c6519; }
scale > trough > fill:disabled { background-color: #3e3834; }
scale > trough > slider { min-height: 18px; min-width: 18px; margin: -7px; border-width: 2px; border-style: solid; border-radius: 0px; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; }
scale > trough > slider { min-height: 18px; min-width: 18px; margin: -7px; border-width: 2px; border-style: solid; border-radius: 0px; box-shadow: none; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; }
scale > trough > slider:hover { border-width: 2px; background-color: #5a6659; border-left-color: #989f97; border-top-color: #989f97; border-right-color: #3e463d; border-bottom-color: #3e463d; }
@ -1245,6 +1261,8 @@ button separator { background-color: #4e584d; border-left-color: #878e87; border
button:checked separator { background-color: #669900; border-left-color: #94b84d; border-top-color: #94b84d; border-right-color: #426300; border-bottom-color: #426300; }
/********* Lists * */
scrolledwindow > viewport { padding-right: 1em; }
listview, list { color: #EDF0F5; background-color: #323232; border-color: #252525; border-radius: 0; box-shadow: none; }
listview > row:first-child, listview row:last-child, list > row:first-child, list row:last-child { border-radius: 0; }
@ -1257,8 +1275,6 @@ 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; }
@ -1689,8 +1705,6 @@ 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; }