Skip to content

Commit

Permalink
Fixed menubar issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinceliuice
vinceliuice committed Dec 5, 2018
1 parent e6c4532 commit fd970c3
Show file tree
Hide file tree
Showing 14 changed files with 470 additions and 182 deletions.
9 changes: 2 additions & 7 deletions src/_sass/gtk/_common.scss
View file
Expand Up @@ -1572,13 +1572,8 @@ menubar,
padding: 4px 8px;
color: $titlebar_secondary_fg_color;

menu {
border-radius: 0 0 $buttons_radius $buttons_radius;

menu { //submenu
border-radius: $buttons_radius;
}
}
> window.background.popup > decoration,
> window.background.popup > menu { border-radius: 0 0 $buttons_radius $buttons_radius; }

&:hover { // Seems like it :hover even with keyboard focus
// transition: none;
Expand Down
31 changes: 24 additions & 7 deletions src/_sass/gtk/apps/_budgie.scss
View file
Expand Up @@ -379,6 +379,14 @@ popover.background.places-menu {

&.transparent { background-color: $panel_bg_color; }

.bottom & {
border-radius: $windows_radius $windows_radius 0 0;

&.dock-mode {
border-radius: 0 0 0 0;
}
}

button {
@extend %flat_button;
// @extend %button_selected.flat;
Expand All @@ -393,7 +401,6 @@ popover.background.places-menu {
}

&.horizontal button { padding: 0 4px; }

&.vertical button { padding: 4px 0; }

separator { background-color: $inverse_track_color; }
Expand All @@ -405,12 +412,9 @@ popover.background.places-menu {
color: $inverse_secondary_fg_color;
&:hover { color: $inverse_fg_color; }
&:disabled { color: $inverse_disabled_secondary_fg_color; }
menu {
border-radius: 0 0 $buttons_radius $buttons_radius;
menu { //submenu
border-radius: $buttons_radius;
}
}

> window.background.popup > decoration,
> window.background.popup > menu { border-radius: 0 0 $buttons_radius $buttons_radius; }
}
}

Expand Down Expand Up @@ -978,3 +982,16 @@ box.vertical > stack > box.vertical {
> button.image-button.titlebutton { padding: 0 3px; }
}
}

// vala-panel-appmenu
menubar.-vala-panel-appmenu-private {
background: none;
> menuitem {
color: $inverse_secondary_fg_color;
&:hover { color: $inverse_fg_color; }
&:disabled { color: $inverse_disabled_secondary_fg_color; }

> window.background.popup > decoration,
> window.background.popup > menu { border-radius: 0 0 $buttons_radius $buttons_radius; }
}
}
51 changes: 37 additions & 14 deletions src/gtk/gtk-compact-square.css
View file
Expand Up @@ -2068,16 +2068,13 @@ menubar > menuitem,
color: rgba(255, 255, 255, 0.7);
}

menubar > menuitem menu,
.menubar > menuitem menu {
menubar > menuitem > window.background.popup > decoration,
menubar > menuitem > window.background.popup > menu,
.menubar > menuitem > window.background.popup > decoration,
.menubar > menuitem > window.background.popup > menu {
border-radius: 0 0 6px 6px;
}

menubar > menuitem menu menu,
.menubar > menuitem menu menu {
border-radius: 6px;
}

menubar > menuitem:hover,
.menubar > menuitem:hover {
color: #FFFFFF;
Expand Down Expand Up @@ -7117,6 +7114,14 @@ popover.background.places-menu row {
background-color: rgba(39, 42, 42, 0.85);
}

.bottom .budgie-panel {
border-radius: 8px 8px 0 0;
}

.bottom .budgie-panel.dock-mode {
border-radius: 0 0 0 0;
}

.budgie-panel button {
min-height: 16px;
min-width: 16px;
Expand Down Expand Up @@ -7161,16 +7166,13 @@ popover.background.places-menu row {
color: rgba(255, 255, 255, 0.3);
}

.budgie-panel menubar > menuitem menu,
.budgie-panel .menubar > menuitem menu {
.budgie-panel menubar > menuitem > window.background.popup > decoration,
.budgie-panel menubar > menuitem > window.background.popup > menu,
.budgie-panel .menubar > menuitem > window.background.popup > decoration,
.budgie-panel .menubar > menuitem > window.background.popup > menu {
border-radius: 0 0 6px 6px;
}

.budgie-panel menubar > menuitem menu menu,
.budgie-panel .menubar > menuitem menu menu {
border-radius: 6px;
}

.budgie-panel .alert {
color: #66BB6A;
}
Expand Down Expand Up @@ -7886,6 +7888,27 @@ box.vertical > stack > box.vertical .raven-background > viewport.frame .budgie-m
padding: 0 3px;
}

menubar.-vala-panel-appmenu-private {
background: none;
}

menubar.-vala-panel-appmenu-private > menuitem {
color: rgba(255, 255, 255, 0.7);
}

menubar.-vala-panel-appmenu-private > menuitem:hover {
color: #FFFFFF;
}

menubar.-vala-panel-appmenu-private > menuitem:disabled {
color: rgba(255, 255, 255, 0.3);
}

menubar.-vala-panel-appmenu-private > menuitem > window.background.popup > decoration,
menubar.-vala-panel-appmenu-private > menuitem > window.background.popup > menu {
border-radius: 0 0 6px 6px;
}

/************************
* LightDM GTK+ Greeter *
************************/
Expand Down
51 changes: 37 additions & 14 deletions src/gtk/gtk-compact.css
View file
Expand Up @@ -2068,16 +2068,13 @@ menubar > menuitem,
color: rgba(255, 255, 255, 0.7);
}

menubar > menuitem menu,
.menubar > menuitem menu {
menubar > menuitem > window.background.popup > decoration,
menubar > menuitem > window.background.popup > menu,
.menubar > menuitem > window.background.popup > decoration,
.menubar > menuitem > window.background.popup > menu {
border-radius: 0 0 6px 6px;
}

menubar > menuitem menu menu,
.menubar > menuitem menu menu {
border-radius: 6px;
}

menubar > menuitem:hover,
.menubar > menuitem:hover {
color: #FFFFFF;
Expand Down Expand Up @@ -7117,6 +7114,14 @@ popover.background.places-menu row {
background-color: rgba(39, 42, 42, 0.85);
}

.bottom .budgie-panel {
border-radius: 8px 8px 0 0;
}

.bottom .budgie-panel.dock-mode {
border-radius: 0 0 0 0;
}

.budgie-panel button {
min-height: 16px;
min-width: 16px;
Expand Down Expand Up @@ -7161,16 +7166,13 @@ popover.background.places-menu row {
color: rgba(255, 255, 255, 0.3);
}

.budgie-panel menubar > menuitem menu,
.budgie-panel .menubar > menuitem menu {
.budgie-panel menubar > menuitem > window.background.popup > decoration,
.budgie-panel menubar > menuitem > window.background.popup > menu,
.budgie-panel .menubar > menuitem > window.background.popup > decoration,
.budgie-panel .menubar > menuitem > window.background.popup > menu {
border-radius: 0 0 6px 6px;
}

.budgie-panel menubar > menuitem menu menu,
.budgie-panel .menubar > menuitem menu menu {
border-radius: 6px;
}

.budgie-panel .alert {
color: #66BB6A;
}
Expand Down Expand Up @@ -7886,6 +7888,27 @@ box.vertical > stack > box.vertical .raven-background > viewport.frame .budgie-m
padding: 0 3px;
}

menubar.-vala-panel-appmenu-private {
background: none;
}

menubar.-vala-panel-appmenu-private > menuitem {
color: rgba(255, 255, 255, 0.7);
}

menubar.-vala-panel-appmenu-private > menuitem:hover {
color: #FFFFFF;
}

menubar.-vala-panel-appmenu-private > menuitem:disabled {
color: rgba(255, 255, 255, 0.3);
}

menubar.-vala-panel-appmenu-private > menuitem > window.background.popup > decoration,
menubar.-vala-panel-appmenu-private > menuitem > window.background.popup > menu {
border-radius: 0 0 6px 6px;
}

/************************
* LightDM GTK+ Greeter *
************************/
Expand Down
51 changes: 37 additions & 14 deletions src/gtk/gtk-dark-compact-square.css
View file
Expand Up @@ -2068,16 +2068,13 @@ menubar > menuitem,
color: rgba(255, 255, 255, 0.7);
}

menubar > menuitem menu,
.menubar > menuitem menu {
menubar > menuitem > window.background.popup > decoration,
menubar > menuitem > window.background.popup > menu,
.menubar > menuitem > window.background.popup > decoration,
.menubar > menuitem > window.background.popup > menu {
border-radius: 0 0 6px 6px;
}

menubar > menuitem menu menu,
.menubar > menuitem menu menu {
border-radius: 6px;
}

menubar > menuitem:hover,
.menubar > menuitem:hover {
color: #FFFFFF;
Expand Down Expand Up @@ -7117,6 +7114,14 @@ popover.background.places-menu row {
background-color: rgba(39, 42, 42, 0.85);
}

.bottom .budgie-panel {
border-radius: 8px 8px 0 0;
}

.bottom .budgie-panel.dock-mode {
border-radius: 0 0 0 0;
}

.budgie-panel button {
min-height: 16px;
min-width: 16px;
Expand Down Expand Up @@ -7161,16 +7166,13 @@ popover.background.places-menu row {
color: rgba(255, 255, 255, 0.3);
}

.budgie-panel menubar > menuitem menu,
.budgie-panel .menubar > menuitem menu {
.budgie-panel menubar > menuitem > window.background.popup > decoration,
.budgie-panel menubar > menuitem > window.background.popup > menu,
.budgie-panel .menubar > menuitem > window.background.popup > decoration,
.budgie-panel .menubar > menuitem > window.background.popup > menu {
border-radius: 0 0 6px 6px;
}

.budgie-panel menubar > menuitem menu menu,
.budgie-panel .menubar > menuitem menu menu {
border-radius: 6px;
}

.budgie-panel .alert {
color: #66BB6A;
}
Expand Down Expand Up @@ -7886,6 +7888,27 @@ box.vertical > stack > box.vertical .raven-background > viewport.frame .budgie-m
padding: 0 3px;
}

menubar.-vala-panel-appmenu-private {
background: none;
}

menubar.-vala-panel-appmenu-private > menuitem {
color: rgba(255, 255, 255, 0.7);
}

menubar.-vala-panel-appmenu-private > menuitem:hover {
color: #FFFFFF;
}

menubar.-vala-panel-appmenu-private > menuitem:disabled {
color: rgba(255, 255, 255, 0.3);
}

menubar.-vala-panel-appmenu-private > menuitem > window.background.popup > decoration,
menubar.-vala-panel-appmenu-private > menuitem > window.background.popup > menu {
border-radius: 0 0 6px 6px;
}

/************************
* LightDM GTK+ Greeter *
************************/
Expand Down

0 comments on commit fd970c3

Please sign in to comment.