Skip to content

Commit 0045400

Browse files
vinceliuicevinceliuice
committed
Fixed Budgie desktop issues
1 parent 26e722e commit 0045400

File tree

11 files changed

+358
-14
lines changed

11 files changed

+358
-14
lines changed

‎src/_sass/gtk/apps/_budgie.scss

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,46 @@
145145

146146
&:checked:disabled { background-color: transparent; } // remove pointless indicator
147147
}
148+
149+
list.left-overlay-menu {
150+
box-shadow: $shadow-z4, inset 0 1px highlight($base);
151+
background-color: $base;
152+
padding: $space-size;
153+
margin: $space-size;
154+
border-radius: $menu-radius;
155+
156+
> row.activatable {
157+
border-radius: $menuitem-radius;
158+
159+
&:not(:last-child) {
160+
margin-bottom: $space-size / 2;
161+
}
162+
163+
button.menuitem {
164+
border-radius: $menuitem-radius;
165+
}
166+
}
167+
}
168+
169+
.budgie-menu-footer {
170+
border-top: 1px solid $border;
171+
padding: $space-size;
172+
173+
button.flat:not(.indicator-item) {
174+
min-height: 16px;
175+
min-width: 16px;
176+
padding: $space-size;
177+
border-radius: $menuitem-radius;
178+
179+
&.image-button {
180+
border-radius: $circular-radius;
181+
182+
&:not(.last-child) {
183+
margin-right: $space-size;
184+
}
185+
}
186+
}
187+
}
148188
}
149189

150190
&.user-menu {
@@ -431,6 +471,10 @@
431471
color: on($panel);
432472
}
433473
}
474+
475+
separator {
476+
background-color: $border;
477+
}
434478
}
435479

436480
// Tasklist
@@ -542,7 +586,7 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left));
542586
border-bottom: 1px solid $divider;
543587

544588
stackswitcher button {
545-
margin: -4px 0 -5px; // remove unwanted vertical margins
589+
// margin: -4px 0 -5px; // remove unwanted vertical margins
546590
padding: 0 16px;
547591
min-height: $medium-size;
548592
}
@@ -627,7 +671,7 @@ calendar.raven-calendar {
627671
// MPRIS Applet
628672
.raven-mpris {
629673
background-color: $scrim;
630-
color: on($scrim);
674+
color: on($scrim, secondary);
631675

632676
label { min-height: 24px; }
633677

@@ -638,6 +682,10 @@ calendar.raven-calendar {
638682
}
639683
}
640684

685+
image.raven-mpris {
686+
border-radius: $corner-radius;
687+
}
688+
641689
// notification list
642690
.raven-notifications-view {
643691
> .raven-background > viewport.frame {

‎src/cinnamon/cinnamon-Compact.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
306306
.popup-menu,
307307
.popup-combo-menu {
308308
padding: 0;
309+
margin: 0;
309310
color: rgba(0, 0, 0, 0.87);
310311
background-color: transparent;
312+
box-shadow: none;
311313
}
312314

313315
.menu-arrow,

‎src/cinnamon/cinnamon-Dark-Compact.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
306306
.popup-menu,
307307
.popup-combo-menu {
308308
padding: 0;
309+
margin: 0;
309310
color: white;
310311
background-color: transparent;
312+
box-shadow: none;
311313
}
312314

313315
.menu-arrow,

‎src/cinnamon/cinnamon-Dark.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
306306
.popup-menu,
307307
.popup-combo-menu {
308308
padding: 0;
309+
margin: 0;
309310
color: white;
310311
background-color: transparent;
312+
box-shadow: none;
311313
}
312314

313315
.menu-arrow,

‎src/cinnamon/cinnamon.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
306306
.popup-menu,
307307
.popup-combo-menu {
308308
padding: 0;
309+
margin: 0;
309310
color: rgba(0, 0, 0, 0.87);
310311
background-color: transparent;
312+
box-shadow: none;
311313
}
312314

313315
.menu-arrow,

‎src/gtk/3.0/gtk-Compact.css

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7230,6 +7230,46 @@ MsdOsdWindow.background.osd .progressbar {
72307230
background-color: transparent;
72317231
}
72327232

7233+
.budgie-popover.budgie-menu list.left-overlay-menu {
7234+
box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
7235+
background-color: #FFFFFF;
7236+
padding: 4px;
7237+
margin: 4px;
7238+
border-radius: 9px;
7239+
}
7240+
7241+
.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable {
7242+
border-radius: 5px;
7243+
}
7244+
7245+
.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) {
7246+
margin-bottom: 2px;
7247+
}
7248+
7249+
.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem {
7250+
border-radius: 5px;
7251+
}
7252+
7253+
.budgie-popover.budgie-menu .budgie-menu-footer {
7254+
border-top: 1px solid rgba(0, 0, 0, 0.12);
7255+
padding: 4px;
7256+
}
7257+
7258+
.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) {
7259+
min-height: 16px;
7260+
min-width: 16px;
7261+
padding: 4px;
7262+
border-radius: 5px;
7263+
}
7264+
7265+
.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button {
7266+
border-radius: 9999px;
7267+
}
7268+
7269+
.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) {
7270+
margin-right: 4px;
7271+
}
7272+
72337273
.budgie-popover.user-menu list,
72347274
.budgie-popover.user-menu row {
72357275
border: none;
@@ -7514,6 +7554,11 @@ MsdOsdWindow.background.osd .progressbar {
75147554
color: white;
75157555
}
75167556

7557+
.budgie-panel menubar separator,
7558+
.budgie-panel .menubar separator {
7559+
background-color: rgba(0, 0, 0, 0.12);
7560+
}
7561+
75177562
.budgie-panel #tasklist-button {
75187563
padding: 0 4px;
75197564
}
@@ -7636,7 +7681,6 @@ frame.raven-frame > border {
76367681
}
76377682

76387683
.raven .raven-header.top stackswitcher button {
7639-
margin: -4px 0 -5px;
76407684
padding: 0 16px;
76417685
min-height: 32px;
76427686
}
@@ -7717,7 +7761,7 @@ calendar.raven-calendar:selected {
77177761

77187762
.raven-mpris {
77197763
background-color: #242424;
7720-
color: white;
7764+
color: rgba(255, 255, 255, 0.7);
77217765
}
77227766

77237767
.raven-mpris label {
@@ -7728,6 +7772,10 @@ calendar.raven-calendar:selected {
77287772
padding: 8px;
77297773
}
77307774

7775+
image.raven-mpris {
7776+
border-radius: 10px;
7777+
}
7778+
77317779
.raven-notifications-view > .raven-background > viewport.frame {
77327780
padding: 0;
77337781
}

‎src/gtk/3.0/gtk-Dark-Compact.css

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7226,6 +7226,46 @@ MsdOsdWindow.background.osd .progressbar {
72267226
background-color: transparent;
72277227
}
72287228

7229+
.budgie-popover.budgie-menu list.left-overlay-menu {
7230+
box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
7231+
background-color: #2C2C2C;
7232+
padding: 4px;
7233+
margin: 4px;
7234+
border-radius: 9px;
7235+
}
7236+
7237+
.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable {
7238+
border-radius: 5px;
7239+
}
7240+
7241+
.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) {
7242+
margin-bottom: 2px;
7243+
}
7244+
7245+
.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem {
7246+
border-radius: 5px;
7247+
}
7248+
7249+
.budgie-popover.budgie-menu .budgie-menu-footer {
7250+
border-top: 1px solid rgba(255, 255, 255, 0.12);
7251+
padding: 4px;
7252+
}
7253+
7254+
.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) {
7255+
min-height: 16px;
7256+
min-width: 16px;
7257+
padding: 4px;
7258+
border-radius: 5px;
7259+
}
7260+
7261+
.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button {
7262+
border-radius: 9999px;
7263+
}
7264+
7265+
.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) {
7266+
margin-right: 4px;
7267+
}
7268+
72297269
.budgie-popover.user-menu list,
72307270
.budgie-popover.user-menu row {
72317271
border: none;
@@ -7510,6 +7550,11 @@ MsdOsdWindow.background.osd .progressbar {
75107550
color: white;
75117551
}
75127552

7553+
.budgie-panel menubar separator,
7554+
.budgie-panel .menubar separator {
7555+
background-color: rgba(255, 255, 255, 0.12);
7556+
}
7557+
75137558
.budgie-panel #tasklist-button {
75147559
padding: 0 4px;
75157560
}
@@ -7632,7 +7677,6 @@ frame.raven-frame > border {
76327677
}
76337678

76347679
.raven .raven-header.top stackswitcher button {
7635-
margin: -4px 0 -5px;
76367680
padding: 0 16px;
76377681
min-height: 32px;
76387682
}
@@ -7713,7 +7757,7 @@ calendar.raven-calendar:selected {
77137757

77147758
.raven-mpris {
77157759
background-color: #242424;
7716-
color: white;
7760+
color: rgba(255, 255, 255, 0.7);
77177761
}
77187762

77197763
.raven-mpris label {
@@ -7724,6 +7768,10 @@ calendar.raven-calendar:selected {
77247768
padding: 8px;
77257769
}
77267770

7771+
image.raven-mpris {
7772+
border-radius: 10px;
7773+
}
7774+
77277775
.raven-notifications-view > .raven-background > viewport.frame {
77287776
padding: 0;
77297777
}

‎src/gtk/3.0/gtk-Dark.css

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7226,6 +7226,46 @@ MsdOsdWindow.background.osd .progressbar {
72267226
background-color: transparent;
72277227
}
72287228

7229+
.budgie-popover.budgie-menu list.left-overlay-menu {
7230+
box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
7231+
background-color: #2C2C2C;
7232+
padding: 6px;
7233+
margin: 6px;
7234+
border-radius: 11px;
7235+
}
7236+
7237+
.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable {
7238+
border-radius: 5px;
7239+
}
7240+
7241+
.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) {
7242+
margin-bottom: 3px;
7243+
}
7244+
7245+
.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem {
7246+
border-radius: 5px;
7247+
}
7248+
7249+
.budgie-popover.budgie-menu .budgie-menu-footer {
7250+
border-top: 1px solid rgba(255, 255, 255, 0.12);
7251+
padding: 6px;
7252+
}
7253+
7254+
.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) {
7255+
min-height: 16px;
7256+
min-width: 16px;
7257+
padding: 6px;
7258+
border-radius: 5px;
7259+
}
7260+
7261+
.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button {
7262+
border-radius: 9999px;
7263+
}
7264+
7265+
.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) {
7266+
margin-right: 6px;
7267+
}
7268+
72297269
.budgie-popover.user-menu list,
72307270
.budgie-popover.user-menu row {
72317271
border: none;
@@ -7510,6 +7550,11 @@ MsdOsdWindow.background.osd .progressbar {
75107550
color: white;
75117551
}
75127552

7553+
.budgie-panel menubar separator,
7554+
.budgie-panel .menubar separator {
7555+
background-color: rgba(255, 255, 255, 0.12);
7556+
}
7557+
75137558
.budgie-panel #tasklist-button {
75147559
padding: 0 4px;
75157560
}
@@ -7632,7 +7677,6 @@ frame.raven-frame > border {
76327677
}
76337678

76347679
.raven .raven-header.top stackswitcher button {
7635-
margin: -4px 0 -5px;
76367680
padding: 0 16px;
76377681
min-height: 36px;
76387682
}
@@ -7713,7 +7757,7 @@ calendar.raven-calendar:selected {
77137757

77147758
.raven-mpris {
77157759
background-color: #242424;
7716-
color: white;
7760+
color: rgba(255, 255, 255, 0.7);
77177761
}
77187762

77197763
.raven-mpris label {
@@ -7724,6 +7768,10 @@ calendar.raven-calendar:selected {
77247768
padding: 12px;
77257769
}
77267770

7771+
image.raven-mpris {
7772+
border-radius: 12px;
7773+
}
7774+
77277775
.raven-notifications-view > .raven-background > viewport.frame {
77287776
padding: 0;
77297777
}

0 commit comments

Comments
 (0)