diff --git a/src/assets/gnome-shell/common-assets/window-close-active.svg b/src/assets/gnome-shell/common-assets/window-close-active.svg index 0dde2b9d..a6ba1780 100644 --- a/src/assets/gnome-shell/common-assets/window-close-active.svg +++ b/src/assets/gnome-shell/common-assets/window-close-active.svg @@ -1,10 +1,116 @@ - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/gnome-shell/common-assets/window-close-hover.svg b/src/assets/gnome-shell/common-assets/window-close-hover.svg index 37f8806a..a6bd4693 100644 --- a/src/assets/gnome-shell/common-assets/window-close-hover.svg +++ b/src/assets/gnome-shell/common-assets/window-close-hover.svg @@ -1,10 +1,137 @@ - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/gnome-shell/common-assets/window-close.svg b/src/assets/gnome-shell/common-assets/window-close.svg index 5dcc697b..8ca7f5e1 100644 --- a/src/assets/gnome-shell/common-assets/window-close.svg +++ b/src/assets/gnome-shell/common-assets/window-close.svg @@ -1,10 +1,119 @@ - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/sass/gnome-shell/_widgets-3-28.scss b/src/sass/gnome-shell/_widgets-3-28.scss index 3530c8ec..76a69830 100644 --- a/src/sass/gnome-shell/_widgets-3-28.scss +++ b/src/sass/gnome-shell/_widgets-3-28.scss @@ -30,12 +30,12 @@ @import 'common/switches'; @import 'common/tiled-previews'; @import 'common/workspace-switcher'; -@import 'common/workspace-thumbnails'; @import 'widgets-3-28/app-grid'; @import 'widgets-3-28/dash'; @import 'widgets-3-28/login-dialog'; -//@import 'widgets-3-28/other'; +@import 'widgets-3-28/other'; @import 'widgets-3-28/overview'; @import 'widgets-3-28/panel'; @import 'widgets-3-28/search-results'; @import 'widgets-3-28/window-picker'; +@import 'widgets-3-28/workspace-thumbnails'; diff --git a/src/sass/gnome-shell/_widgets-40-0.scss b/src/sass/gnome-shell/_widgets-40-0.scss index 2561dcb6..5665d50d 100644 --- a/src/sass/gnome-shell/_widgets-40-0.scss +++ b/src/sass/gnome-shell/_widgets-40-0.scss @@ -30,7 +30,6 @@ @import 'common/switches'; @import 'common/tiled-previews'; @import 'common/workspace-switcher'; -@import 'common/workspace-thumbnails'; @import 'widgets-40-0/app-grid'; @import 'widgets-40-0/dash'; @import 'widgets-40-0/misc'; @@ -40,3 +39,4 @@ @import 'widgets-40-0/search-entry'; @import 'widgets-40-0/search-results'; @import 'widgets-40-0/window-picker'; +@import 'widgets-40-0/workspace-thumbnails'; diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss index 6ec63a6f..6c492d09 100644 --- a/src/sass/gnome-shell/common/_calendar.scss +++ b/src/sass/gnome-shell/common/_calendar.scss @@ -1,5 +1,29 @@ /* Date/Time Menu */ +$popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($base_color, 8%), 0.95)); + +%popover_bubble { + color: $alt_fg_color; + background-color: $popover_bubble_bg; + border-radius: $mn_radius; + border: none; + box-shadow: none; + text-shadow: none; + transition: none; + + &:hover, &:focus { + color: $fg_color; + background-color: if($variant == 'light', rgba($popover_bubble_bg, 1), rgba(lighten($popover_bubble_bg, 5%), 1)); + box-shadow: 0 3px 5px rgba(black, 0.1); + } + + &:active { + color: $fg_color; + background-color: if($variant == 'light', darken($popover_bubble_bg, 1%), lighten($popover_bubble_bg, 3%)); + box-shadow: none; + } +} + .clock-display-box { spacing: 2px; @@ -45,7 +69,6 @@ /* today button (the date) */ .datemenu-today-button { -// min-height: $menuitem_size * 2 - 4px * 2; border: none; box-shadow: none; background: none; @@ -55,12 +78,12 @@ &:hover, &:focus { color: $fg_color; - background-color: if($variant == 'light', rgba(white, 1), rgba(lighten($base_color, 15%), 0.75)); + background-color: if($variant == 'light', rgba($popover_bubble_bg, 1), rgba(lighten($popover_bubble_bg, 5%), 1)); } &:active { color: $fg_color; - background-color: if($variant == 'light', rgba(white, 0.65), rgba(lighten($base_color, 10%), 0.75)); + background-color: if($variant == 'light', darken($popover_bubble_bg, 5%), lighten($popover_bubble_bg, 8%)); } // weekday label @@ -80,7 +103,7 @@ margin: 2px 12px; border: none; box-shadow: none; - background-color: if($variant == 'light', rgba(white, 0.75), rgba(lighten($base_color, 8%), 0.75)); + background-color: $popover_bubble_bg; padding: 4px 8px; text-shadow: none; border-radius: $mn_radius; @@ -98,21 +121,13 @@ } // prev/next month icons - .calendar-change-month-back StIcon, - .calendar-change-month-forward StIcon { - icon-size: $base_icon_size; - } + .calendar-change-month-back, + .calendar-change-month-forward { + padding: 0 4px; - .calendar-change-month-back { //arrow back - padding: 0 2px; - background-image: url("assets/calendar-arrow-left.svg"); - &:rtl { background-image: url("assets/calendar-arrow-right.svg"); } - } - - .calendar-change-month-forward { //arrow foreward - padding: 0 2px; - background-image: url("assets/calendar-arrow-right.svg"); - &:rtl { background-image: url("assets/calendar-arrow-left.svg"); } + StIcon { + icon-size: $base_icon_size; + } } .pager-button { @@ -238,7 +253,7 @@ .world-clocks-button, .weather-button, .events-button { - @extend %popover_bubble !optional; + @extend %popover_bubble; padding: 12px; margin: 2px 4px; } diff --git a/src/sass/gnome-shell/common/_message-list.scss b/src/sass/gnome-shell/common/_message-list.scss index 7322440b..cb434128 100644 --- a/src/sass/gnome-shell/common/_message-list.scss +++ b/src/sass/gnome-shell/common/_message-list.scss @@ -34,7 +34,10 @@ // message bubbles .message { margin: 0 4px 6px; - @extend %popover_bubble; + + .popup-menu & { + @extend %popover_bubble; + } // icon container .message-icon-bin { diff --git a/src/sass/gnome-shell/common/_notifications.scss b/src/sass/gnome-shell/common/_notifications.scss index 902c74f7..db117501 100644 --- a/src/sass/gnome-shell/common/_notifications.scss +++ b/src/sass/gnome-shell/common/_notifications.scss @@ -8,12 +8,13 @@ margin: 5px; border-radius: $bt_radius; color: $fg_color; - background-color: $base_color; + background-color: $menu_bg; border: none; - box-shadow: 0 3px 5px rgba(0, 0, 0, 0.35); + text-shadow: none; + box-shadow: 0 3px 5px rgba(0, 0, 0, 0.25); - &:hover { background-color: rgba($base_color, 1); box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); } - &:focus { background-color: $base_color; } + &:hover { background-color: rgba($menu_bg, 1); box-shadow: 0 5px 12px rgba(0, 0, 0, 0.25); } + &:focus { background-color: $menu_bg; } .notification-icon { padding: 5px; } .notification-content { padding: 5px; spacing: 5px; } diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss index f73fb95e..18daf77e 100644 --- a/src/sass/gnome-shell/common/_popovers.scss +++ b/src/sass/gnome-shell/common/_popovers.scss @@ -2,28 +2,6 @@ $popop_menuitem_radius: $wm_radius - 4px; -%popover_bubble { - border-radius: $mn_radius; - border: none; - box-shadow: none; - background-color: if($variant == 'light', rgba(white, 0.95), rgba(lighten($base_color, 5%), 0.95)); - text-shadow: none; - color: $alt_fg_color; - transition: none; - - &:hover, &:focus { - color: $fg_color; - background-color: if($variant == 'light', rgba(white, 1), rgba(lighten($base_color, 10%), 1)); - box-shadow: 0 3px 5px rgba(black, 0.1); - } - - &:active { - color: $fg_color; - background-color: if($variant == 'light', rgba(#fafafa, 1), rgba(lighten($base_color, 8%), 1)); - box-shadow: none; - } -} - //.the popover itself .popup-menu-boxpointer { -arrow-border-radius: 2px; diff --git a/src/sass/gnome-shell/widgets-3-28/_dash.scss b/src/sass/gnome-shell/widgets-3-28/_dash.scss index 2914fc98..b5256fd0 100644 --- a/src/sass/gnome-shell/widgets-3-28/_dash.scss +++ b/src/sass/gnome-shell/widgets-3-28/_dash.scss @@ -3,7 +3,7 @@ background-color: $light_divider_color; border-left: 0; border-radius: 0 ($bd_radius * 1.5) ($bd_radius * 1.5) 0; - padding: 0 6px; + padding: 6px; &:rtl { border-radius: ($bd_radius * 1.5) 0 0 ($bd_radius * 1.5); diff --git a/src/sass/gnome-shell/widgets-3-28/_other.scss b/src/sass/gnome-shell/widgets-3-28/_other.scss index 26c9bb86..fa386d25 100644 --- a/src/sass/gnome-shell/widgets-3-28/_other.scss +++ b/src/sass/gnome-shell/widgets-3-28/_other.scss @@ -43,7 +43,10 @@ .app-folder-popup-bin { padding: 5px; } -.no-frequent-applications-label { @extend %status_text; } +.no-frequent-applications-label { + @include font(display-2); + color: $light_hint_fg_color; +} .overview-icon.overview-icon-with-label, .grid-search-result .overview-icon.overview-icon-with-label { diff --git a/src/sass/gnome-shell/widgets-3-28/_window-picker.scss b/src/sass/gnome-shell/widgets-3-28/_window-picker.scss index fb54d657..c923f6a6 100644 --- a/src/sass/gnome-shell/widgets-3-28/_window-picker.scss +++ b/src/sass/gnome-shell/widgets-3-28/_window-picker.scss @@ -27,31 +27,33 @@ box-shadow: inset 0 0 0 1px $light_track_color; } +$_close_size: 42px; + //close buttons .window-close { - background-size: 26px; - height: 26px; - width: 26px; + background-size: $_close_size; + height: $_close_size; + width: $_close_size; -shell-close-overlap: 10px; border-radius: 100px; border: 0 none transparent; background-color: transparent; color: transparent; box-shadow: none; - StIcon { icon-size: 26px; } // for safety + StIcon { icon-size: $_close_size; } // for safety background-image: url("assets/window-close.svg"); &:hover { - background-size: 26px; - height: 26px; - width: 26px; + background-size: $_close_size; + height: $_close_size; + width: $_close_size; background-image: url("assets/window-close-hover.svg"); } &:active { - background-size: 26px; - height: 26px; - width: 26px; + background-size: $_close_size; + height: $_close_size; + width: $_close_size; background-image: url("assets/window-close-active.svg"); } } diff --git a/src/sass/gnome-shell/widgets-3-28/_workspace-thumbnails.scss b/src/sass/gnome-shell/widgets-3-28/_workspace-thumbnails.scss new file mode 100644 index 00000000..1401d75d --- /dev/null +++ b/src/sass/gnome-shell/widgets-3-28/_workspace-thumbnails.scss @@ -0,0 +1,33 @@ +// Workspace pager + +.workspace-thumbnails { //container ala dash + color: $light_alt_fg_color; + background-color: $light_divider_color; + border: none; + visible-width: 32px; //amount visible before hover + spacing: 12px; + padding: 16px; + border-radius: $bt_radius; + margin: 6px; + // border-width: 0; //fixme: can't have non unoform borders :( + // &:rtl { border-radius: $bt_radius; } + + .placeholder { + background-image: url("assets/dash-placeholder.svg"); + background-size: contain; + height: 24px; + } +} +.workspace-thumbnail-indicator { + border: 2px solid $primary_color; + padding: 6px; + border-radius: 2px; +} + +//Some hacks I don't even +.all-apps, +.search-display > StBoxLayout, +.frequent-apps > StBoxLayout { + // horizontal padding to make sure scrollbars or dash don't overlap content + padding: 0px 88px 10px 88px; +} diff --git a/src/sass/gnome-shell/common/_workspace-thumbnails.scss b/src/sass/gnome-shell/widgets-40-0/_workspace-thumbnails.scss similarity index 100% rename from src/sass/gnome-shell/common/_workspace-thumbnails.scss rename to src/sass/gnome-shell/widgets-40-0/_workspace-thumbnails.scss