luisgulo/WhiteSur-gtk-theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
vinceliuice 2021-05-29 19:07:17 +08:00
parent a12e1df9b6
commit c7010ae868
3 changed files with 47 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sass/gtk/_applications-3.0.scss
View File

@ -3345,7 +3345,7 @@ window#GearyMainWindow.background.csd { // <= 3.32
scrolledwindow { scrolledwindow {
// margin: -1px 0; // margin: -1px 0;
padding: 6px; padding: 0 6px;
background-color: $base_color; background-color: $base_color;
treeview.view { treeview.view {
@ -3356,7 +3356,9 @@ window#GearyMainWindow.background.csd { // <= 3.32
&:hover { background-color: rgba($fg_color, 0.1); } &:hover { background-color: rgba($fg_color, 0.1); }
&:selected { &:selected, &:active {
border-color: $base_color;
border-radius: $mn_radius;
background-color: rgba($fg_color, 0.15); background-color: rgba($fg_color, 0.15);
color: if($variant == 'light', $fg_color, $selected_fg_color); color: if($variant == 'light', $fg_color, $selected_fg_color);
} }

84
src/sass/gtk/_common-3.0.scss
View File

@ -728,13 +728,11 @@ $_dot_color: $selected_bg_color;
} }
%flat_button { %flat_button {
&:not(.suggested-action):not(.destructive-action):not(.titlebutton) { @include button(flat-normal);
@include button(flat-normal); &:hover { @include button(flat-hover); }
&:hover { @include button(flat-hover); } &:active { @include button(flat-active); }
&:active { @include button(flat-active); } &:checked { @include button(flat-checked); }
&:checked { @include button(flat-checked); } &:disabled { @include button(flat-insensitive); }
&:disabled { @include button(flat-insensitive); }
}
} }
button { button {
@ -774,7 +772,6 @@ button {
&:active, &:checked { &:active, &:checked {
background-color: if($variant=='light', darken($button_bg, 8%), lighten($button_bg, 8%)); background-color: if($variant=='light', darken($button_bg, 8%), lighten($button_bg, 8%));
background-clip: if($variant=='light', border-box, padding-box); background-clip: if($variant=='light', border-box, padding-box);
transition-duration: 200ms; transition-duration: 200ms;
@ -785,7 +782,7 @@ button {
@include button(insensitive); @include button(insensitive);
} }
.background &:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) { .background &:not(.flat) {
&:active, &:checked { &:active, &:checked {
@include button(active); @include button(active);
} }
@ -1495,7 +1492,7 @@ actionbar {
// Headerbar Buttons // Headerbar Buttons
%headerbar_buttons { %headerbar_buttons {
&:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) { &:not(.flat) {
@include button(header-normal); @include button(header-normal);
&:backdrop { opacity: 0.65; background-image: none; } &:backdrop { opacity: 0.65; background-image: none; }
@ -1529,7 +1526,6 @@ actionbar {
} }
} }
headerbar,
.background headerbar { .background headerbar {
min-height: $headerbar_size; min-height: $headerbar_size;
padding: 0 $container_padding + 10px; padding: 0 $container_padding + 10px;
@ -1605,7 +1601,7 @@ headerbar,
} }
} }
button:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) { button:not(.flat) {
@include button(header-normal); @include button(header-normal);
&:backdrop { opacity: 0.65; background-image: none; } &:backdrop { opacity: 0.65; background-image: none; }
@ -1997,7 +1993,7 @@ headerbar, .titlebar {
// //
// Pathbars // Pathbars
// //
.path-bar button { .background .path-bar button {
min-width: 12px; min-width: 12px;
min-height: if($variant == 'light', 24px, 26px); min-height: if($variant == 'light', 24px, 26px);
@ -2039,8 +2035,8 @@ headerbar, .titlebar {
// //
// Tree Views // Tree Views
// //
@mixin viewwy($c) { .background treeview.view {
background-color: $c; background-color: $base_color;
@at-root * { @at-root * {
-GtkTreeView-horizontal-separator: 4; -GtkTreeView-horizontal-separator: 4;
@ -2144,26 +2140,30 @@ headerbar, .titlebar {
min-width: 38px; min-width: 38px;
padding: 0 $container_padding; padding: 0 $container_padding;
font-weight: bold; font-weight: bold;
color: $_column_header_color; color: $_column_header_color;
background-color: $base_color; background-color: $base_color;
background-image: none; background-image: none;
box-shadow: none; box-shadow: none;
border-style: none solid none none; border-style: none solid none none;
border-radius: 0; border-radius: 3px;
border-image: linear-gradient(to bottom, border-image: linear-gradient(to bottom,
$base_color 20%, $base_color 20%,
transparentize(if($variant == 'light', black, white), 0.89) 20%, transparentize(if($variant == 'light', black, white), 0.89) 20%,
transparentize(if($variant == 'light', black, white), 0.89) 80%, transparentize(if($variant == 'light', black, white), 0.89) 80%,
$base_color 80%) 0 1 0 0 / 0 1px 0 0 stretch; $base_color 80%) 0 1 0 0 / 0 1px 0 0 stretch;
&:hover { color: $selected_bg_color; } &:hover {
&:active { color: $fg_color; } color: $fg_color;
background-color: rgba($fg_color, 0.06);
}
&:active, &:hover { background-color: $base_color; } &:active {
&:active:hover { color: $fg_color; } color: $fg_color;
background-color: rgba($fg_color, 0.1);
}
&:disabled { &:disabled {
color: $disabled_fg_color;
border-color: $bg_color; border-color: $bg_color;
background-image: none; background-image: none;
} }
@ -2188,10 +2188,6 @@ headerbar, .titlebar {
} }
} }
treeview.view {
@include viewwy($base_color);
}
// //
// Menus // Menus
// //
@ -3582,16 +3578,8 @@ messagedialog { // Message Dialog styling
transition: $button_transition; transition: $button_transition;
} }
&:active, &:checked { &:active {
@include button(active);
@if $variant == 'light' {
background-color: $selected_bg_color;
color: $selected_fg_color;
}
@else {
@include button(active);
}
} }
} }
@ -3617,14 +3605,15 @@ messagedialog { // Message Dialog styling
// //
filechooser { filechooser {
.csd & { .csd & {
background-color: $base_color; background-color: $dark_sidebar_bg;
border-radius: 0 0 $wm_radius $wm_radius; border-radius: 0 0 $wm_radius $wm_radius;
placessidebar { placessidebar {
background-color: transparent; background-color: transparent;
border-bottom-left-radius: $wm_radius;
list { list {
background-color: $dark_sidebar_bg; background-color: transparent;
border-bottom-left-radius: $wm_radius; border-bottom-left-radius: $wm_radius;
} }
} }
@ -3632,7 +3621,7 @@ filechooser {
> actionbar { > actionbar {
> revealer > box { > revealer > box {
border-top: 1px solid $header_border; border-top: 1px solid $header_border;
background-color: $dark_sidebar_bg; background-color: transparent;
color: $dark_sidebar_fg; color: $dark_sidebar_fg;
border-radius: 0 0 $wm_radius $wm_radius; border-radius: 0 0 $wm_radius $wm_radius;
} }
@ -3648,7 +3637,8 @@ filechooser {
} }
stack.view { stack.view {
background-color: transparent; background-color: $base_color;
border-bottom-right-radius: $wm_radius;
scrolledwindow { scrolledwindow {
background-color: transparent; background-color: transparent;
@ -3741,7 +3731,7 @@ stacksidebar {
} }
} }
placessidebar { .background placessidebar {
> viewport.frame { border-style: none; } > viewport.frame { border-style: none; }
row { row {
@ -3831,9 +3821,17 @@ placesview {
} }
// this selects the "connect to server" label // this selects the "connect to server" label
> actionbar > revealer > box > label { > actionbar.background {
padding-left: 8px; background: none;
padding-right: 8px;
> revealer > box {
background: none;
> label {
padding-left: 8px;
padding-right: 8px;
}
}
} }
} }

12
src/sass/gtk/_common-4.0.scss
View File

@ -3668,16 +3668,8 @@ window.dialog.message { // Message Dialog styling
transition: $button_transition; transition: $button_transition;
} }
&:active, &:checked { &:active {
@include button(active);
@if $variant == 'light' {
background-color: $selected_bg_color;
color: $selected_fg_color;
}
@else {
@include button(active);
}
} }
} }