diff --git a/src/main/cinnamon/cinnamon-dark.css b/src/main/cinnamon/cinnamon-dark.css index 05d5fbd8..054f6616 100644 --- a/src/main/cinnamon/cinnamon-dark.css +++ b/src/main/cinnamon/cinnamon-dark.css @@ -1,5 +1,4 @@ stage { - font-size: 9pt; color: #FFFFFF; } @@ -523,7 +522,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .panel-left .panel-status-button:hover, .panel-right .panel-button:hover, .panel-right .panel-status-button:hover { color: #FFFFFF; - background-color: rgba(255, 255, 255, 0.12); + background-color: rgba(255, 255, 255, 0.04); } .panel-top .panel-button:active, @@ -532,7 +531,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .panel-left .panel-status-button:active, .panel-right .panel-button:active, .panel-right .panel-status-button:active { color: #FFFFFF; - background-color: #5b9bf8; + background-color: rgba(255, 255, 255, 0.12); } .panel-dummy { @@ -742,6 +741,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #888; } +#LookingGlassDialog { + background-color: #2C2C2C; + spacing: 6px; + padding: 6px; + margin: 32px; + border-radius: 12px; + color: #FFFFFF; + box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 15px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12); + border: none; +} + .calendar-main-box { margin: 0 6px; } @@ -2195,12 +2205,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .applet-box:hover { color: rgba(255, 255, 255, 0.7); - background-color: rgba(255, 255, 255, 0.15); + background-color: rgba(255, 255, 255, 0.04); } .applet-box:checked, .applet-box:checked:hover { - color: #FFFFFF; - background-color: #5b9bf8; + color: rgba(255, 255, 255, 0.7); + background-color: rgba(255, 255, 255, 0.12); } .applet-box:highlight { @@ -2215,7 +2225,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .applet-box:checked .applet-label { - color: #FFFFFF; + color: rgba(255, 255, 255, 0.7); text-shadow: none; } diff --git a/src/main/cinnamon/cinnamon-light.css b/src/main/cinnamon/cinnamon-light.css index 543b5841..d7336b64 100644 --- a/src/main/cinnamon/cinnamon-light.css +++ b/src/main/cinnamon/cinnamon-light.css @@ -1,5 +1,4 @@ stage { - font-size: 9pt; color: rgba(0, 0, 0, 0.87); } @@ -522,7 +521,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .panel-left .panel-status-button:hover, .panel-right .panel-button:hover, .panel-right .panel-status-button:hover { color: rgba(0, 0, 0, 0.87); - background-color: rgba(0, 0, 0, 0.12); + background-color: rgba(0, 0, 0, 0.04); } .panel-top .panel-button:active, @@ -530,8 +529,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .panel-bottom .panel-status-button:active, .panel-left .panel-button:active, .panel-left .panel-status-button:active, .panel-right .panel-button:active, .panel-right .panel-status-button:active { - color: #FFFFFF; - background-color: #3c84f7; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(0, 0, 0, 0.12); } .panel-dummy { @@ -741,6 +740,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #888; } +#LookingGlassDialog { + background-color: #FFFFFF; + spacing: 6px; + padding: 6px; + margin: 32px; + border-radius: 12px; + color: rgba(0, 0, 0, 0.87); + box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 15px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12); + border: none; +} + .calendar-main-box { margin: 0 6px; } @@ -2194,12 +2204,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .applet-box:hover { color: rgba(0, 0, 0, 0.6); - background-color: rgba(0, 0, 0, 0.15); + background-color: rgba(0, 0, 0, 0.04); } .applet-box:checked, .applet-box:checked:hover { - color: #FFFFFF; - background-color: #3c84f7; + color: rgba(0, 0, 0, 0.6); + background-color: rgba(0, 0, 0, 0.12); } .applet-box:highlight { @@ -2214,7 +2224,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .applet-box:checked .applet-label { - color: #FFFFFF; + color: rgba(0, 0, 0, 0.6); text-shadow: none; } diff --git a/src/main/cinnamon/cinnamon.css b/src/main/cinnamon/cinnamon.css index c843365c..6cc6acd2 100644 --- a/src/main/cinnamon/cinnamon.css +++ b/src/main/cinnamon/cinnamon.css @@ -1,5 +1,4 @@ stage { - font-size: 9pt; color: rgba(0, 0, 0, 0.87); } @@ -522,7 +521,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .panel-left .panel-status-button:hover, .panel-right .panel-button:hover, .panel-right .panel-status-button:hover { color: rgba(0, 0, 0, 0.87); - background-color: rgba(0, 0, 0, 0.12); + background-color: rgba(0, 0, 0, 0.04); } .panel-top .panel-button:active, @@ -530,8 +529,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .panel-bottom .panel-status-button:active, .panel-left .panel-button:active, .panel-left .panel-status-button:active, .panel-right .panel-button:active, .panel-right .panel-status-button:active { - color: #FFFFFF; - background-color: #3c84f7; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(0, 0, 0, 0.12); } .panel-dummy { @@ -741,6 +740,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #888; } +#LookingGlassDialog { + background-color: #FFFFFF; + spacing: 6px; + padding: 6px; + margin: 32px; + border-radius: 12px; + color: rgba(0, 0, 0, 0.87); + box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 15px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12); + border: none; +} + .calendar-main-box { margin: 0 6px; } @@ -2194,12 +2204,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .applet-box:hover { color: rgba(255, 255, 255, 0.7); - background-color: rgba(255, 255, 255, 0.15); + background-color: rgba(0, 0, 0, 0.04); } .applet-box:checked, .applet-box:checked:hover { - color: #FFFFFF; - background-color: #3c84f7; + color: rgba(255, 255, 255, 0.7); + background-color: rgba(0, 0, 0, 0.12); } .applet-box:highlight { @@ -2214,7 +2224,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .applet-box:checked .applet-label { - color: #FFFFFF; + color: rgba(255, 255, 255, 0.7); text-shadow: none; } diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss index 22cead7d..cde6325b 100644 --- a/src/sass/cinnamon/_common.scss +++ b/src/sass/cinnamon/_common.scss @@ -4,12 +4,12 @@ // $asset_path: assets; -$font-size: 9; +$font-size: 10; $panel_bg: rgba($panel-solid, 0.75); $panel_fg: on($panel-solid, secondary); stage { - @include fontsize($font-size); + // @include fontsize($font-size); color: $text; } @@ -451,12 +451,12 @@ $menu_item_radius: $corner-radius; .panel-status-button { &:hover { color: $text; - background-color: $divider; + background-color: $fill; } &:active { - color: on($primary); - background-color: $primary; + color: $text; + background-color: $divider; } } } @@ -660,6 +660,17 @@ $menu_item_radius: $corner-radius; } } +#LookingGlassDialog { + background-color: $base; + spacing: $space-size; + padding: $space-size; + margin: 32px; + border-radius: $window_radius; + color: $text; + box-shadow: $shadow-z16; + border: none; +} + // // Calendar // @@ -2023,12 +2034,12 @@ $menu_item_radius: $corner-radius; &:hover { color: $panel_fg; - background-color: rgba($panel_fg, 0.15); + background-color: $fill; } &:checked, &:checked:hover { - color: on($applet-primary); - background-color: $applet-primary; + color: $panel_fg; + background-color: $divider; } &:highlight { @@ -2043,7 +2054,7 @@ $menu_item_radius: $corner-radius; color: $panel_fg; .applet-box:checked & { - color: on($applet-primary); + color: $panel_fg; text-shadow: none; } }