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

Fixed Budgie desktop issues

Browse source
This commit is contained in:
vinceliuice 2023-02-26 14:51:13 +08:00
parent 407b14f9dd
commit 3c16f0e6da
4 changed files with 209 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sass/_variables.scss
View file

@ -43,7 +43,7 @@ $circular_radius: 9999px;
$bt_radius: if($laptop == 'false', 6px, 6px);
$bd_radius: if($laptop == 'false', 8px, 8px);
$wm_radius: if($laptop == 'false', 12px, 12px);
$mn_radius: if($laptop == 'false', 10px, 10px);
$mn_radius: if($laptop == 'false', 14px, 12px);
$dash_radius: if($laptop == 'false', 24px, 18px);
$base_border_radius: if($laptop == 'false', 8px, 8px);
$modal_radius: $base_border_radius * 2;

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

@ -2194,10 +2194,10 @@ menu {
border: none;
color: $fg_color;
@if $variant == 'dark' { box-shadow: inset 0 0 0 1px $highlight_color; }
.csd & {
background-color: $menu_bg;
@if $variant == 'light' { border: none; }
@if $variant == 'dark' { border: 1px solid lighten($menu_bg, 6%); }
}
separator {
@ -2212,7 +2212,7 @@ menu {
min-height: 12px;
min-width: 40px;
padding: $container_padding / 2 $container_padding;
border-radius: $mn_radius - 3px;
border-radius: $bt_radius;
text-shadow: none;
color: $fg_color;
// -gtk-icon-style: symbolic;

216
src/sass/gtk/apps/_budgie.scss
View file

@ -203,14 +203,16 @@ $raven_padding: 8px;
font-size: 110%;
}
.categories {
&:dir(ltr) { border-bottom-left-radius: $bt_radius; }
&:dir(rtl) { border-bottom-right-radius: $bt_radius; }
scrolledwindow.sidebar.categories { //AppMenu (budgie)
&:dir(ltr) {
margin: 0 0 1px 1px;
border-bottom-left-radius: $bt_radius;
}
scrolledwindow.sidebar.categories { //AppMenu (budgie)
border-bottom-left-radius: $wm_radius;
margin: 0 0 1px 1px;
&:dir(rtl) {
margin: 0 1px 1px 0;
border-bottom-right-radius: $bt_radius;
}
button.flat.category-button {
min-height: 28px;
@ -228,6 +230,18 @@ $raven_padding: 8px;
}
}
> frame > box > overlay > box > box > scrolledwindow.sidebar.categories {
&:dir(ltr) {
margin: 0 0 0 1px;
border-bottom-left-radius: 0;
}
&:dir(rtl) {
margin: 0 1px 0 0;
border-bottom-right-radius: 0;
}
}
row {
padding: 0;
@ -238,6 +252,57 @@ $raven_padding: 8px;
border-radius: 0;
}
}
list.left-overlay-menu {
box-shadow: 0 5px 8px rgba(black, 0.15), 0 8px 15px rgba(black, 0.08), $wm_outline, inset 0 0 0 1px $highlight_color;
background-color: $base_color;
padding: $container_padding;
margin: $container_padding;
border-radius: $mn_radius;
> row.activatable {
border-radius: $bt_radius;
&, &:hover, &:selected, &:active, &:active:hover {
background-color: transparent;
}
&:not(:last-child) {
margin-bottom: $container_padding / 2;
}
&:active {
background-color: $selected_bg_color;
label, button { color: $selected_fg_color; }
}
button.menuitem {
border-radius: $bt_radius;
@extend %flat_button;
}
}
}
.budgie-menu-footer {
border-top: 1px solid $borders_color;
padding: $container_padding;
button {
min-height: 16px;
min-width: 16px;
padding: $container_padding;
&.image-button {
border-radius: $circular_radius;
&:not(.last-child) {
margin-right: $container_padding;
}
}
}
}
}
// Clipboard popover
@ -783,24 +848,19 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px
stackswitcher.linked > button { @extend %raven_button; }
.raven-header {
min-height: 36px;
min-height: $medium_size;
padding: 2px;
&:not(.top) {
margin-top: -6px; // remove extra spaces, but not perfect :(
button {
button.image-button {
@extend %flat_button;
min-height: 32px;
min-width: 32px;
margin: 0;
padding: 0;
&.image-button {
border-radius: $circular_radius;
}
}
}
&.top {
padding: 2px 12px $raven_padding;
@ -847,10 +907,8 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px
margin: $raven_padding 0; // do not set L/R margins
border-radius: $raven_radius;
background-color: $raven_header_bg_color;
// draw side edges via opaque box-shadows
transition-duration: 0s;
border: 1px solid $raven_border_color;
}
.raven-header {
margin-top: -$raven_padding * 2; // unset parent margin
@ -862,49 +920,94 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px
border-radius: 0 0 $raven_radius $raven_radius;
background-color: $raven_base_color;
}
}
> box.vertical > box.vertical:last-child {
> box.vertical > widget > box.vertical { // > = 10.7
border-radius: $raven_radius;
border: none;
background-color: if($variant =='light', rgba(black, 0.65), rgba(black, 0.35));
color: rgba(white, 0.65);
background-color: $raven_header_bg_color;
border: 1px solid $raven_border_color;
.raven-header {
border-radius: $raven_radius $raven_radius 0 0;
background-color: transparent;
}
.raven-background {
background-color: rgba(black, 0.25);
margin-bottom: 0; // unset parent margin
border-radius: 0 0 $raven_radius $raven_radius;
background-color: $raven_base_color;
border-top: 1px solid $raven_border_color;
}
image { color: rgba(white, 0.15); }
image.raven-mpris {
background-color: rgba(white, 0.1);
border-radius: $raven_radius;
}
}
.raven-mpris-controls {
margin-top: $container_padding;
> button.image-button {
padding: $container_padding;
}
}
@if $variant == 'light' {
> box.vertical > box.vertical:last-child,
> box.vertical > widget:last-child > box.vertical {
border: none;
background-color: rgba(black, 0.85);
color: rgba(white, 0.65);
button {
border: none;
color: rgba(white, 0.65);
background-color: transparent;
&:hover {
color: rgba(white, 0.85);
background-color: rgba(white, 0.15);
}
&:active {
color: rgba(white, 0.85);
background-color: rgba(white, 0.25);
}
&:disabled {
color: rgba(white, 0.3);
background-color: transparent;
}
}
.raven-background {
background-color: rgba(white, 0.05);
margin-bottom: 0; // unset parent margin
border-top: none;
}
}
// MPRIS Applet
.raven-mpris {
> box.vertical > box.vertical:last-child .raven-mpris {
background-color: rgba(black, 0.35);
color: $selected_fg_color;
border-radius: 0 0 $raven_radius $raven_radius;
label { min-height: 24px; }
color: white;
image { //reset image color
color: rgba(white, 0.85);
&:disabled {
color: rgba(white, 0.35);
}
}
button.image-button {
padding: 8px;
border: none;
@extend %selected-button;
&:disabled { color: rgba(white, 0.35); }
}
}
}
button.flat {
@extend %selected-button;
}
> box.vertical > box.vertical:last-child .raven-mpris {
border-radius: 0 0 $raven_radius $raven_radius;
label { min-height: 24px; }
}
// audio app/device switcher
box.audio-widget stackswitcher.linked {
.audio-widget {
stackswitcher.linked { // audio app/device switcher
padding: 0; // limit child horizontal spacing
> button.text-button.radio {
@ -932,10 +1035,24 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px
}
}
viewport.frame .raven-header { margin-top: -$raven_padding; }
list.devices-list {
padding: $container_padding;
background-color: transparent;
> row.activatable {
border-radius: $bt_radius;
label { padding: 0 $container_padding; }
&:not(:last-child) {
margin-bottom: $container_padding / 2;
}
}
}
}
.expander-button {
border-radius: 100px;
border-radius: $circular_radius;
}
.raven-background {
@ -1062,21 +1179,6 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px
}
}
}
.audio-widget {
list.devices-list.sound-devices {
> row.activatable {
&:selected, &:checked {
background-color: rgba($fg_color, 0.06);
color: $fg_color;
label { color: $fg_color; }
}
label { padding-left: 12px; }
}
}
}
}
// some specific scale styling

23
src/sass/gtk/apps/_misc.scss
View file

@ -10,7 +10,7 @@
// Firefox and Thunderbird
//
window.background:not(.csd) {
window.background:not(.csd):not(.popup) {
> widget {
// for the bookmark toolbar's separators
> separator {
@ -659,35 +659,20 @@ menubar.-vala-panel-background {
}
> menu {
padding: 0;
padding: $container_padding;
separator {
margin: 0;
border-bottom: none;
}
> menuitem {
padding: 0;
margin: 0 3px;
&:first-child { margin-top: 3px; }
&:last-child { margin-bottom: 3px; }
border-radius: $bt_radius;
> window > decoration {
box-shadow: none;
transition: none;
margin: 0;
menu {
padding: 0;
menuitem {
padding: 0;
margin: 0 3px;
&:first-child { margin-top: 3px; }
&:last-child { margin-bottom: 3px; }
}
}
}
}
}