Many changes

This commit is contained in:
eudaimon 2024-02-16 20:37:57 +01:00
parent 7768f5729c
commit fa76751964
8 changed files with 123 additions and 68 deletions

View File

@ -57,6 +57,11 @@ $popover_radius: $window_radius;
}
}
%draggable {
background-image: radial-gradient(circle closest-side, currentColor, currentColor 90%, transparent);
background-size: 2 * $border_width, 2 * $border_width;
background-repeat: no-repeat;
background-position: center;
}

View File

@ -46,10 +46,8 @@ XfdesktopIconView.view:active {
border: none;
}
// Nautilus improvements
.nautilus-window {
.top-bar {
// general libadwaita
.top-bar {
background-color: $titlebar_active_bg;
color: $titlebar_active_fg;
@ -58,29 +56,8 @@ XfdesktopIconView.view:active {
color: $titlebar_backdrop_fg;
transition: none;//$backdrop_transition;
}
.collapse-spacing {
padding: 0;
}
}
headerbar {
min-height: 2.7em;
}
.nautilus-list-view {
columnview, listview, cell {
margin: 0;
}
cell {padding: 0;}
row {margin: 0;}
}
}
#NautilusPathBar {
button, menubutton {
margin: 0;
}
}
windowhandle > box {
padding: 0;

View File

@ -14,6 +14,15 @@
#NautilusPathBar {
background: none;
border-radius: 0px;
button, menubutton {
margin: 0;
}
> scrolledwindow > viewport > box > box > label { // let's make the slashes disappear
opacity: 0;
margin: 0 -0.5em;
padding: 0;
}
}
.nautilus-list-view listview > row {
@ -25,3 +34,25 @@ margin: 0pX
border-radius: 0px;
& box { margin: 0px;}
}
// Nautilus improvements
.nautilus-window {
.collapse-spacing {
padding: 0;
}
headerbar {
min-height: 2.7em;
}
.nautilus-list-view {
columnview, listview, cell {
margin: 0;
}
cell {padding: 0;}
row {margin: 0;}
}
}

View File

@ -7,14 +7,18 @@ paned {
border-style: solid;
background-image: radial-gradient(circle closest-side, $fg_color 0%, $fg_color 75%, transparentize($fg_color, 1) 100%);
background-clip: padding-box;
//background-size: 2*$border_width + 2px 2*$border_width + 2px;
//background-size: 2*$border_width 2*$border_width + 2px;
background-repeat: no-repeat;
background-position: center;
box-shadow: none;
margin: 0;
padding: 0;
@include relief($bg_color);
&:selected { @include relief($selected_bg_color); } // FIXME is this needed?
&:hover {
background-color: mix($bg_color, $fg_color, 90%)
}
&.wide {
min-width: 5px;
min-height: 5px;

View File

@ -2219,6 +2219,7 @@ scrollbar {
background-image: none;
min-width: $_slider_width;
min-height: $_slider_width;
@extend %draggable;
//margin: 3px;
//border: 4px solid transparent;
//border-radius: 10px;
@ -2701,6 +2702,7 @@ scale {
border-width: $border_width;
border-style: solid;
border-radius: $button_radius;
@extend %draggable;
@include button(normal);
&:hover { @include button(hover); }
@ -2772,7 +2774,7 @@ scale {
}
//&.fine-tune indicator { min-height: ($_marks_length - 3px); }
&.marks-after {
&.marks-after, &.color {
slider{ border-radius: 5px 5px 100% 100%; min-width: 10px; padding: 0; margin-right: 5px; margin-left:5px;}}
&.marks-before {slider{ border-radius: 100% 100% 5px 5px;min-width: 10px;padding: 0;margin-right: 5px; margin-left:5px;}}
}
@ -2813,7 +2815,7 @@ scale {
}
slider {
&:dir(ltr), &:dir(rtl) { // specificity bumb
&:dir(ltr), &:dir(rtl) { // specificity bump
&:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
margin-bottom: -15px;
margin-top: 6px;
@ -3147,6 +3149,16 @@ expander {
}
}
// expander rows, maybe too much creative UI...?
.expander {
.expander-row-arrow {
color: inherit;
}
&:checked .expander-row-arrow {
color: $selected_bg_color;
}
}
/************
* Calendar *

View File

@ -9,6 +9,8 @@ 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; }
scale slider, scrollbar slider { background-image: radial-gradient(circle closest-side, currentColor, currentColor 90%, transparent); background-size: 4px, 4px; background-repeat: no-repeat; background-position: center; }
* { 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 * */
@ -557,12 +559,26 @@ window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #3f3
#NautilusPathBar { background: none; border-radius: 0px; }
#NautilusPathBar button, #NautilusPathBar menubutton { margin: 0; }
#NautilusPathBar > scrolledwindow > viewport > box > box > label { opacity: 0; margin: 0 -0.5em; padding: 0; }
.nautilus-list-view listview > row { border-radius: 0px; margin: 0pX; }
#NautilusViewCell { border-radius: 0px; }
#NautilusViewCell box { margin: 0px; }
.nautilus-window .collapse-spacing { padding: 0; }
.nautilus-window headerbar { min-height: 2.7em; }
.nautilus-window .nautilus-list-view columnview, .nautilus-window .nautilus-list-view listview, .nautilus-window .nautilus-list-view cell { margin: 0; }
.nautilus-window .nautilus-list-view cell { padding: 0; }
.nautilus-window .nautilus-list-view row { margin: 0; }
/************** Tree Views * */
treeview.view { border-left-color: #909194; border-top-color: #3f3e3e; }
@ -995,7 +1011,7 @@ scale.vertical marks.bottom { margin-left: 6px; margin-right: -12px; }
scale.horizontal indicator { min-height: 6px; min-width: 1px; }
scale.horizontal.marks-after slider { border-radius: 5px 5px 100% 100%; min-width: 10px; padding: 0; margin-right: 5px; margin-left: 5px; }
scale.horizontal.marks-after slider, scale.horizontal.color slider { border-radius: 5px 5px 100% 100%; min-width: 10px; padding: 0; margin-right: 5px; margin-left: 5px; }
scale.horizontal.marks-before slider { border-radius: 100% 100% 5px 5px; min-width: 10px; padding: 0; margin-right: 5px; margin-left: 5px; }
@ -1150,6 +1166,10 @@ expander title > arrow:disabled:backdrop { color: #493e37; }
expander title > arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
.expander .expander-row-arrow { color: inherit; }
.expander:checked .expander-row-arrow { color: #669900; }
/************ Calendar * */
calendar { color: #EDF0F5; border: 2px solid; background-color: #323232; border-left-color: #1e1e1e; border-top-color: #1e1e1e; border-right-color: #5a5a5a; border-bottom-color: #5a5a5a; }
@ -1245,10 +1265,12 @@ placesview row.activatable:hover { background-color: transparent; }
placesview > actionbar > revealer > box > label { padding-left: 8px; padding-right: 8px; }
/********* Paned * */
paned > separator { min-width: 4px; min-height: 4px; -gtk-icon-source: none; border-width: 2px; border-style: solid; background-image: radial-gradient(circle closest-side, #EDF0F5 0%, #EDF0F5 75%, rgba(237, 240, 245, 0) 100%); background-clip: padding-box; background-repeat: no-repeat; background-position: center; background-color: #3f3e3e; border-left-color: #6e6d6d; border-top-color: #6e6d6d; border-right-color: #272727; border-bottom-color: #272727; }
paned > separator { min-width: 4px; min-height: 4px; -gtk-icon-source: none; border-width: 2px; border-style: solid; background-image: radial-gradient(circle closest-side, #EDF0F5 0%, #EDF0F5 75%, rgba(237, 240, 245, 0) 100%); background-clip: padding-box; background-repeat: no-repeat; background-position: center; box-shadow: none; margin: 0; padding: 0; background-color: #3f3e3e; border-left-color: #6e6d6d; border-top-color: #6e6d6d; border-right-color: #272727; border-bottom-color: #272727; }
paned > separator:selected { background-color: #669900; border-left-color: #94b84d; border-top-color: #94b84d; border-right-color: #426300; border-bottom-color: #426300; }
paned > separator:hover { background-color: #505050; }
paned > separator.wide { min-width: 5px; min-height: 5px; }
paned.horizontal > separator.wide { margin: 0; padding: 0; }
@ -1539,21 +1561,9 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co
.nemo-desktop-window stack { background: none; border: none; }
.nautilus-window .top-bar { background-color: #507800; color: #d1ff96; }
.top-bar { background-color: #507800; color: #d1ff96; }
.nautilus-window .top-bar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; }
.nautilus-window .top-bar .collapse-spacing { padding: 0; }
.nautilus-window headerbar { min-height: 2.7em; }
.nautilus-window .nautilus-list-view columnview, .nautilus-window .nautilus-list-view listview, .nautilus-window .nautilus-list-view cell { margin: 0; }
.nautilus-window .nautilus-list-view cell { padding: 0; }
.nautilus-window .nautilus-list-view row { margin: 0; }
#NautilusPathBar button, #NautilusPathBar menubutton { margin: 0; }
.top-bar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; }
windowhandle > box { padding: 0; }

View File

@ -1233,6 +1233,7 @@ combobox {
margin: 8px 0;
> row.activatable {
&, &:not(:first-child):not(:last-child){
padding: 8px;
border-radius: 0px;
@ -1245,6 +1246,8 @@ combobox {
box-shadow: none;
}
}
}
}
}
@ -1840,6 +1843,9 @@ popover.background {
}
list separator { margin: 0; }
listview > row {
border-radius: 0;
}
}
.osd &,
@ -2059,6 +2065,7 @@ scrollbar {
//transition: $_scrollbar_transition;
outline: none; //cancelling libadwaita
@include relief($button_bg);
@extend %draggable;
&:hover { @include relief($scrollbar_slider_hover_color); }
@ -2440,6 +2447,7 @@ scale {
border-style: solid;
border-radius: $button_radius;
box-shadow: none; //overwriting adwaita
@extend %draggable;
@include button(normal);
&:hover { @include button(hover); }
@ -2503,7 +2511,7 @@ scale {
// indicator { min-height: ($_marks_length - 3px); }
//}
&.marks-after {slider{ border-radius: 5px 5px 100% 100%;min-width: 10px; padding: 0; margin-right: 5px; margin-left:5px;}}
&.marks-before {slider{ border-radius: 100% 100% 5px 5px;min-width: 10px; padding: 0; margin-right: 5px; margin-left:5px;}}
&.marks-before, &.color {slider{ border-radius: 100% 100% 5px 5px;min-width: 10px; padding: 0; margin-right: 5px; margin-left:5px;}}
}
@ -2529,7 +2537,7 @@ scale {
// indicator { min-height: ($_marks_length - 3px); }
// }
&.marks-after {slider{ border-radius: 5px 100% 100% 5px;min-height: 10px;padding: 0;margin-top: 54px; margin-bottom:5px;}}
&.marks-after, &.color {slider{ border-radius: 5px 100% 100% 5px;min-height: 10px;padding: 0;margin-top: 54px; margin-bottom:5px;}}
&.marks-before {slider{ border-radius: 100% 5px 5px 100%;min-height: 10px;padding: 0;margin-top: 5px; margin-bottom:5px;}}
}

View File

@ -16,6 +16,8 @@ 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; }
scale > trough > slider, scrollbar > range > trough > slider { background-image: radial-gradient(circle closest-side, currentColor, currentColor 90%, transparent); background-size: 4px, 4px; background-repeat: no-repeat; background-position: center; }
/*************** Base States * */
.background { color: #EDF0F5; background-color: #3f3e3e; }
@ -501,9 +503,9 @@ dropdown popover, combobox popover { margin-top: 6px; padding: 0; }
dropdown popover listview, combobox popover listview { margin: 8px 0; }
dropdown popover listview > row.activatable, combobox popover listview > row.activatable { padding: 8px; border-radius: 0px; }
dropdown popover listview > row.activatable, dropdown popover listview > row.activatable:not(:first-child):not(:last-child), combobox popover listview > row.activatable, combobox popover listview > row.activatable:not(:first-child):not(:last-child) { padding: 8px; border-radius: 0px; }
dropdown popover listview > row.activatable:selected, dropdown popover listview > row.activatable:selected:hover, combobox popover listview > row.activatable:selected, combobox popover listview > row.activatable:selected:hover { outline-color: rgba(255, 255, 255, 0.3); color: #d1ff96; background-color: #669900; border-left-color: #94b84d; border-top-color: #94b84d; border-right-color: #426300; border-bottom-color: #426300; box-shadow: none; }
dropdown popover listview > row.activatable:selected, dropdown popover listview > row.activatable:selected:hover, dropdown popover listview > row.activatable:not(:first-child):not(:last-child):selected, dropdown popover listview > row.activatable:not(:first-child):not(:last-child):selected:hover, combobox popover listview > row.activatable:selected, combobox popover listview > row.activatable:selected:hover, combobox popover listview > row.activatable:not(:first-child):not(:last-child):selected, combobox popover listview > row.activatable:not(:first-child):not(:last-child):selected:hover { outline-color: rgba(255, 255, 255, 0.3); color: #d1ff96; background-color: #669900; border-left-color: #94b84d; border-top-color: #94b84d; border-right-color: #426300; border-bottom-color: #426300; box-shadow: none; }
dropdown popover .dropdown-searchbar, combobox popover .dropdown-searchbar { padding: 6px; }
@ -695,12 +697,26 @@ pathbar > button.slider-button { padding-left: 0; padding-right: 0; }
#NautilusPathBar { background: none; border-radius: 0px; }
#NautilusPathBar button, #NautilusPathBar menubutton { margin: 0; }
#NautilusPathBar > scrolledwindow > viewport > box > box > label { opacity: 0; margin: 0 -0.5em; padding: 0; }
.nautilus-list-view listview > row { border-radius: 0px; margin: 0pX; }
#NautilusViewCell { border-radius: 0px; }
#NautilusViewCell box { margin: 0px; }
.nautilus-window .collapse-spacing { padding: 0; }
.nautilus-window headerbar { min-height: 2.7em; }
.nautilus-window .nautilus-list-view columnview, .nautilus-window .nautilus-list-view listview, .nautilus-window .nautilus-list-view cell { margin: 0; }
.nautilus-window .nautilus-list-view cell { padding: 0; }
.nautilus-window .nautilus-list-view row { margin: 0; }
/************** Tree Views * */
columnview.view, treeview.view { border-left-color: #575859; border-top-color: #575859; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; }
@ -779,6 +795,8 @@ popover.background > contents separator { background-color: #2d2c2c; margin: 3px
popover.background > contents list separator { margin: 0; }
popover.background > contents listview > row { border-radius: 0; }
.osd popover.background, popover.background.touch-selection, popover.background.magnifier { background-color: transparent; }
.osd popover.background > arrow, .osd popover.background > contents, popover.background.touch-selection > arrow, popover.background.touch-selection > contents, popover.background.magnifier > arrow, popover.background.magnifier > contents { border: 1px solid rgba(255, 255, 255, 0.1); box-shadow: none; }
@ -1133,7 +1151,7 @@ scale.horizontal > value.right { margin-left: 9px; }
scale.horizontal.marks-after slider { border-radius: 5px 5px 100% 100%; min-width: 10px; padding: 0; margin-right: 5px; margin-left: 5px; }
scale.horizontal.marks-before slider { border-radius: 100% 100% 5px 5px; min-width: 10px; padding: 0; margin-right: 5px; margin-left: 5px; }
scale.horizontal.marks-before slider, scale.horizontal.color slider { border-radius: 100% 100% 5px 5px; min-width: 10px; padding: 0; margin-right: 5px; margin-left: 5px; }
scale.vertical > marks { color: alpha(currentColor,0.55); }
@ -1147,7 +1165,7 @@ scale.vertical > value.top { margin-bottom: 9px; }
scale.vertical > value.bottom { margin-top: 9px; }
scale.vertical.marks-after slider { border-radius: 5px 100% 100% 5px; min-height: 10px; padding: 0; margin-top: 54px; margin-bottom: 5px; }
scale.vertical.marks-after slider, scale.vertical.color slider { border-radius: 5px 100% 100% 5px; min-height: 10px; padding: 0; margin-top: 54px; margin-bottom: 5px; }
scale.vertical.marks-before slider { border-radius: 100% 5px 5px 100%; min-height: 10px; padding: 0; margin-top: 5px; margin-bottom: 5px; }
@ -1458,10 +1476,12 @@ placesview .server-list-button:checked > image { transition: 200ms cubic-bezier(
placesview > actionbar > revealer > box > box { border-spacing: 6px; }
/********* Paned * */
paned > separator { min-width: 4px; min-height: 4px; -gtk-icon-source: none; border-width: 2px; border-style: solid; background-image: radial-gradient(circle closest-side, #EDF0F5 0%, #EDF0F5 75%, rgba(237, 240, 245, 0) 100%); background-clip: padding-box; background-repeat: no-repeat; background-position: center; background-color: #3f3e3e; border-left-color: #6e6d6d; border-top-color: #6e6d6d; border-right-color: #272727; border-bottom-color: #272727; }
paned > separator { min-width: 4px; min-height: 4px; -gtk-icon-source: none; border-width: 2px; border-style: solid; background-image: radial-gradient(circle closest-side, #EDF0F5 0%, #EDF0F5 75%, rgba(237, 240, 245, 0) 100%); background-clip: padding-box; background-repeat: no-repeat; background-position: center; box-shadow: none; margin: 0; padding: 0; background-color: #3f3e3e; border-left-color: #6e6d6d; border-top-color: #6e6d6d; border-right-color: #272727; border-bottom-color: #272727; }
paned > separator:selected { background-color: #669900; border-left-color: #94b84d; border-top-color: #94b84d; border-right-color: #426300; border-bottom-color: #426300; }
paned > separator:hover { background-color: #505050; }
paned > separator.wide { min-width: 5px; min-height: 5px; }
paned.horizontal > separator.wide { margin: 0; padding: 0; }
@ -1705,21 +1725,9 @@ XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-co
.nemo-desktop-window stack { background: none; border: none; }
.nautilus-window .top-bar { background-color: #507800; color: #d1ff96; }
.top-bar { background-color: #507800; color: #d1ff96; }
.nautilus-window .top-bar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; }
.nautilus-window .top-bar .collapse-spacing { padding: 0; }
.nautilus-window headerbar { min-height: 2.7em; }
.nautilus-window .nautilus-list-view columnview, .nautilus-window .nautilus-list-view listview, .nautilus-window .nautilus-list-view cell { margin: 0; }
.nautilus-window .nautilus-list-view cell { padding: 0; }
.nautilus-window .nautilus-list-view row { margin: 0; }
#NautilusPathBar button, #NautilusPathBar menubutton { margin: 0; }
.top-bar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; }
windowhandle > box { padding: 0; }