This commit is contained in:
vinceliuice 2024-11-18 00:50:20 +08:00
parent 91b28c11b7
commit 1f605c2339
4 changed files with 146 additions and 71 deletions

View File

@ -7,6 +7,10 @@
-moz-window-dragging: drag; -moz-window-dragging: drag;
} }
#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]):not([orient="vertical"]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) {
margin-inline-start: 6px !important;
}
tab > stack { tab > stack {
margin: 0 3px !important; margin: 0 3px !important;
} }

View File

@ -1889,15 +1889,6 @@ searchbar {
> revealer > box { > revealer > box {
padding: $container_padding; padding: $container_padding;
border-spacing: $container_padding; border-spacing: $container_padding;
entry, button { margin: 0; }
.close {
min-width: 18px;
min-height: 18px;
padding: 4px;
border-radius: 50%;
}
} }
&:not(.inline) > revealer > box { &:not(.inline) > revealer > box {
@ -1910,8 +1901,11 @@ searchbar {
} }
// Close button on searchbar // Close button on searchbar
button.flat { button.flat, .close {
@extend %circular_button; min-width: 18px;
min-height: 18px;
padding: 4px;
border-radius: 50%;
} }
.top-bar &:not(.inline) > revealer > box, .top-bar &:not(.inline) > revealer > box,
@ -1928,11 +1922,34 @@ actionbar > revealer > box {
box-shadow: none; box-shadow: none;
color: $text_color; color: $text_color;
entry, button { margin: 0; }
&, > box.start, > box.end { &, > box.start, > box.end {
border-spacing: $container_padding; border-spacing: $container_padding;
} }
&:backdrop {
background-color: $bg_color;
> * {
filter: opacity(.5);
}
}
}
%actionbar-inline > revealer > box {
background-color: transparent;
color: inherit;
box-shadow: none;
padding-top: $container_padding;
&:backdrop {
background-color: transparent;
transition: none;
> * {
filter: none;
transition: none;
}
}
} }
// //
@ -2037,11 +2054,11 @@ actionbar > revealer > box {
headerbar { headerbar {
min-height: $headerbar_size; min-height: $headerbar_size;
padding: 0; padding: 0;
margin: 0;
color: $header_fg; color: $header_fg;
background-color: $header_bg; background-color: $header_bg;
border-bottom: 1px solid $header_border; border-bottom: 1px solid $header_border;
box-shadow: none; box-shadow: none;
margin: 0;
&:backdrop { &:backdrop {
opacity: 1; opacity: 1;
@ -2058,16 +2075,6 @@ headerbar {
background: none; background: none;
} }
> windowhandle > box {
padding: 0 8px;
&,
> box.start,
> box.end {
border-spacing: $container_padding;
}
}
windowcontrols { windowcontrols {
padding: 0 $container_padding / 2; padding: 0 $container_padding / 2;
} }
@ -2085,7 +2092,7 @@ headerbar {
} }
> windowhandle > box { > windowhandle > box {
padding: 0 8px; padding: 8px;
&, &,
> box.start, > box.start,
@ -2096,6 +2103,7 @@ headerbar {
entry { entry {
@extend %headerbar_entrys; @extend %headerbar_entrys;
border-spacing: 4px;
} }
button { button {
@ -2108,33 +2116,6 @@ headerbar {
} }
} }
entry,
spinbutton,
button,
menubutton,
splitbutton,
stackswitcher,
separator:not(.sidebar) {
margin-top: 8px;
margin-bottom: 8px;
}
menubutton > button,
spinbutton > button,
splitbutton > button,
splitbutton > menubutton,
entry > menubutton,
popover entry,
popover spinbutton,
popover button,
popover menubutton,
popover splitbutton,
popover stackswitcher,
popover separator:not(.sidebar) {
margin-top: 0;
margin-bottom: 0;
}
// Reset linked buttons // Reset linked buttons
.linked.raised > & { .linked.raised > & {
// min-width: 16px; // min-width: 16px;
@ -2146,7 +2127,6 @@ headerbar {
} }
stackswitcher.linked:not(.vertical) > button { stackswitcher.linked:not(.vertical) > button {
// min-height: $menuitem_size - 8px;
min-width: $menuitem_size - 4px; min-width: $menuitem_size - 4px;
border-radius: $bt_radius; border-radius: $bt_radius;
} }
@ -2154,18 +2134,14 @@ headerbar {
// Reset linking entrys // Reset linking entrys
.linked:not(.vertical) > entry { .linked:not(.vertical) > entry {
@include entry(header-normal); @include entry(header-normal);
// margin: 8px ($container_padding / 2 + 1px);
padding: 0 $container_padding * 2; padding: 0 $container_padding * 2;
// border-radius: $bt_radius;
border: none; border: none;
&:focus { &:focus {
// border-radius: $bt_radius;
@include entry(header-focus); @include entry(header-focus);
} }
&:disabled { &:disabled {
// border-radius: $bt_radius;
@include entry(header-insensitive); @include entry(header-insensitive);
} }
@ -2178,8 +2154,6 @@ headerbar {
padding: 0; padding: 0;
> button { > button {
// min-height: $menuitem_size - 8px;
margin: 0;
font-weight: 500; font-weight: 500;
&:not(:first-child) { &:not(:first-child) {
@ -2302,7 +2276,7 @@ headerbar {
// Titlebuttons // Titlebuttons
windowcontrols { windowcontrols {
border-spacing: 6px; border-spacing: $container_padding;
padding: 0 10px; padding: 0 10px;
&:not(.empty) { &:not(.empty) {
@ -2332,7 +2306,6 @@ headerbar {
&.close, &.maximize, &.minimize { &.close, &.maximize, &.minimize {
min-width: 16px; min-width: 16px;
min-height: 16px; min-height: 16px;
margin: 8px 0;
padding: ($menuitem_size - 20px) / 2 0; padding: ($menuitem_size - 20px) / 2 0;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;

View File

@ -84,8 +84,6 @@ $flap_sidebar_size: 240px;
} }
} }
headerbar > windowhandle > box { padding: 0 10px; }
flap.unfolded, flap.unfolded,
.sidebar-pane { .sidebar-pane {
&, &:backdrop { &, &:backdrop {
@ -211,9 +209,8 @@ $flap_sidebar_size: 240px;
} }
#NautilusQueryEditor { // search entry #NautilusQueryEditor { // search entry
padding: 0 $container_padding; padding: 2px $container_padding;
border-spacing: 0; border-spacing: 0;
margin: 9px 0 8px 0;
> image, > box, > text { > image, > box, > text {
margin: 0; margin: 0;
@ -239,7 +236,7 @@ $flap_sidebar_size: 240px;
#NautilusPathBar { #NautilusPathBar {
background-color: $fill_color; background-color: $fill_color;
border-radius: $bt_radius; border-radius: $bt_radius;
margin: 8px 0 8px $container_padding; margin: 0 0 0 $container_padding;
#NautilusPathButton { #NautilusPathButton {
margin: 0 $container_padding / 2; margin: 0 $container_padding / 2;

View File

@ -239,10 +239,6 @@ viewswitcher {
&.wide { &.wide {
border-spacing: 0; border-spacing: 0;
> button.toggle {
margin: 8px 0;
}
} }
&.narrow > button.toggle { &.narrow > button.toggle {
@ -361,7 +357,6 @@ headerbar > windowhandle > box viewswitcher {
box-shadow: inset 0 0 0 1px $light_borders_color; box-shadow: inset 0 0 0 1px $light_borders_color;
border-radius: $bt_radius; border-radius: $bt_radius;
padding: 0; padding: 0;
margin: 8px 0;
> button.toggle { > button.toggle {
margin: 0; margin: 0;
@ -855,6 +850,112 @@ dialog-host > dialog.osd:not(progressbar):not(button):not(menubutton):not(splitb
} }
} }
//
// AdwToolbarView
//
toolbarview {
> .top-bar,
> .bottom-bar {
searchbar,
actionbar {
> revealer > box {
background-color: transparent;
border: none;
box-shadow: none;
}
}
.toolbar {
background-color: transparent;
}
.collapse-spacing {
padding-top: 0;
padding-bottom: 0;
headerbar {
min-height: $headerbar_size;
> windowhandle > box {
padding-top: 8px;
padding-bottom: 8px;
}
&.default-decoration {
min-height: $medium_size;
> windowhandle > box {
padding-top: 0;
padding-bottom: 0;
}
}
}
searchbar,
actionbar {
> revealer > box {
padding-top: $container_padding;
padding-bottom: $container_padding;
}
}
.toolbar {
padding-top: $container_padding;
padding-bottom: $container_padding;
}
tabbar {
padding-top: 0;
padding-bottom: 0;
}
}
&.raised {
background-color: transparent;
color: $header_fg;
&:backdrop {
background-color: transparent;
}
}
&:backdrop > windowhandle {
filter: none;
}
}
> .bottom-bar {
padding: 0;
border-spacing: 0;
box-shadow: inset 0 1px $borders_color;
background-color: darken($bg_color, 3%);
color: $text_color;
&:backdrop {
background-color: $bg_color;
color: $disabled_fg_color;
}
actionbar { @extend %actionbar-inline; }
}
> .top-bar.raised {
box-shadow: none;
&.border {
box-shadow: none;
}
}
> .bottom-bar.raised {
box-shadow: none;
&.border {
box-shadow: none;
}
}
}
// ThemeSelector // ThemeSelector
themeselector, // Gnome text editor themeselector, // Gnome text editor
panelthemeselector { // Gnome builder panelthemeselector { // Gnome builder