diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index 6867d2a6..4eb8fe88 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -2484,7 +2484,7 @@ headerbar > box.right { padding: 0 6px; } -headerbar separator.titlebutton { +headerbar separator.titlebutton, headerbar separator.sidebar { margin-top: 12px; margin-bottom: 12px; background-color: transparent; @@ -4162,7 +4162,9 @@ separator { background-color: rgba(255, 255, 255, 0.12); } -preferences stacksidebar.sidebar list separator, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, .tweak-categories separator, placessidebar.sidebar list > separator, stacksidebar.sidebar + separator.vertical, +preferences stacksidebar.sidebar list separator, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, window.background.csd > leaflet > box.vertical > scrolledwindow.view > viewport.frame > stack list separator, +window.background.csd > hdyleaflet > box.vertical > scrolledwindow.view > viewport.frame > stack list separator, +window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack list separator, .tweak-categories separator, placessidebar.sidebar list > separator, stacksidebar.sidebar + separator.vertical, stacksidebar.sidebar separator.horizontal, button.font separator, button.file separator { min-width: 0; min-height: 0; @@ -5642,6 +5644,10 @@ window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > vi background-color: transparent; } +window.background.csd hdycolumn stack frame.view > stack > stack list > separator { + background-color: rgba(255, 255, 255, 0.12); +} + dialog.background.csd > box.vertical.dialog-vbox > notebook > stack > box.horizontal > notebook > stack { border-radius: 0 0 12px 12px; } @@ -7620,7 +7626,7 @@ MsdOsdWindow.background.osd .progressbar { border-style: solid; border-width: 1px; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.2) rgba(0, 0, 0, 0.3); - border-radius: 6px; + border-radius: 12px; 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); background-color: #3C3C3C; } @@ -7649,10 +7655,6 @@ MsdOsdWindow.background.osd .progressbar { box-shadow: none; } -.budgie-popover row button { - border-radius: 0px; -} - .budgie-popover scrolledwindow.sidebar.categories { background-color: rgba(255, 255, 255, 0.04); } @@ -7660,16 +7662,29 @@ MsdOsdWindow.background.osd .progressbar { .budgie-popover scrolledwindow.sidebar:not(.categories) { background-color: rgba(255, 255, 255, 0.04); border-right: none; - border-bottom-left-radius: 6px; + border-bottom-left-radius: 12px; } .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable { padding: 6px 8px; } +.budgie-popover treeview.view.sidebar, .budgie-popover filechooser stack.view scrolledwindow treeview.sidebar.view, filechooser stack.view scrolledwindow .budgie-popover treeview.sidebar.view { + border-right: none; + background: none; +} + +.budgie-popover treeview.view.sidebar:hover, .budgie-popover filechooser stack.view scrolledwindow treeview.sidebar.view:hover, filechooser stack.view scrolledwindow .budgie-popover treeview.sidebar.view:hover { + background-color: alpha(currentColor, 0.08); +} + +.budgie-popover treeview.view.sidebar:selected, .budgie-popover filechooser stack.view scrolledwindow treeview.sidebar.view:selected, filechooser stack.view scrolledwindow .budgie-popover treeview.sidebar.view:selected { + background-color: alpha(currentColor, 0.12); +} + .budgie-popover.bottom scrolledwindow.sidebar:not(.categories) { - padding-top: 6px; - border-top-left-radius: 6px; + padding-top: 12px; + border-top-left-radius: 12px; border-bottom-left-radius: 0; } @@ -7691,7 +7706,7 @@ MsdOsdWindow.background.osd .progressbar { padding: 0 8px; color: white; font-weight: normal; - border-radius: 0px; + border-radius: 6px; } .budgie-popover button.flat:not(.image-button):disabled { @@ -7888,7 +7903,7 @@ MsdOsdWindow.background.osd .progressbar { } .budgie-panel.transparent { - background-color: #242424; + background-color: rgba(33, 33, 33, 0.75); } .budgie-panel button { @@ -8092,7 +8107,7 @@ frame.raven-frame > border { .raven .raven-header.top stackswitcher button { margin: -4px 0 -5px; padding: 0 16px; - min-height: 36px; + min-height: 24px; } .raven .raven-header.bottom { @@ -8125,6 +8140,7 @@ frame.raven-frame > border { .raven .powerstrip button { margin: 2px 0 1px; padding: 12px; + border-radius: 9999px; } .raven .option-subtitle { @@ -8182,6 +8198,42 @@ calendar.raven-calendar:selected { padding: 12px; } +.raven-notifications-view > .raven-background > viewport.frame { + padding: 0; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable { + margin-left: -6px; + margin-right: -3px; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable .raven-notifications-group-header { + padding: 0 12px; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list { + padding: 6px; + background: none; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list > row.activatable { + border: none; + padding: 6px; + padding-left: 12px; + margin: 3px; + border-radius: 6px; + background-color: rgba(255, 255, 255, 0.04); +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list > row.activatable:hover, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list > row.activatable:selected { + background-color: rgba(255, 255, 255, 0.12); +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:selected, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:selected:hover, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:hover, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:active, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:focus { + background: none; + box-shadow: none; +} + .budgie-notification-window, .budgie-switcher-window, .budgie-osd-window { background-color: transparent; } @@ -8217,16 +8269,24 @@ calendar.raven-calendar:selected { .budgie-session-dialog, .budgie-polkit-dialog, .budgie-run-dialog { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); background-color: #3C3C3C; + border: none; + padding: 0; } -.budgie-session-dialog.background.csd, .budgie-session-dialog decoration, -.budgie-polkit-dialog.background.csd, -.budgie-polkit-dialog decoration, -.budgie-run-dialog.background.csd, -.budgie-run-dialog decoration { - border-radius: 12px 12px 12px 12px; +.budgie-session-dialog.background, .budgie-session-dialog > decoration, +.budgie-polkit-dialog.background, +.budgie-polkit-dialog > decoration, +.budgie-run-dialog.background, +.budgie-run-dialog > decoration { + border-radius: 12px; +} + +.budgie-session-dialog > decoration, +.budgie-polkit-dialog > decoration, +.budgie-run-dialog > decoration { + border: none; + box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.75); } .budgie-session-dialog label:not(:last-child), diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index e058b8d0..3b983861 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -2484,7 +2484,7 @@ headerbar > box.right { padding: 0 6px; } -headerbar separator.titlebutton { +headerbar separator.titlebutton, headerbar separator.sidebar { margin-top: 12px; margin-bottom: 12px; background-color: transparent; @@ -4162,7 +4162,9 @@ separator { background-color: rgba(0, 0, 0, 0.12); } -preferences stacksidebar.sidebar list separator, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, .tweak-categories separator, placessidebar.sidebar list > separator, stacksidebar.sidebar + separator.vertical, +preferences stacksidebar.sidebar list separator, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, window.background.csd > leaflet > box.vertical > scrolledwindow.view > viewport.frame > stack list separator, +window.background.csd > hdyleaflet > box.vertical > scrolledwindow.view > viewport.frame > stack list separator, +window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack list separator, .tweak-categories separator, placessidebar.sidebar list > separator, stacksidebar.sidebar + separator.vertical, stacksidebar.sidebar separator.horizontal, button.font separator, button.file separator { min-width: 0; min-height: 0; @@ -5636,6 +5638,10 @@ window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > vi background-color: transparent; } +window.background.csd hdycolumn stack frame.view > stack > stack list > separator { + background-color: rgba(0, 0, 0, 0.12); +} + dialog.background.csd > box.vertical.dialog-vbox > notebook > stack > box.horizontal > notebook > stack { border-radius: 0 0 12px 12px; } @@ -7614,7 +7620,7 @@ MsdOsdWindow.background.osd .progressbar { border-style: solid; border-width: 1px; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.2) rgba(0, 0, 0, 0.3); - border-radius: 6px; + border-radius: 12px; 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); background-color: #FFFFFF; } @@ -7643,10 +7649,6 @@ MsdOsdWindow.background.osd .progressbar { box-shadow: none; } -.budgie-popover row button { - border-radius: 0px; -} - .budgie-popover scrolledwindow.sidebar.categories { background-color: rgba(0, 0, 0, 0.04); } @@ -7654,16 +7656,29 @@ MsdOsdWindow.background.osd .progressbar { .budgie-popover scrolledwindow.sidebar:not(.categories) { background-color: rgba(0, 0, 0, 0.04); border-right: none; - border-bottom-left-radius: 6px; + border-bottom-left-radius: 12px; } .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable { padding: 6px 8px; } +.budgie-popover treeview.view.sidebar, .budgie-popover filechooser stack.view scrolledwindow treeview.sidebar.view, filechooser stack.view scrolledwindow .budgie-popover treeview.sidebar.view { + border-right: none; + background: none; +} + +.budgie-popover treeview.view.sidebar:hover, .budgie-popover filechooser stack.view scrolledwindow treeview.sidebar.view:hover, filechooser stack.view scrolledwindow .budgie-popover treeview.sidebar.view:hover { + background-color: alpha(currentColor, 0.08); +} + +.budgie-popover treeview.view.sidebar:selected, .budgie-popover filechooser stack.view scrolledwindow treeview.sidebar.view:selected, filechooser stack.view scrolledwindow .budgie-popover treeview.sidebar.view:selected { + background-color: alpha(currentColor, 0.12); +} + .budgie-popover.bottom scrolledwindow.sidebar:not(.categories) { - padding-top: 6px; - border-top-left-radius: 6px; + padding-top: 12px; + border-top-left-radius: 12px; border-bottom-left-radius: 0; } @@ -7685,7 +7700,7 @@ MsdOsdWindow.background.osd .progressbar { padding: 0 8px; color: rgba(0, 0, 0, 0.87); font-weight: normal; - border-radius: 0px; + border-radius: 6px; } .budgie-popover button.flat:not(.image-button):disabled { @@ -7882,7 +7897,7 @@ MsdOsdWindow.background.osd .progressbar { } .budgie-panel.transparent { - background-color: #242424; + background-color: rgba(242, 242, 242, 0.75); } .budgie-panel button { @@ -8086,7 +8101,7 @@ frame.raven-frame > border { .raven .raven-header.top stackswitcher button { margin: -4px 0 -5px; padding: 0 16px; - min-height: 36px; + min-height: 24px; } .raven .raven-header.bottom { @@ -8119,6 +8134,7 @@ frame.raven-frame > border { .raven .powerstrip button { margin: 2px 0 1px; padding: 12px; + border-radius: 9999px; } .raven .option-subtitle { @@ -8176,6 +8192,42 @@ calendar.raven-calendar:selected { padding: 12px; } +.raven-notifications-view > .raven-background > viewport.frame { + padding: 0; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable { + margin-left: -6px; + margin-right: -3px; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable .raven-notifications-group-header { + padding: 0 12px; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list { + padding: 6px; + background: none; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list > row.activatable { + border: none; + padding: 6px; + padding-left: 12px; + margin: 3px; + border-radius: 6px; + background-color: rgba(0, 0, 0, 0.04); +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list > row.activatable:hover, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list > row.activatable:selected { + background-color: rgba(0, 0, 0, 0.12); +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:selected, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:selected:hover, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:hover, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:active, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:focus { + background: none; + box-shadow: none; +} + .budgie-notification-window, .budgie-switcher-window, .budgie-osd-window { background-color: transparent; } @@ -8211,16 +8263,24 @@ calendar.raven-calendar:selected { .budgie-session-dialog, .budgie-polkit-dialog, .budgie-run-dialog { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.15); background-color: #FFFFFF; + border: none; + padding: 0; } -.budgie-session-dialog.background.csd, .budgie-session-dialog decoration, -.budgie-polkit-dialog.background.csd, -.budgie-polkit-dialog decoration, -.budgie-run-dialog.background.csd, -.budgie-run-dialog decoration { - border-radius: 12px 12px 12px 12px; +.budgie-session-dialog.background, .budgie-session-dialog > decoration, +.budgie-polkit-dialog.background, +.budgie-polkit-dialog > decoration, +.budgie-run-dialog.background, +.budgie-run-dialog > decoration { + border-radius: 12px; +} + +.budgie-session-dialog > decoration, +.budgie-polkit-dialog > decoration, +.budgie-run-dialog > decoration { + border: none; + box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12); } .budgie-session-dialog label:not(:last-child), diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css index 76621620..0f53211f 100644 --- a/src/main/gtk-3.0/gtk.css +++ b/src/main/gtk-3.0/gtk.css @@ -2493,7 +2493,7 @@ headerbar > box.right { padding: 0 6px; } -headerbar separator.titlebutton { +headerbar separator.titlebutton, headerbar separator.sidebar { margin-top: 12px; margin-bottom: 12px; background-color: transparent; @@ -4171,7 +4171,9 @@ separator { background-color: rgba(0, 0, 0, 0.12); } -preferences stacksidebar.sidebar list separator, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, .tweak-categories separator, placessidebar.sidebar list > separator, stacksidebar.sidebar + separator.vertical, +preferences stacksidebar.sidebar list separator, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) separator, window.background.csd > leaflet > box.vertical > scrolledwindow.view > viewport.frame > stack list separator, +window.background.csd > hdyleaflet > box.vertical > scrolledwindow.view > viewport.frame > stack list separator, +window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack list separator, .tweak-categories separator, placessidebar.sidebar list > separator, stacksidebar.sidebar + separator.vertical, stacksidebar.sidebar separator.horizontal, button.font separator, button.file separator { min-width: 0; min-height: 0; @@ -5645,6 +5647,10 @@ window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > vi background-color: transparent; } +window.background.csd hdycolumn stack frame.view > stack > stack list > separator { + background-color: rgba(0, 0, 0, 0.12); +} + dialog.background.csd > box.vertical.dialog-vbox > notebook > stack > box.horizontal > notebook > stack { border-radius: 0 0 12px 12px; } @@ -7623,7 +7629,7 @@ MsdOsdWindow.background.osd .progressbar { border-style: solid; border-width: 1px; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.2) rgba(0, 0, 0, 0.3); - border-radius: 6px; + border-radius: 12px; 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); background-color: #FFFFFF; } @@ -7652,10 +7658,6 @@ MsdOsdWindow.background.osd .progressbar { box-shadow: none; } -.budgie-popover row button { - border-radius: 0px; -} - .budgie-popover scrolledwindow.sidebar.categories { background-color: rgba(0, 0, 0, 0.04); } @@ -7663,16 +7665,29 @@ MsdOsdWindow.background.osd .progressbar { .budgie-popover scrolledwindow.sidebar:not(.categories) { background-color: rgba(0, 0, 0, 0.04); border-right: none; - border-bottom-left-radius: 6px; + border-bottom-left-radius: 12px; } .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable { padding: 6px 8px; } +.budgie-popover treeview.view.sidebar, .budgie-popover filechooser stack.view scrolledwindow treeview.sidebar.view, filechooser stack.view scrolledwindow .budgie-popover treeview.sidebar.view { + border-right: none; + background: none; +} + +.budgie-popover treeview.view.sidebar:hover, .budgie-popover filechooser stack.view scrolledwindow treeview.sidebar.view:hover, filechooser stack.view scrolledwindow .budgie-popover treeview.sidebar.view:hover { + background-color: alpha(currentColor, 0.08); +} + +.budgie-popover treeview.view.sidebar:selected, .budgie-popover filechooser stack.view scrolledwindow treeview.sidebar.view:selected, filechooser stack.view scrolledwindow .budgie-popover treeview.sidebar.view:selected { + background-color: alpha(currentColor, 0.12); +} + .budgie-popover.bottom scrolledwindow.sidebar:not(.categories) { - padding-top: 6px; - border-top-left-radius: 6px; + padding-top: 12px; + border-top-left-radius: 12px; border-bottom-left-radius: 0; } @@ -7694,7 +7709,7 @@ MsdOsdWindow.background.osd .progressbar { padding: 0 8px; color: rgba(0, 0, 0, 0.87); font-weight: normal; - border-radius: 0px; + border-radius: 6px; } .budgie-popover button.flat:not(.image-button):disabled { @@ -7891,7 +7906,7 @@ MsdOsdWindow.background.osd .progressbar { } .budgie-panel.transparent { - background-color: #242424; + background-color: rgba(33, 33, 33, 0.75); } .budgie-panel button { @@ -8095,7 +8110,7 @@ frame.raven-frame > border { .raven .raven-header.top stackswitcher button { margin: -4px 0 -5px; padding: 0 16px; - min-height: 36px; + min-height: 24px; } .raven .raven-header.bottom { @@ -8128,6 +8143,7 @@ frame.raven-frame > border { .raven .powerstrip button { margin: 2px 0 1px; padding: 12px; + border-radius: 9999px; } .raven .option-subtitle { @@ -8185,6 +8201,42 @@ calendar.raven-calendar:selected { padding: 12px; } +.raven-notifications-view > .raven-background > viewport.frame { + padding: 0; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable { + margin-left: -6px; + margin-right: -3px; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable .raven-notifications-group-header { + padding: 0 12px; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list { + padding: 6px; + background: none; +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list > row.activatable { + border: none; + padding: 6px; + padding-left: 12px; + margin: 3px; + border-radius: 6px; + background-color: rgba(0, 0, 0, 0.04); +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list > row.activatable:hover, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable list > row.activatable:selected { + background-color: rgba(0, 0, 0, 0.12); +} + +.raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:selected, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:selected:hover, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:hover, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:active, .raven-notifications-view > .raven-background > viewport.frame > list > row.activatable:focus { + background: none; + box-shadow: none; +} + .budgie-notification-window, .budgie-switcher-window, .budgie-osd-window { background-color: transparent; } @@ -8220,16 +8272,24 @@ calendar.raven-calendar:selected { .budgie-session-dialog, .budgie-polkit-dialog, .budgie-run-dialog { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.15); background-color: #FFFFFF; + border: none; + padding: 0; } -.budgie-session-dialog.background.csd, .budgie-session-dialog decoration, -.budgie-polkit-dialog.background.csd, -.budgie-polkit-dialog decoration, -.budgie-run-dialog.background.csd, -.budgie-run-dialog decoration { - border-radius: 12px 12px 12px 12px; +.budgie-session-dialog.background, .budgie-session-dialog > decoration, +.budgie-polkit-dialog.background, +.budgie-polkit-dialog > decoration, +.budgie-run-dialog.background, +.budgie-run-dialog > decoration { + border-radius: 12px; +} + +.budgie-session-dialog > decoration, +.budgie-polkit-dialog > decoration, +.budgie-run-dialog > decoration { + border: none; + box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12); } .budgie-session-dialog label:not(:last-child), diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 66c3d1ad..25f66f28 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -1375,7 +1375,7 @@ headerbar { @extend %titlebar-button; } - separator.titlebutton { + separator.titlebutton, separator.sidebar { margin-top: $large-size / 4; margin-bottom: $large-size / 4; background-color: transparent; diff --git a/src/sass/gtk/apps/_budgie.scss b/src/sass/gtk/apps/_budgie.scss index 40324b81..c1e5521a 100644 --- a/src/sass/gtk/apps/_budgie.scss +++ b/src/sass/gtk/apps/_budgie.scss @@ -30,7 +30,7 @@ border-style: solid; border-width: 1px; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.2) rgba(0, 0, 0, 0.3); - border-radius: $corner-radius; + border-radius: $menu-radius; box-shadow: $shadow-z4; background-color: $surface; @@ -49,7 +49,7 @@ button { @extend %button-flat-simple; - border-radius: $corner-radius - $space-size; + // border-radius: $corner-radius; } } @@ -61,7 +61,7 @@ scrolledwindow.sidebar:not(.categories) { background-color: $fill; border-right: none; - border-bottom-left-radius: $corner-radius; + border-bottom-left-radius: $menu-radius; list > row.activatable { @extend %row_activatable; @@ -69,9 +69,17 @@ } } + treeview.view.sidebar { + border-right: none; + background: none; + + &:hover { background-color: $overlay-hover; } + &:selected { background-color: $overlay-active; } + } + &.bottom scrolledwindow.sidebar:not(.categories) { - padding-top: $corner-radius; - border-top-left-radius: $corner-radius; + padding-top: $menu-radius; + border-top-left-radius: $menu-radius; border-bottom-left-radius: 0; } @@ -95,7 +103,7 @@ padding: 0 8px; color: $text; font-weight: normal; - border-radius: $corner-radius - $space-size; + border-radius: $corner-radius; &:disabled { color: $text-disabled; } } @@ -167,8 +175,8 @@ .name-button { image { - &:dir(ltr) { margin-right: 8px - 5px; } - &:dir(rtl) { margin-left: 8px - 5px; } + &:dir(ltr) { margin-right: $space-size / 2; } + &:dir(rtl) { margin-left: $space-size / 2; } } } @@ -295,7 +303,7 @@ color: on($panel, secondary); font-weight: 500; - &.transparent { background-color: $scrim; } + &.transparent { background-color: rgba($panel, 0.75); } button { @extend %button-flat-simple; @@ -491,7 +499,7 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left)); stackswitcher button { margin: -4px 0 -5px; // remove unwanted vertical margins padding: 0 16px; - min-height: $medium-size; + min-height: $small-size; } } @@ -522,6 +530,7 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left)); .powerstrip button { margin: 2px 0 1px; padding: ($large-size - 24px) / 2; + border-radius: $circular-radius; } .option-subtitle { font-size: smaller; } @@ -585,6 +594,44 @@ calendar.raven-calendar { } } +// notification list +.raven-notifications-view { + > .raven-background > viewport.frame { + padding: 0; // reset padding for full-width list node + + > list > row.activatable { + margin-left: -$space-size; + margin-right: -$space-size / 2; + + .raven-notifications-group-header { padding: 0 $space-size * 2; } + + // sub-list rows grouping + list { + padding: $space-size; + background: none; + + > row.activatable { + border: none; + padding: $space-size; + padding-left: $space-size * 2; + margin: $space-size / 2; + border-radius: $corner-radius; + background-color: $fill; + + &:hover, &:selected { + background-color: $divider; + } + } + } + + &:selected, &:selected:hover, &:hover, &:active, &:focus { + background: none; + box-shadow: none; + } + } + } +} + // Notifications .budgie-notification-window { background-color: transparent; } @@ -633,8 +680,9 @@ calendar.raven-calendar { } %budgie_dialog { - box-shadow: inset 0 1px highlight($surface); background-color: $surface; + border: none; + padding: 0; } // Session Dialog @@ -643,7 +691,14 @@ calendar.raven-calendar { .budgie-run-dialog { @extend %budgie_dialog; - &.background.csd, decoration { border-radius: $window-radius $window-radius $window-radius $window-radius; } + &.background, & > decoration { + border-radius: $window-radius; + } + + & > decoration { + border: none; + box-shadow: $shadow-z16, 0 0 0 1px $window-border; + } label:not(:last-child), .dialog-title { diff --git a/src/sass/gtk/apps/_gnome-3.0.scss b/src/sass/gtk/apps/_gnome-3.0.scss index 69b79e8d..3201a400 100644 --- a/src/sass/gtk/apps/_gnome-3.0.scss +++ b/src/sass/gtk/apps/_gnome-3.0.scss @@ -588,10 +588,16 @@ window.background.csd { background-color: transparent; } } + + separator { @extend %hide_separators; } } } } } + + hdycolumn stack frame.view > stack > stack list > separator { + background-color: $border; + } } dialog.background.csd {