diff --git a/src/_sass/gtk/apps/_budgie.scss b/src/_sass/gtk/apps/_budgie.scss index ff60df1..5ad9444 100644 --- a/src/_sass/gtk/apps/_budgie.scss +++ b/src/_sass/gtk/apps/_budgie.scss @@ -145,6 +145,46 @@ &:checked:disabled { background-color: transparent; } // remove pointless indicator } + + list.left-overlay-menu { + box-shadow: $shadow-z4, inset 0 1px highlight($base); + background-color: $base; + padding: $space-size; + margin: $space-size; + border-radius: $menu-radius; + + > row.activatable { + border-radius: $menuitem-radius; + + &:not(:last-child) { + margin-bottom: $space-size / 2; + } + + button.menuitem { + border-radius: $menuitem-radius; + } + } + } + + .budgie-menu-footer { + border-top: 1px solid $border; + padding: $space-size; + + button.flat:not(.indicator-item) { + min-height: 16px; + min-width: 16px; + padding: $space-size; + border-radius: $menuitem-radius; + + &.image-button { + border-radius: $circular-radius; + + &:not(.last-child) { + margin-right: $space-size; + } + } + } + } } &.user-menu { @@ -431,6 +471,10 @@ color: on($panel); } } + + separator { + background-color: $border; + } } // Tasklist @@ -542,7 +586,7 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left)); border-bottom: 1px solid $divider; stackswitcher button { - margin: -4px 0 -5px; // remove unwanted vertical margins + // margin: -4px 0 -5px; // remove unwanted vertical margins padding: 0 16px; min-height: $medium-size; } @@ -627,7 +671,7 @@ calendar.raven-calendar { // MPRIS Applet .raven-mpris { background-color: $scrim; - color: on($scrim); + color: on($scrim, secondary); label { min-height: 24px; } @@ -638,6 +682,10 @@ calendar.raven-calendar { } } +image.raven-mpris { + border-radius: $corner-radius; +} + // notification list .raven-notifications-view { > .raven-background > viewport.frame { diff --git a/src/cinnamon/cinnamon-Compact.css b/src/cinnamon/cinnamon-Compact.css index 0b0b704..e3be671 100644 --- a/src/cinnamon/cinnamon-Compact.css +++ b/src/cinnamon/cinnamon-Compact.css @@ -306,8 +306,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-menu, .popup-combo-menu { padding: 0; + margin: 0; color: rgba(0, 0, 0, 0.87); background-color: transparent; + box-shadow: none; } .menu-arrow, diff --git a/src/cinnamon/cinnamon-Dark-Compact.css b/src/cinnamon/cinnamon-Dark-Compact.css index d18d39e..aa8ba10 100644 --- a/src/cinnamon/cinnamon-Dark-Compact.css +++ b/src/cinnamon/cinnamon-Dark-Compact.css @@ -306,8 +306,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-menu, .popup-combo-menu { padding: 0; + margin: 0; color: white; background-color: transparent; + box-shadow: none; } .menu-arrow, diff --git a/src/cinnamon/cinnamon-Dark.css b/src/cinnamon/cinnamon-Dark.css index 12cf190..ec78802 100644 --- a/src/cinnamon/cinnamon-Dark.css +++ b/src/cinnamon/cinnamon-Dark.css @@ -306,8 +306,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-menu, .popup-combo-menu { padding: 0; + margin: 0; color: white; background-color: transparent; + box-shadow: none; } .menu-arrow, diff --git a/src/cinnamon/cinnamon.css b/src/cinnamon/cinnamon.css index c088aec..bb9b5ed 100644 --- a/src/cinnamon/cinnamon.css +++ b/src/cinnamon/cinnamon.css @@ -306,8 +306,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-menu, .popup-combo-menu { padding: 0; + margin: 0; color: rgba(0, 0, 0, 0.87); background-color: transparent; + box-shadow: none; } .menu-arrow, diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css index 800144c..3a2f96c 100644 --- a/src/gtk/3.0/gtk-Compact.css +++ b/src/gtk/3.0/gtk-Compact.css @@ -7230,6 +7230,46 @@ MsdOsdWindow.background.osd .progressbar { background-color: transparent; } +.budgie-popover.budgie-menu list.left-overlay-menu { + 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); + background-color: #FFFFFF; + padding: 4px; + margin: 4px; + border-radius: 9px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable { + border-radius: 5px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) { + margin-bottom: 2px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem { + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer { + border-top: 1px solid rgba(0, 0, 0, 0.12); + padding: 4px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) { + min-height: 16px; + min-width: 16px; + padding: 4px; + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button { + border-radius: 9999px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) { + margin-right: 4px; +} + .budgie-popover.user-menu list, .budgie-popover.user-menu row { border: none; @@ -7514,6 +7554,11 @@ MsdOsdWindow.background.osd .progressbar { color: white; } +.budgie-panel menubar separator, +.budgie-panel .menubar separator { + background-color: rgba(0, 0, 0, 0.12); +} + .budgie-panel #tasklist-button { padding: 0 4px; } @@ -7636,7 +7681,6 @@ frame.raven-frame > border { } .raven .raven-header.top stackswitcher button { - margin: -4px 0 -5px; padding: 0 16px; min-height: 32px; } @@ -7717,7 +7761,7 @@ calendar.raven-calendar:selected { .raven-mpris { background-color: #242424; - color: white; + color: rgba(255, 255, 255, 0.7); } .raven-mpris label { @@ -7728,6 +7772,10 @@ calendar.raven-calendar:selected { padding: 8px; } +image.raven-mpris { + border-radius: 10px; +} + .raven-notifications-view > .raven-background > viewport.frame { padding: 0; } diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css index 0bd6b18..3c68b9e 100644 --- a/src/gtk/3.0/gtk-Dark-Compact.css +++ b/src/gtk/3.0/gtk-Dark-Compact.css @@ -7226,6 +7226,46 @@ MsdOsdWindow.background.osd .progressbar { background-color: transparent; } +.budgie-popover.budgie-menu list.left-overlay-menu { + 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); + background-color: #2C2C2C; + padding: 4px; + margin: 4px; + border-radius: 9px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable { + border-radius: 5px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) { + margin-bottom: 2px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem { + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer { + border-top: 1px solid rgba(255, 255, 255, 0.12); + padding: 4px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) { + min-height: 16px; + min-width: 16px; + padding: 4px; + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button { + border-radius: 9999px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) { + margin-right: 4px; +} + .budgie-popover.user-menu list, .budgie-popover.user-menu row { border: none; @@ -7510,6 +7550,11 @@ MsdOsdWindow.background.osd .progressbar { color: white; } +.budgie-panel menubar separator, +.budgie-panel .menubar separator { + background-color: rgba(255, 255, 255, 0.12); +} + .budgie-panel #tasklist-button { padding: 0 4px; } @@ -7632,7 +7677,6 @@ frame.raven-frame > border { } .raven .raven-header.top stackswitcher button { - margin: -4px 0 -5px; padding: 0 16px; min-height: 32px; } @@ -7713,7 +7757,7 @@ calendar.raven-calendar:selected { .raven-mpris { background-color: #242424; - color: white; + color: rgba(255, 255, 255, 0.7); } .raven-mpris label { @@ -7724,6 +7768,10 @@ calendar.raven-calendar:selected { padding: 8px; } +image.raven-mpris { + border-radius: 10px; +} + .raven-notifications-view > .raven-background > viewport.frame { padding: 0; } diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css index ef60a50..f49ec5d 100644 --- a/src/gtk/3.0/gtk-Dark.css +++ b/src/gtk/3.0/gtk-Dark.css @@ -7226,6 +7226,46 @@ MsdOsdWindow.background.osd .progressbar { background-color: transparent; } +.budgie-popover.budgie-menu list.left-overlay-menu { + 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); + background-color: #2C2C2C; + padding: 6px; + margin: 6px; + border-radius: 11px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable { + border-radius: 5px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) { + margin-bottom: 3px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem { + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer { + border-top: 1px solid rgba(255, 255, 255, 0.12); + padding: 6px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) { + min-height: 16px; + min-width: 16px; + padding: 6px; + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button { + border-radius: 9999px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) { + margin-right: 6px; +} + .budgie-popover.user-menu list, .budgie-popover.user-menu row { border: none; @@ -7510,6 +7550,11 @@ MsdOsdWindow.background.osd .progressbar { color: white; } +.budgie-panel menubar separator, +.budgie-panel .menubar separator { + background-color: rgba(255, 255, 255, 0.12); +} + .budgie-panel #tasklist-button { padding: 0 4px; } @@ -7632,7 +7677,6 @@ frame.raven-frame > border { } .raven .raven-header.top stackswitcher button { - margin: -4px 0 -5px; padding: 0 16px; min-height: 36px; } @@ -7713,7 +7757,7 @@ calendar.raven-calendar:selected { .raven-mpris { background-color: #242424; - color: white; + color: rgba(255, 255, 255, 0.7); } .raven-mpris label { @@ -7724,6 +7768,10 @@ calendar.raven-calendar:selected { padding: 12px; } +image.raven-mpris { + border-radius: 12px; +} + .raven-notifications-view > .raven-background > viewport.frame { padding: 0; } diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css index f1fd8ee..ac603fd 100644 --- a/src/gtk/3.0/gtk-Light-Compact.css +++ b/src/gtk/3.0/gtk-Light-Compact.css @@ -7229,6 +7229,46 @@ MsdOsdWindow.background.osd .progressbar { background-color: transparent; } +.budgie-popover.budgie-menu list.left-overlay-menu { + 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); + background-color: #FFFFFF; + padding: 4px; + margin: 4px; + border-radius: 9px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable { + border-radius: 5px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) { + margin-bottom: 2px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem { + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer { + border-top: 1px solid rgba(0, 0, 0, 0.12); + padding: 4px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) { + min-height: 16px; + min-width: 16px; + padding: 4px; + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button { + border-radius: 9999px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) { + margin-right: 4px; +} + .budgie-popover.user-menu list, .budgie-popover.user-menu row { border: none; @@ -7513,6 +7553,11 @@ MsdOsdWindow.background.osd .progressbar { color: rgba(0, 0, 0, 0.87); } +.budgie-panel menubar separator, +.budgie-panel .menubar separator { + background-color: rgba(0, 0, 0, 0.12); +} + .budgie-panel #tasklist-button { padding: 0 4px; } @@ -7635,7 +7680,6 @@ frame.raven-frame > border { } .raven .raven-header.top stackswitcher button { - margin: -4px 0 -5px; padding: 0 16px; min-height: 32px; } @@ -7716,7 +7760,7 @@ calendar.raven-calendar:selected { .raven-mpris { background-color: #242424; - color: white; + color: rgba(255, 255, 255, 0.7); } .raven-mpris label { @@ -7727,6 +7771,10 @@ calendar.raven-calendar:selected { padding: 8px; } +image.raven-mpris { + border-radius: 10px; +} + .raven-notifications-view > .raven-background > viewport.frame { padding: 0; } diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css index 5a315d7..1a7338f 100644 --- a/src/gtk/3.0/gtk-Light.css +++ b/src/gtk/3.0/gtk-Light.css @@ -7229,6 +7229,46 @@ MsdOsdWindow.background.osd .progressbar { background-color: transparent; } +.budgie-popover.budgie-menu list.left-overlay-menu { + 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); + background-color: #FFFFFF; + padding: 6px; + margin: 6px; + border-radius: 11px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable { + border-radius: 5px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) { + margin-bottom: 3px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem { + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer { + border-top: 1px solid rgba(0, 0, 0, 0.12); + padding: 6px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) { + min-height: 16px; + min-width: 16px; + padding: 6px; + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button { + border-radius: 9999px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) { + margin-right: 6px; +} + .budgie-popover.user-menu list, .budgie-popover.user-menu row { border: none; @@ -7513,6 +7553,11 @@ MsdOsdWindow.background.osd .progressbar { color: rgba(0, 0, 0, 0.87); } +.budgie-panel menubar separator, +.budgie-panel .menubar separator { + background-color: rgba(0, 0, 0, 0.12); +} + .budgie-panel #tasklist-button { padding: 0 4px; } @@ -7635,7 +7680,6 @@ frame.raven-frame > border { } .raven .raven-header.top stackswitcher button { - margin: -4px 0 -5px; padding: 0 16px; min-height: 36px; } @@ -7716,7 +7760,7 @@ calendar.raven-calendar:selected { .raven-mpris { background-color: #242424; - color: white; + color: rgba(255, 255, 255, 0.7); } .raven-mpris label { @@ -7727,6 +7771,10 @@ calendar.raven-calendar:selected { padding: 12px; } +image.raven-mpris { + border-radius: 12px; +} + .raven-notifications-view > .raven-background > viewport.frame { padding: 0; } diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css index 6f3f35b..a8c93ae 100644 --- a/src/gtk/3.0/gtk.css +++ b/src/gtk/3.0/gtk.css @@ -7230,6 +7230,46 @@ MsdOsdWindow.background.osd .progressbar { background-color: transparent; } +.budgie-popover.budgie-menu list.left-overlay-menu { + 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); + background-color: #FFFFFF; + padding: 6px; + margin: 6px; + border-radius: 11px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable { + border-radius: 5px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) { + margin-bottom: 3px; +} + +.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem { + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer { + border-top: 1px solid rgba(0, 0, 0, 0.12); + padding: 6px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item) { + min-height: 16px; + min-width: 16px; + padding: 6px; + border-radius: 5px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button { + border-radius: 9999px; +} + +.budgie-popover.budgie-menu .budgie-menu-footer button.flat:not(.indicator-item).image-button:not(.last-child) { + margin-right: 6px; +} + .budgie-popover.user-menu list, .budgie-popover.user-menu row { border: none; @@ -7514,6 +7554,11 @@ MsdOsdWindow.background.osd .progressbar { color: white; } +.budgie-panel menubar separator, +.budgie-panel .menubar separator { + background-color: rgba(0, 0, 0, 0.12); +} + .budgie-panel #tasklist-button { padding: 0 4px; } @@ -7636,7 +7681,6 @@ frame.raven-frame > border { } .raven .raven-header.top stackswitcher button { - margin: -4px 0 -5px; padding: 0 16px; min-height: 36px; } @@ -7717,7 +7761,7 @@ calendar.raven-calendar:selected { .raven-mpris { background-color: #242424; - color: white; + color: rgba(255, 255, 255, 0.7); } .raven-mpris label { @@ -7728,6 +7772,10 @@ calendar.raven-calendar:selected { padding: 12px; } +image.raven-mpris { + border-radius: 12px; +} + .raven-notifications-view > .raven-background > viewport.frame { padding: 0; }