From 9371bbf8227c3970f37a07ad5e7b61553884da60 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Thu, 19 Jan 2023 14:45:54 +0800 Subject: [PATCH] update --- src/_sass/_variables.scss | 7 +++-- src/_sass/gnome-shell/_common-3-28.scss | 8 ++--- src/_sass/gnome-shell/_common.scss | 4 +-- src/_sass/gnome-shell/widgets/_dialogs.scss | 2 +- .../gnome-shell/widgets/_looking-glass.scss | 4 +-- src/_sass/gnome-shell/widgets/_osd-42.scss | 25 ++++++++++++--- .../gnome-shell/widgets/_popovers-42.scss | 2 +- src/_sass/gnome-shell/widgets/_popovers.scss | 2 +- .../shell-3-28/gnome-shell-Compact.css | 6 ++-- .../shell-3-28/gnome-shell-Dark-Compact.css | 6 ++-- .../shell-3-28/gnome-shell-Dark.css | 6 ++-- src/gnome-shell/shell-3-28/gnome-shell.css | 6 ++-- .../shell-40-0/gnome-shell-Compact.css | 8 ++--- .../shell-40-0/gnome-shell-Dark-Compact.css | 8 ++--- .../shell-40-0/gnome-shell-Dark.css | 8 ++--- src/gnome-shell/shell-40-0/gnome-shell.css | 8 ++--- .../shell-42-0/gnome-shell-Compact.css | 31 +++++++++++++------ .../shell-42-0/gnome-shell-Dark-Compact.css | 31 +++++++++++++------ .../shell-42-0/gnome-shell-Dark.css | 31 +++++++++++++------ src/gnome-shell/shell-42-0/gnome-shell.css | 31 +++++++++++++------ 20 files changed, 151 insertions(+), 83 deletions(-) diff --git a/src/_sass/_variables.scss b/src/_sass/_variables.scss index 68fa9bf..846f80d 100644 --- a/src/_sass/_variables.scss +++ b/src/_sass/_variables.scss @@ -132,6 +132,7 @@ $icon-shadow-z4: // workaround for Gnome-shell $shell-shadow-z1: 0 1px 2px rgba(black, 0.25); $shell-shadow-z2: 0 3px 3px rgba(black, 0.32); -$shell-shadow-z3: 0 6px 10px rgba(black, 0.32); -$shell-shadow-z4: 0 10px 15px rgba(black, 0.45); -$shell-shadow-z5: 0 12px 20px rgba(black, 0.6); +$shell-shadow-z3: 0 3px 8px rgba(black, 0.2); +$shell-shadow-z4: 0 6px 10px rgba(black, 0.32); +$shell-shadow-z5: 0 10px 15px rgba(black, 0.45); +$shell-shadow-z6: 0 12px 20px rgba(black, 0.6); diff --git a/src/_sass/gnome-shell/_common-3-28.scss b/src/_sass/gnome-shell/_common-3-28.scss index 841c20e..7634c9c 100644 --- a/src/_sass/gnome-shell/_common-3-28.scss +++ b/src/_sass/gnome-shell/_common-3-28.scss @@ -1133,7 +1133,7 @@ $submenu_item_radius: $popup-radius - $space-size; color: $text; background-color: $base; border: none; - box-shadow: $shell-shadow-z2; + box-shadow: $shell-shadow-z3; border-radius: $material-radius; padding: 12px; } @@ -2969,7 +2969,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard, 20%), light .screen-shield-background { //just the shadow, really background: black; - box-shadow: $shell-shadow-z5; + box-shadow: $shell-shadow-z6; } /* Screen Shield */ @@ -3051,7 +3051,7 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard, 20%), light padding: 6px; border: none; border-radius: $material-radius; - box-shadow: $shell-shadow-z4; + box-shadow: $shell-shadow-z5; & > #Toolbar { padding: 0 8px; @@ -3156,5 +3156,5 @@ $keyboard_active_bg_color: if($variant == 'light', darken($keyboard, 20%), light border: none; border-radius: $material-radius; padding: 6px; - box-shadow: $shell-shadow-z4; + box-shadow: $shell-shadow-z5; } diff --git a/src/_sass/gnome-shell/_common.scss b/src/_sass/gnome-shell/_common.scss index 52eba5e..81eab63 100644 --- a/src/_sass/gnome-shell/_common.scss +++ b/src/_sass/gnome-shell/_common.scss @@ -63,7 +63,7 @@ $bubble_button_radius: if($corner_style == 'circular', $circular-radius, $materi color: on(dark); background-color: $system; border: none; - box-shadow: $shell-shadow-z2; - border-radius: $material-radius; + box-shadow: $shell-shadow-z4; + border-radius: $circular-radius; padding: $space-size * 2; } diff --git a/src/_sass/gnome-shell/widgets/_dialogs.scss b/src/_sass/gnome-shell/widgets/_dialogs.scss index 08c6c8c..b13fdf1 100644 --- a/src/_sass/gnome-shell/widgets/_dialogs.scss +++ b/src/_sass/gnome-shell/widgets/_dialogs.scss @@ -9,7 +9,7 @@ $mdborder_color: if($variant == 'light', rgba(black, 0.15), rgba(black, 0.75)); color: $text; background-color: $base; border: 0 none $mdborder_color; - box-shadow: inset 0 1px rgba(white, 0.1); + box-shadow: 0 3px 8px rgba(black, 0.2); .modal-dialog-content-box { margin: 32px 40px; diff --git a/src/_sass/gnome-shell/widgets/_looking-glass.scss b/src/_sass/gnome-shell/widgets/_looking-glass.scss index 6cf112e..84011b2 100644 --- a/src/_sass/gnome-shell/widgets/_looking-glass.scss +++ b/src/_sass/gnome-shell/widgets/_looking-glass.scss @@ -8,7 +8,7 @@ padding: 0; border: none; border-radius: $popup-radius; - box-shadow: $shell-shadow-z4; + box-shadow: $shell-shadow-z5; & > #Toolbar { padding: $space-size $space-size * 1.5; @@ -142,7 +142,7 @@ border: none; border-radius: $material-radius; padding: $space-size; - box-shadow: $shell-shadow-z3; + box-shadow: $shell-shadow-z4; .window-close { margin: $space-size; diff --git a/src/_sass/gnome-shell/widgets/_osd-42.scss b/src/_sass/gnome-shell/widgets/_osd-42.scss index 414d61a..a1e269a 100644 --- a/src/_sass/gnome-shell/widgets/_osd-42.scss +++ b/src/_sass/gnome-shell/widgets/_osd-42.scss @@ -6,14 +6,14 @@ $osd_levelbar_height: 4px; @extend %osd_panel; text-align: center; font-weight: bold; - spacing: $space-size * 2; // 12px + spacing: $space-size * 2; padding: $space-size * 2 $space-size * 3; + margin-bottom: 8em; + & > * { spacing: 8px; } - margin-bottom: $margin-size * 16; // 32px - min-height: 24px; StIcon { - icon-size: 24px; + icon-size: 32px; } .osd-monitor-label { font-size: 3em; } @@ -25,18 +25,33 @@ $osd_levelbar_height: 4px; .level { height: $osd_levelbar_height; + min-width: 160px; + margin-bottom: 4px; + &:first-child { margin-bottom: 0px; } + -barlevel-height: $osd_levelbar_height; -barlevel-background-color: rgba($primary, 0.3); -barlevel-active-background-color: $primary; -barlevel-overdrive-color: $destructive; -barlevel-overdrive-separator-width: 3px; -barlevel-border-width: 0; - min-width: 120px; + &:ltr { margin-right: $space-size; } &:rtl { margin-left: $space-size; } } } +// Monitor number label +.osd-monitor-label { + @extend %osd_panel; + border-radius: $window-radius; + font-size: 3em; + font-weight: bold; + margin: $margin-size * 3; + text-align: center; + min-width: 1.3em; +} + /* Pad OSD */ .pad-osd-window { padding: 32px; diff --git a/src/_sass/gnome-shell/widgets/_popovers-42.scss b/src/_sass/gnome-shell/widgets/_popovers-42.scss index c9e6890..8618ea3 100644 --- a/src/_sass/gnome-shell/widgets/_popovers-42.scss +++ b/src/_sass/gnome-shell/widgets/_popovers-42.scss @@ -28,7 +28,7 @@ background-color: $surface; border-radius: $popup-radius; border: none; - box-shadow: 0 3px 8px -3px rgba(black, 0.2); + box-shadow: $shell-shadow-z3; } $submenu_item_radius: $popup-radius - $space-size; diff --git a/src/_sass/gnome-shell/widgets/_popovers.scss b/src/_sass/gnome-shell/widgets/_popovers.scss index e4df58b..b3dc260 100644 --- a/src/_sass/gnome-shell/widgets/_popovers.scss +++ b/src/_sass/gnome-shell/widgets/_popovers.scss @@ -28,7 +28,7 @@ margin: $space-size 10px 13px 10px; background-color: $surface; border-radius: $popup-radius; - box-shadow: 0 3px 8px rgba(black, 0.2); + box-shadow: $shell-shadow-z3; } $submenu_item_radius: $popup-radius - $space-size; diff --git a/src/gnome-shell/shell-3-28/gnome-shell-Compact.css b/src/gnome-shell/shell-3-28/gnome-shell-Compact.css index 67da759..5ce1ceb 100644 --- a/src/gnome-shell/shell-3-28/gnome-shell-Compact.css +++ b/src/gnome-shell/shell-3-28/gnome-shell-Compact.css @@ -1102,7 +1102,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-left: 6px; background-color: #FFFFFF; border-radius: 10px; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .popup-separator-menu-item { @@ -1345,7 +1345,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: rgba(0, 0, 0, 0.87); background-color: #FFFFFF; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); border-radius: 10px; padding: 12px; } @@ -3201,7 +3201,7 @@ StWidget.focused .app-well-app-running-dot { .candidate-popup-content { background-color: #FFFFFF; border-radius: 10px; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); margin: 2px 8px; padding: 4px; spacing: 4px; diff --git a/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css index da23613..147dd6e 100644 --- a/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css +++ b/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css @@ -1102,7 +1102,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-left: 6px; background-color: #3C3C3C; border-radius: 10px; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .popup-separator-menu-item { @@ -1345,7 +1345,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: white; background-color: #2C2C2C; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); border-radius: 10px; padding: 12px; } @@ -3201,7 +3201,7 @@ StWidget.focused .app-well-app-running-dot { .candidate-popup-content { background-color: #3C3C3C; border-radius: 10px; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); margin: 2px 8px; padding: 4px; spacing: 4px; diff --git a/src/gnome-shell/shell-3-28/gnome-shell-Dark.css b/src/gnome-shell/shell-3-28/gnome-shell-Dark.css index 55653e9..1a7d246 100644 --- a/src/gnome-shell/shell-3-28/gnome-shell-Dark.css +++ b/src/gnome-shell/shell-3-28/gnome-shell-Dark.css @@ -1102,7 +1102,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-left: 9px; background-color: #3C3C3C; border-radius: 10px; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .popup-separator-menu-item { @@ -1345,7 +1345,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: white; background-color: #2C2C2C; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); border-radius: 10px; padding: 12px; } @@ -3201,7 +3201,7 @@ StWidget.focused .app-well-app-running-dot { .candidate-popup-content { background-color: #3C3C3C; border-radius: 10px; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); margin: 3px 8px; padding: 6px; spacing: 6px; diff --git a/src/gnome-shell/shell-3-28/gnome-shell.css b/src/gnome-shell/shell-3-28/gnome-shell.css index 0776146..851b1a2 100644 --- a/src/gnome-shell/shell-3-28/gnome-shell.css +++ b/src/gnome-shell/shell-3-28/gnome-shell.css @@ -1102,7 +1102,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-left: 9px; background-color: #FFFFFF; border-radius: 10px; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .popup-separator-menu-item { @@ -1345,7 +1345,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: rgba(0, 0, 0, 0.87); background-color: #FFFFFF; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); border-radius: 10px; padding: 12px; } @@ -3201,7 +3201,7 @@ StWidget.focused .app-well-app-running-dot { .candidate-popup-content { background-color: #FFFFFF; border-radius: 10px; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); margin: 3px 8px; padding: 6px; spacing: 6px; diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css index f7d333d..5207a0c 100644 --- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css +++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css @@ -87,8 +87,8 @@ stage { color: white; background-color: #212121; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); - border-radius: 10px; + box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + border-radius: 9999px; padding: 8px; } @@ -604,7 +604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-separator-menu-item .popup-separator-menu-item-separator { height: 1px; - margin: 0 0; + margin: 0; background-color: rgba(0, 0, 0, 0.12); } @@ -1446,7 +1446,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: rgba(0, 0, 0, 0.87); background-color: #FFFFFF; border: 0 none rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .modal-dialog .modal-dialog-content-box { diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css index a7e76c7..965cc6e 100644 --- a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css +++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css @@ -87,8 +87,8 @@ stage { color: white; background-color: #212121; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); - border-radius: 10px; + box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + border-radius: 9999px; padding: 8px; } @@ -604,7 +604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-separator-menu-item .popup-separator-menu-item-separator { height: 1px; - margin: 0 0; + margin: 0; background-color: rgba(255, 255, 255, 0.12); } @@ -1446,7 +1446,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: white; background-color: #2C2C2C; border: 0 none rgba(0, 0, 0, 0.75); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .modal-dialog .modal-dialog-content-box { diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css index 548b496..3622b83 100644 --- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css +++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css @@ -87,8 +87,8 @@ stage { color: white; background-color: #212121; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); - border-radius: 10px; + box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + border-radius: 9999px; padding: 12px; } @@ -604,7 +604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-separator-menu-item .popup-separator-menu-item-separator { height: 1px; - margin: 0 0; + margin: 0; background-color: rgba(255, 255, 255, 0.12); } @@ -1446,7 +1446,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: white; background-color: #2C2C2C; border: 0 none rgba(0, 0, 0, 0.75); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .modal-dialog .modal-dialog-content-box { diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css index 116f084..0d16b34 100644 --- a/src/gnome-shell/shell-40-0/gnome-shell.css +++ b/src/gnome-shell/shell-40-0/gnome-shell.css @@ -87,8 +87,8 @@ stage { color: white; background-color: #212121; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); - border-radius: 10px; + box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + border-radius: 9999px; padding: 12px; } @@ -604,7 +604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-separator-menu-item .popup-separator-menu-item-separator { height: 1px; - margin: 0 0; + margin: 0; background-color: rgba(0, 0, 0, 0.12); } @@ -1446,7 +1446,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: rgba(0, 0, 0, 0.87); background-color: #FFFFFF; border: 0 none rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .modal-dialog .modal-dialog-content-box { diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css index 447fab9..1b5fdda 100644 --- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css +++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css @@ -137,12 +137,12 @@ stage { icon-shadow: none; } -.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window { +.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window { color: white; background-color: #212121; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); - border-radius: 10px; + box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + border-radius: 9999px; padding: 8px; } @@ -519,7 +519,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #FFFFFF; border-radius: 18px; border: none; - box-shadow: 0 3px 8px -3px rgba(0, 0, 0, 0.2); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .popup-menu .popup-menu-item { @@ -1772,7 +1772,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: rgba(0, 0, 0, 0.87); background-color: #FFFFFF; border: 0 none rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .modal-dialog .modal-dialog-content-box { @@ -2092,8 +2092,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: bold; spacing: 8px; padding: 8px 12px; - margin-bottom: 32px; - min-height: 24px; + margin-bottom: 8em; } .osd-window > * { @@ -2101,7 +2100,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .osd-window StIcon { - icon-size: 24px; + icon-size: 32px; } .osd-window .osd-monitor-label { @@ -2118,13 +2117,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .osd-window .level { height: 4px; + min-width: 160px; + margin-bottom: 4px; -barlevel-height: 4px; -barlevel-background-color: rgba(26, 115, 232, 0.3); -barlevel-active-background-color: #1A73E8; -barlevel-overdrive-color: #E53935; -barlevel-overdrive-separator-width: 3px; -barlevel-border-width: 0; - min-width: 120px; +} + +.osd-window .level:first-child { + margin-bottom: 0px; } .osd-window .level:ltr { @@ -2135,6 +2139,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-left: 4px; } +.osd-monitor-label { + border-radius: 16px; + font-size: 3em; + font-weight: bold; + margin: 6px; + text-align: center; + min-width: 1.3em; +} + /* Pad OSD */ .pad-osd-window { padding: 32px; diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css index 1abf773..120b59e 100644 --- a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css +++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css @@ -137,12 +137,12 @@ stage { icon-shadow: none; } -.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window { +.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window { color: white; background-color: #212121; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); - border-radius: 10px; + box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + border-radius: 9999px; padding: 8px; } @@ -519,7 +519,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #3C3C3C; border-radius: 18px; border: none; - box-shadow: 0 3px 8px -3px rgba(0, 0, 0, 0.2); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .popup-menu .popup-menu-item { @@ -1776,7 +1776,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: white; background-color: #2C2C2C; border: 0 none rgba(0, 0, 0, 0.75); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .modal-dialog .modal-dialog-content-box { @@ -2096,8 +2096,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: bold; spacing: 8px; padding: 8px 12px; - margin-bottom: 32px; - min-height: 24px; + margin-bottom: 8em; } .osd-window > * { @@ -2105,7 +2104,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .osd-window StIcon { - icon-size: 24px; + icon-size: 32px; } .osd-window .osd-monitor-label { @@ -2122,13 +2121,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .osd-window .level { height: 4px; + min-width: 160px; + margin-bottom: 4px; -barlevel-height: 4px; -barlevel-background-color: rgba(50, 129, 234, 0.3); -barlevel-active-background-color: #3281EA; -barlevel-overdrive-color: #F44336; -barlevel-overdrive-separator-width: 3px; -barlevel-border-width: 0; - min-width: 120px; +} + +.osd-window .level:first-child { + margin-bottom: 0px; } .osd-window .level:ltr { @@ -2139,6 +2143,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-left: 4px; } +.osd-monitor-label { + border-radius: 16px; + font-size: 3em; + font-weight: bold; + margin: 6px; + text-align: center; + min-width: 1.3em; +} + /* Pad OSD */ .pad-osd-window { padding: 32px; diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css index 09e5fc3..247c789 100644 --- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css +++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css @@ -137,12 +137,12 @@ stage { icon-shadow: none; } -.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window { +.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window { color: white; background-color: #212121; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); - border-radius: 10px; + box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + border-radius: 9999px; padding: 12px; } @@ -519,7 +519,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #3C3C3C; border-radius: 20px; border: none; - box-shadow: 0 3px 8px -3px rgba(0, 0, 0, 0.2); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .popup-menu .popup-menu-item { @@ -1776,7 +1776,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: white; background-color: #2C2C2C; border: 0 none rgba(0, 0, 0, 0.75); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .modal-dialog .modal-dialog-content-box { @@ -2096,8 +2096,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: bold; spacing: 12px; padding: 12px 18px; - margin-bottom: 64px; - min-height: 24px; + margin-bottom: 8em; } .osd-window > * { @@ -2105,7 +2104,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .osd-window StIcon { - icon-size: 24px; + icon-size: 32px; } .osd-window .osd-monitor-label { @@ -2122,13 +2121,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .osd-window .level { height: 4px; + min-width: 160px; + margin-bottom: 4px; -barlevel-height: 4px; -barlevel-background-color: rgba(50, 129, 234, 0.3); -barlevel-active-background-color: #3281EA; -barlevel-overdrive-color: #F44336; -barlevel-overdrive-separator-width: 3px; -barlevel-border-width: 0; - min-width: 120px; +} + +.osd-window .level:first-child { + margin-bottom: 0px; } .osd-window .level:ltr { @@ -2139,6 +2143,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-left: 6px; } +.osd-monitor-label { + border-radius: 18px; + font-size: 3em; + font-weight: bold; + margin: 12px; + text-align: center; + min-width: 1.3em; +} + /* Pad OSD */ .pad-osd-window { padding: 32px; diff --git a/src/gnome-shell/shell-42-0/gnome-shell.css b/src/gnome-shell/shell-42-0/gnome-shell.css index 6a52384..b8147c2 100644 --- a/src/gnome-shell/shell-42-0/gnome-shell.css +++ b/src/gnome-shell/shell-42-0/gnome-shell.css @@ -137,12 +137,12 @@ stage { icon-shadow: none; } -.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window { +.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window { color: white; background-color: #212121; border: none; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32); - border-radius: 10px; + box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32); + border-radius: 9999px; padding: 12px; } @@ -519,7 +519,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #FFFFFF; border-radius: 20px; border: none; - box-shadow: 0 3px 8px -3px rgba(0, 0, 0, 0.2); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .popup-menu .popup-menu-item { @@ -1772,7 +1772,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: rgba(0, 0, 0, 0.87); background-color: #FFFFFF; border: 0 none rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2); } .modal-dialog .modal-dialog-content-box { @@ -2092,8 +2092,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { font-weight: bold; spacing: 12px; padding: 12px 18px; - margin-bottom: 64px; - min-height: 24px; + margin-bottom: 8em; } .osd-window > * { @@ -2101,7 +2100,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .osd-window StIcon { - icon-size: 24px; + icon-size: 32px; } .osd-window .osd-monitor-label { @@ -2118,13 +2117,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .osd-window .level { height: 4px; + min-width: 160px; + margin-bottom: 4px; -barlevel-height: 4px; -barlevel-background-color: rgba(26, 115, 232, 0.3); -barlevel-active-background-color: #1A73E8; -barlevel-overdrive-color: #E53935; -barlevel-overdrive-separator-width: 3px; -barlevel-border-width: 0; - min-width: 120px; +} + +.osd-window .level:first-child { + margin-bottom: 0px; } .osd-window .level:ltr { @@ -2135,6 +2139,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-left: 6px; } +.osd-monitor-label { + border-radius: 18px; + font-size: 3em; + font-weight: bold; + margin: 12px; + text-align: center; + min-width: 1.3em; +} + /* Pad OSD */ .pad-osd-window { padding: 32px;