This commit is contained in:
vinceliuice 2021-05-29 23:21:24 +08:00
parent 3ac56658b7
commit 56120d4673
2 changed files with 24 additions and 20 deletions

View File

@ -3820,9 +3820,10 @@ window.background:not(.solid-csd) {
window.background:not(.solid-csd) { window.background:not(.solid-csd) {
// for 'Notebookbar' toolbar // for 'Notebookbar' toolbar
> notebook:not(.frame) { > notebook {
border: 0 none transparent; // unset borders border: none; // unset borders
background-color: $base_color; background-color: $base_color;
box-shadow: none;
> stack { > stack {
border: none; border: none;

View File

@ -917,7 +917,6 @@ button {
&:active, &:checked { &:active, &:checked {
@include button(suggested_destructive, lighten($b_color, 10%), $b_fg); @include button(suggested_destructive, lighten($b_color, 10%), $b_fg);
box-shadow: none;
} }
&.flat:disabled { &.flat:disabled {
@ -1601,11 +1600,21 @@ actionbar {
} }
} }
button:not(.flat) { button {
@include button(header-normal); @include button(header-normal);
&:backdrop { opacity: 0.65; background-image: none; } &:backdrop { opacity: 0.65; background-image: none; }
&.flat {
@include button(undecorated);
}
&:disabled {
@include button(header-insensitive);
}
}
button:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) {
&:hover { &:hover {
@include button(header-hover); @include button(header-hover);
transition: $button_transition; transition: $button_transition;
@ -1628,14 +1637,6 @@ actionbar {
@include button(header-insensitive-active); @include button(header-insensitive-active);
} }
} }
&:disabled {
@include button(header-insensitive);
}
&.flat {
@include button(undecorated);
}
} }
button, spinbutton, entry, stackswitcher { button, spinbutton, entry, stackswitcher {
@ -2005,7 +2006,8 @@ headerbar, .titlebar {
&:hover { box-shadow: none; } &:hover { box-shadow: none; }
&:active, &:checked { &:active, &:checked {
@include button(header-checked); background-color: if($variant == 'light', rgba(black, 0.5), rgba(white, 0.65));
color: if($variant == 'light', rgba(white, 1), rgba(black, 0.75));
border-color: $button_borders; border-color: $button_borders;
} }
@ -2049,8 +2051,7 @@ headerbar, .titlebar {
border-radius: 0; border-radius: 0;
margin: 0 0; margin: 0 0;
border-left-color: $borders_color; // this is actually the tree lines color,
border-left-color: rgba($fg_color, 0.15); // this is actually the tree lines color,
border-top-color: $borders_color; // while this is the grid lines color, better then nothing border-top-color: $borders_color; // while this is the grid lines color, better then nothing
rubberband { @extend %rubberband; } // to avoid borders being overridden by the previously set props rubberband { @extend %rubberband; } // to avoid borders being overridden by the previously set props
@ -3749,6 +3750,7 @@ stacksidebar {
&:dir(rtl) { padding-left: $container_padding; } &:dir(rtl) { padding-left: $container_padding; }
} }
@at-root %sidebar_button,
button.sidebar-button { button.sidebar-button {
min-width: $small_size + 2px; min-width: $small_size + 2px;
min-height: $small_size + 2px; min-height: $small_size + 2px;
@ -3761,8 +3763,8 @@ stacksidebar {
> image { opacity: 0.85 }; > image { opacity: 0.85 };
&:active, &:checked { &:active, &:checked {
@include button(flat-active); background-color: if($variant=='light', rgba(black, 0.45), rgba(white, 0.35));
border-color: if($variant=='light', rgba(black, 0.3), $dark_borders_color); border-color: if($variant=='light', rgba(black, 0.2), $dark_borders_color);
} }
&:not(:hover):not(:active) > image { opacity: 0.65 }; &:not(:hover):not(:active) > image { opacity: 0.65 };
@ -3803,7 +3805,7 @@ stacksidebar {
// //
// Placesview // Placesview
// //
placesview { .background placesview {
.server-list-button > image { .server-list-button > image {
-gtk-icon-transform: rotate(0turn); -gtk-icon-transform: rotate(0turn);
} }
@ -3813,6 +3815,8 @@ placesview {
-gtk-icon-transform: rotate(-0.5turn); -gtk-icon-transform: rotate(-0.5turn);
} }
button.sidebar-button { @extend %sidebar_button; }
// this selects the "connect to server" label // this selects the "connect to server" label
> actionbar.background { > actionbar.background {
background: none; background: none;
@ -4217,8 +4221,7 @@ decoration {
// //
// Titlebuttons // Titlebuttons
// //
headerbar, .background headerbar {
.titlebar {
button.titlebutton { button.titlebutton {
&.close, &.maximize, &.minimize { &.close, &.maximize, &.minimize {
min-width: 16px; min-width: 16px;