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

Fixed geary 40.0 issues

Browse source
This commit is contained in:
Vince 2021-05-09 10:03:08 +08:00
parent 094b82e9be
commit 4c574b1d6b
2 changed files with 91 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
src/sass/gtk/_applications-3.0.scss
View file

@ -330,7 +330,10 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
} }
actionbar.background { actionbar.background {
background-color: $menu_bg; background: none;
> revealer > box {
background-color: $bg_color;
margin: 6px; margin: 6px;
border-radius: $wm_radius - 6px; border-radius: $wm_radius - 6px;
box-shadow: $shadow_5, inset 0 1px $highlight_color; box-shadow: $shadow_5, inset 0 1px $highlight_color;
@ -338,6 +341,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
} }
} }
} }
}
headerbar { headerbar {
min-height: $nautilus_headerbar_size; min-height: $nautilus_headerbar_size;
@ -384,7 +388,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
} }
> stack:not(:only-child) { > stack:not(:only-child) {
searchbar { background-color: transparent; } searchbar > revealer > box { background-color: transparent; }
} }
infobar { infobar {
@ -1170,7 +1174,7 @@ configurationview {
} }
} }
dzldockbin actionbar { dzldockbin actionbar > revealer > box {
border-radius: 0 0 $wm_radius $wm_radius; border-radius: 0 0 $wm_radius $wm_radius;
} }
@ -2025,8 +2029,10 @@ window.background.csd.unified {
hdyviewswitcherbar > actionbar, hdyviewswitcherbar > actionbar,
viewswitcherbar > actionbar { // Gnome 3.38 viewswitcherbar > actionbar { // Gnome 3.38
> revealer > box {
background: none; background: none;
border: none; border: none;
}
} }
// //
@ -2445,7 +2451,7 @@ window.background.csd {
border-bottom-right-radius: $wm_radius; border-bottom-right-radius: $wm_radius;
} }
> box.vertical > searchbar { background-color: $base_color; } > box.vertical > searchbar > revealer > box { background-color: $base_color; }
} }
} }
@ -2478,14 +2484,14 @@ window.background.csd {
window.background.csd { // Documents actionbar window.background.csd { // Documents actionbar
> box.vertical > overlay > stack > box.vertical { > box.vertical > overlay > stack > box.vertical {
> actionbar { > actionbar > revealer > box {
border-radius: 0 0 $wm_radius $wm_radius; border-radius: 0 0 $wm_radius $wm_radius;
} }
} }
&.maximized, &.tiled, &.fullscreen { &.maximized, &.tiled, &.fullscreen {
> box.vertical > overlay > stack > box.vertical { > box.vertical > overlay > stack > box.vertical {
> actionbar { > actionbar > revealer > box {
border-radius: 0 0 $maximized_radius $maximized_radius; border-radius: 0 0 $maximized_radius $maximized_radius;
} }
} }
@ -3155,49 +3161,30 @@ window#GearyMainWindow.background.csd {
} }
} }
.geary-main-window { // 40.0 .geary-main-window {
> headerbar { &.background.csd.unified { background: none; }
border-bottom: none;
> leaflet > leaflet > headerbar { .geary-main-layout { // >= 40.0
border-bottom: none; background-color: $dark_sidebar_bg;
&, &:backdrop { > leaflet > leaflet > headerbar { // left and center headerbar
border-radius: 0 0 0 0; &:first-child { @extend %side_headerbar_left; background-color: transparent; }
&:last-child { @extend %side_headerbar_right; }
} }
&:only-child { > leaflet > headerbar { // right headerbar
border-radius: $wm_radius $wm_radius 0 0; @extend %side_headerbar_right;
}
&:not(:first-child) {
background-color: $base_color;
box-shadow: inset 0 1px $header_highlight;
}
&:first-child {
@extend %side_headerbar_left;
border-radius: $wm_radius 0 0 0;
}
} }
} }
leaflet > leaflet > box.vertical { frame.geary-folder-frame { // left side
searchbar { background-color: transparent;
background-color: $base_color;
> revealer > box {
border-color: if($variant == 'light', $solid_borders_color, $header_border);
}
}
}
frame.geary-folder-frame {
> border { border: none; } > border { border: none; }
scrolledwindow { scrolledwindow {
treeview.view.sidebar { treeview.view.sidebar {
background-color: rgba($dark_sidebar_bg, 1); background-color: transparent;
&:hover { &:hover {
color: $fg_color; color: $fg_color;
@ -3216,16 +3203,21 @@ window#GearyMainWindow.background.csd {
} }
} }
frame.geary-conversation-frame { frame.geary-conversation-frame { // center part
background-color: rgba($dark_sidebar_bg, 1); background-color: $base_color;
> border { border: none; } > border { border: none; }
scrolledwindow { scrolledwindow {
// margin: -1px 0;
padding: 6px;
background-color: $base_color; background-color: $base_color;
treeview.view { treeview.view {
background-image: none; background-image: none;
border-color: $base_color;
border-radius: $mn_radius;
outline: none;
&:hover { background-color: rgba($fg_color, 0.1); } &:hover { background-color: rgba($fg_color, 0.1); }
@ -3241,9 +3233,34 @@ window#GearyMainWindow.background.csd {
} }
} }
leaflet > leaflet > box.vertical {
searchbar { // center part searchbar
> revealer > box {
background-color: $base_color;
border-color: $dark_sidebar_border;
}
}
> revealer > components-conversation-actions { // center part actionbar
margin-top: -1px;
background-color: $base_color;
border-color: transparent; // not use?
box-shadow: inset 0 1px $dark_sidebar_border;
button {
@extend %flat_button;
}
> .linked > button {
border-radius: $bt_radius;
margin: 0 1px;
}
}
}
separator.geary-sidebar-pane-separator { background-color: $dark_sidebar_border; } separator.geary-sidebar-pane-separator { background-color: $dark_sidebar_border; }
geary-conversation-viewer#conversation_viewer, // 40.0 geary-conversation-viewer#conversation_viewer, // 40.0 right side
stack#conversation_viewer { // 3.28 stack#conversation_viewer { // 3.28
background-color: $base_color; background-color: $base_color;
border-bottom-right-radius: $wm_radius + 1px; border-bottom-right-radius: $wm_radius + 1px;
@ -3260,10 +3277,9 @@ window#GearyMainWindow.background.csd {
} }
searchbar { searchbar {
background-color: $base_color;
> revealer > box { > revealer > box {
border-color: if($variant == 'light', $solid_borders_color, $header_border); background-color: $base_color;
border-color: $dark_sidebar_border;
} }
} }
} }

37
src/sass/gtk/_common-3.0.scss
View file

@ -10,14 +10,12 @@
background-image: none; background-image: none;
background-color: rgba($base_color, 1); background-color: rgba($base_color, 1);
box-shadow: inset 0 1px $highlight_color; box-shadow: inset 0 1px $highlight_color;
border: none;
} }
%side_searchbar { %side_searchbar {
background-color: rgba($dark_sidebar_bg, 1);
> revealer > box { > revealer > box {
border-color: if($variant == 'light', $solid_borders_color, $header_border); background-color: rgba($dark_sidebar_bg, 1);
border-color: $dark_sidebar_border;
} }
} }
@ -1333,7 +1331,7 @@ combobox {
} }
searchbar { searchbar {
background-color: $bg_color; background-color: transparent;
padding: 0; padding: 0;
margin: 0; margin: 0;
border: none; border: none;
@ -1342,6 +1340,7 @@ searchbar {
padding: 6px; padding: 6px;
margin: -6px; margin: -6px;
border-style: solid; border-style: solid;
background-color: $bg_color;
border-color: $solid_borders_color; border-color: $solid_borders_color;
border-width: 0 0 1px; border-width: 0 0 1px;
} }
@ -1360,12 +1359,16 @@ searchbar {
} }
actionbar { actionbar {
background-color: transparent;
> revealer > box {
padding: 6px; padding: 6px;
border-top: 1px solid $borders_color; border-top: 1px solid $borders_color;
background-color: darken($bg_color, 3%); background-color: darken($bg_color, 3%);
}
.background.csd revealer > &, .background.csd revealer > & > revealer > box,
.background.csd > box.vertical > & { .background.csd > box.vertical > & > revealer > box {
border-radius: 0 0 $wm_radius $wm_radius; border-radius: 0 0 $wm_radius $wm_radius;
} }
} }
@ -2058,8 +2061,6 @@ menubar,
&:backdrop { &:backdrop {
color: transparentize($header_fg, 0.2); color: transparentize($header_fg, 0.2);
// background-image: none;
// background-color: opacify($header_bg_backdrop, 1);
} }
> menuitem { > menuitem {
@ -2068,11 +2069,7 @@ menubar,
border: none; border: none;
border-radius: $bt_radius; border-radius: $bt_radius;
// > window.popup.background.csd > decoration { border-radius: 0 0 $wm_radius $wm_radius; }
> window.popup.background.csd > menu { > window.popup.background.csd > menu {
// border-radius: 0 0 $wm_radius $wm_radius;
> menuitem { transition: none; } > menuitem { transition: none; }
} }
@ -2091,7 +2088,7 @@ menubar,
menu, menu,
.menu { .menu {
// margin: 4px; // margin: 4px;
padding: 6px 4px; padding: 6px 0;
border-radius: $mn_radius; border-radius: $mn_radius;
background-color: opacify($menu_bg, 1); background-color: opacify($menu_bg, 1);
border: 1px solid $solid_borders_color; border: 1px solid $solid_borders_color;
@ -2117,7 +2114,7 @@ menu,
min-width: 40px; min-width: 40px;
padding: 3px 6px; padding: 3px 6px;
border-radius: $mn_radius - 3px; border-radius: $mn_radius - 3px;
margin: 0 2px; margin: 0 6px;
text-shadow: none; text-shadow: none;
color: $fg_color; color: $fg_color;
@ -2194,7 +2191,7 @@ menu,
&.top { &.top {
margin-top: -6px; margin-top: -6px;
border-radius: $wm_radius $wm_radius 0 0; border-radius: $mn_radius $mn_radius 0 0;
border-bottom: 1px solid $borders_color; border-bottom: 1px solid $borders_color;
-gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); -gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
} }
@ -2202,7 +2199,7 @@ menu,
&.bottom { &.bottom {
margin-top: 12px; margin-top: 12px;
margin-bottom: -16px; margin-bottom: -16px;
border-radius: 0 0 $wm_radius $wm_radius; border-radius: 0 0 $mn_radius $mn_radius;
border-top: 1px solid $borders_color; border-top: 1px solid $borders_color;
-gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
} }
@ -3483,10 +3480,12 @@ filechooser {
} }
> actionbar { > actionbar {
> revealer > box {
border-top: 1px solid $header_border; border-top: 1px solid $header_border;
background-color: $dark_sidebar_bg; background-color: $dark_sidebar_bg;
color: $dark_sidebar_fg; color: $dark_sidebar_fg;
border-radius: 0 0 $wm_radius $wm_radius; border-radius: 0 0 $wm_radius $wm_radius;
}
label, combobox { color: $dark_sidebar_fg; } label, combobox { color: $dark_sidebar_fg; }
} }
@ -3519,13 +3518,13 @@ filechooser {
> box.vertical > box.vertical > paned.horizontal > separator { > box.vertical > box.vertical > paned.horizontal > separator {
border: none; border: none;
min-width: 1px; min-width: 1px;
background-image: image(if($variant=='light', $solid_borders_color, $header_border)); background-image: image($dark_sidebar_border);
// &:dir(ltr) { margin-left: -1px; } // &:dir(ltr) { margin-left: -1px; }
// &:dir(rtl) { margin-right: -1px; } // &:dir(rtl) { margin-right: -1px; }
} }
#pathbarbox { border-bottom: 1px solid transparentize($borders_color, 0.5); } #pathbarbox { border-bottom: 1px solid $dark_sidebar_border; }
} }
// //