diff --git a/modules/controlcenter/main.py b/modules/controlcenter/main.py index 7c8e155..c3ba4d4 100644 --- a/modules/controlcenter/main.py +++ b/modules/controlcenter/main.py @@ -407,18 +407,29 @@ class ModusControlCenter(Window): children=[ Label(label="Sound", style_classes="title", h_align="start"), Box( + name="vol-box", orientation="horizontal", spacing=8, - v_expand=False, + v_expand=True, children=[ - self.volume_scale, + Box( + name="vol-slider-box", + h_expand=True, + v_align="center", + v_expand=False, + children=[ + self.volume_scale, + ], + ), Button( name="per-app-volume-button", + size=(36, 36), child=Svg( svg_file=get_relative_path( "../../config/assets/icons/player/audio-switcher.svg" ), name="per-app-volume-icon", + sidze=32, ), on_clicked=self.open_per_app_volume, ), @@ -427,12 +438,7 @@ class ModusControlCenter(Window): Label(label=" ", name="volume-widget-icon", h_align="start"), ], ), - Box( - orientation="vertical", - children=[ - self.music_widget, - ], - ), + self.music_widget, ], ) diff --git a/styles/controlcenter.css b/styles/controlcenter.css index 5252972..a999cb2 100644 --- a/styles/controlcenter.css +++ b/styles/controlcenter.css @@ -33,18 +33,26 @@ font-weight: bold; } #control-center-widgets { - background-color: alpha(#fff, 0.05); + background-color: alpha(#fff, 0.01); box-shadow: inset 0 0 0 1px alpha(#aaa, 0.4); - border: 1px solid alpha(#111, 0.4); - border-radius: 8px; + /* border: 1px solid alpha(#111, 0.4); */ + border-radius: 12px; padding: 0.5rem; } - +#focus-widget { +} +#wb-widget, +#brightness-menu { + background-color: alpha(#000, 0.08); + box-shadow: inset 0 0 0 0.5px alpha(#aaa, 0.4); + border: 1px solid alpha(#111, 0.4); + border-radius: 12px; +} /* Widgets */ #wifi-widget, #bluetooth-widget { - min-width: 150px; - padding: 10px; + min-width: 140px; + padding: 10px 0 0px 0; } .icon { @@ -257,12 +265,14 @@ /* } */ .menu { + background-color: alpha(#000, 0.08); + box-shadow: inset 0 0 0 0.5px alpha(#aaa, 0.4); + border: 1px solid alpha(#111, 0.4); + border-radius: 12px; margin: 5px; - /* background-color: alpha(#000, 0.3); */ - background-color: alpha(#999, 0.1); - /* box-shadow: inset 0 0 200px 0 alpha(#111, 0.3); */ - border: 0.5px solid alpha(#000, 0.4); - border-radius: 8px; + /* background-color: alpha(#999, 0.1); */ + /* border: 0.5px solid alpha(#000, 0.4); */ + /* border-radius: 8px; */ padding: 1rem; } @@ -283,9 +293,17 @@ margin-left: 5px; } +#vol-slider-box { + /* margin-bottom: 2px; */ + margin-top: -10px; + /* border: 1px solid alpha(#fff, 1); */ +} +#volume-widget-slider { + /* margin-bottom: 2px; */ +} #volume-widget-icon { font-size: 22px; - margin-top: -26px; + margin-top: -35px; margin-right: -36px; color: #000; } @@ -510,8 +528,8 @@ #per-app-volume-button { background-color: alpha(#fff, 0.15); border: 1px solid alpha(#999, 0.6); - min-width: 33px; - min-height: 30px; + /* min-width: 33px; */ + /* min-height: 30px; */ border-radius: 50%; } diff --git a/styles/panel.css b/styles/panel.css index ac77e04..218c358 100644 --- a/styles/panel.css +++ b/styles/panel.css @@ -110,11 +110,13 @@ } #workspaces label { + font-family: "SF Pro Rounded"; color: white; /* fully transparent text */ } #workspaces > button { padding-top: 0px; padding-right: 16px; + font-family: "SF Pro Rounded"; padding-left: 16px; margin: 6px 0px; @@ -129,11 +131,12 @@ #workspaces > button.active { background-color: alpha(#fff, 0.9); - font-weight: bold; + /* font-weight: bold; */ } #workspaces > button.active label { color: alpha(#000, 1); + font-family: "SF Pro Rounded"; } #workspaces > button.urgent { background-color: alpha(var(--on-error), 0.7); diff --git a/styles/player.css b/styles/player.css index b37d478..c8c33c6 100644 --- a/styles/player.css +++ b/styles/player.css @@ -8,7 +8,7 @@ #button-box-c { /* margin-left: -10px; */ - margin-right: 4px; + margin-right: 7px; } #player-stack-button:hover { @@ -47,12 +47,20 @@ /* box-shadow: inset 0 0 0 1px alpha(#aaa, 0.4); */ } #box-c { + background-color: alpha(#000, 0.08); + box-shadow: inset 0 0 0 0.5px alpha(#aaa, 0.4); + border: 1px solid alpha(#111, 0.4); + border-radius: 12px; + margin-left: 4px; + margin-right: 4px; + margin-bottom: 0.5rem; + min-height: 50px; min-width: 220px; - border-radius: 8px; - margin: 0 6px 10px; - border: 0.5px solid alpha(#000, 0.4); - background-color: alpha(#999, 0.1); + /* border-radius: 8px; */ + /* margin: 0 6px 10px; */ + /* border: 0.5px solid alpha(#000, 0.4); */ + /* background-color: alpha(#999, 0.1); */ /* box-shadow: inset 0 0 0 1px alpha(#aaa, 0.4); */ } #player-box:disabled highlight, @@ -84,7 +92,7 @@ font-size: 16px; } #player-app-icon { - /* margin-bottom: 2px; */ + margin-bottom: 10px; } #player-artist-c { @@ -129,8 +137,10 @@ min-width: 50px; min-height: 50px; background-position: center; + margin-top: 10px; + margin-bottom: 10px; background-size: cover; - margin-left: 5px; + margin-left: 10px; border-radius: 5px; } .album-image {