Finish dynamic theming for audio and bluetooth menus

This commit is contained in:
Jas Singh
2024-07-17 22:04:00 -07:00
parent 50eeb4275d
commit 144746db0a
6 changed files with 133 additions and 71 deletions

View File

@@ -1,39 +1,93 @@
@import "../colors";
@import '../../variables';
.menu-dropdown-label.audio {
color: $maroon;
color: if($bar-menus-monochrome, $bar-menus-label, $bar-menus-menu-volume-label-color);
}
.menu-label.audio {
color: $maroon;
color: if($bar-menus-monochrome, $bar-menus-label, $bar-menus-menu-volume-label-color);
}
.menu-button-isactive.audio {
color: $maroon;
color: if($bar-menus-monochrome, $bar-menus-icons-active, $bar-menus-menu-volume-icons-active);
}
.menu-active-slider {
trough {
highlight,
progress {
background: $maroon;
background: if($bar-menus-monochrome, $bar-menus-slider-primary, $bar-menus-menu-media-slider-primary);
}
}
}
.menu-active-button {
.menu-active-icon.playback,
.menu-active-icon.input {
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-active, $bar-menus-menu-volume-iconbuttons-active);
opacity: 1;
}
&.muted {
.menu-active-icon.playback,
.menu-active-icon.input {
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-passive, $bar-menus-menu-volume-iconbuttons-passive);
opacity: 1;
}
}
&:hover {
.menu-active-icon.playback,
.menu-active-icon.input {
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-passive, $bar-menus-menu-volume-iconbuttons-passive);
opacity: 0.3;
}
}
&.muted:hover {
.menu-active-icon.playback,
.menu-active-icon.input {
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-active, $bar-menus-menu-volume-iconbuttons-active);
opacity: 1;
}
}
}
.menu-button-icon.playback,
.menu-button-icon.input {
color: if($bar-menus-monochrome, $bar-menus-icons-passive, $bar-menus-menu-volume-icons-passive);
&.active {
color: if($bar-menus-monochrome, $bar-menus-icons-active, $bar-menus-menu-volume-icons-active);
}
}
.menu-button.audio {
&:hover {
color: $maroon;
color: if($bar-menus-monochrome, $bar-menus-icons-passive, $bar-menus-menu-volume-icons-passive);
.menu-button-name.playback,
.menu-button-name.input {
color: if($bar-menus-monochrome, $bar-menus-text, $bar-menus-menu-volume-text);
}
&:hover {
.menu-button-name.playback,
.menu-button-name.input {
color: if($bar-menus-monochrome, $bar-menus-icons-active, $bar-menus-menu-volume-icons-active);
}
}
}
.menu-section-container.volume {
margin-bottom: 0.65em;
}
.menu-section-container.playback {
margin-top: 0em;
margin-bottom: 1em;
}
.menu-section-container.input {
margin-top: 0em;
}
@@ -41,6 +95,7 @@
.menu-label-container.input {
border-radius: 0em;
}
.menu-items-section.playback {
border-radius: 0em;
}

View File

@@ -2,13 +2,14 @@
.menu-items-container.bluetooth {
font-size: 1.3em;
.menu-section-container {
margin: 1em 0em;
}
.menu-label-container {
.menu-label {
color: $sky;
color: if($bar-menus-monochrome, $bar-menus-label, $bar-menus-menu-bluetooth-label-color);
}
.controls-container {
@@ -22,27 +23,42 @@
font-size: 1em;
}
button {
button {
margin-right: 0.5em;
&.search {
image {
color: $text;
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-passive, $bar-menus-menu-bluetooth-iconbuttons-passive);
}
&:hover image {
color: $sky;
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-active, $bar-menus-menu-bluetooth-iconbuttons-active);
}
font-size: 0.8em;
margin-bottom: 0em;
}
&:hover {
color: $sky;
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-active, $bar-menus-menu-bluetooth-iconbuttons-active);
}
}
.menu-icon-button.bluetooth {
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-passive, $bar-menus-menu-bluetooth-iconbuttons-passive);
&:hover {
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-active, $bar-menus-menu-bluetooth-iconbuttons-active);
}
}
.bluetooth-element-item {
margin-bottom: 0.4em;
&:hover {
color: $sky;
.menu-button-icon, .menu-button-name {
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-active, $bar-menus-menu-bluetooth-iconbuttons-active);
}
}
image {
@@ -52,35 +68,65 @@
min-width: 1em;
&.active {
color: $sky;
color: if($bar-menus-monochrome, $bar-menus-icons-active, $bar-menus-menu-bluetooth-icons-active);
}
}
label {
color: if($bar-menus-monochrome, $bar-menus-text, $bar-menus-menu-bluetooth-text);
font-size: 1em;
}
.menu-button-icon {
font-size: 1.5em;
color: if($bar-menus-monochrome, $bar-menus-icons-passive, $bar-menus-menu-bluetooth-icons-passive);
&.active {
color: $sky;
color: if($bar-menus-monochrome, $bar-menus-icons-active, $bar-menus-menu-bluetooth-icons-active);
}
}
.connection-status {
font-size: 0.9em;
margin-left: 0.6rem;
color: if($bar-menus-monochrome, $bar-menus-text, $bar-menus-menu-bluetooth-text);
opacity: 0.4;
}
}
spinner {
min-height: 1.3em;
min-width: 1.3em;
color: $sky;
color: if($bar-menus-monochrome, $bar-menus-iconbuttons-active, $bar-menus-menu-bluetooth-iconbuttons-active);
}
.menu-separator {
margin: 0em 1em;
}
.menu-switch.bluetooth {
background-color: if($bar-menus-monochrome, $bar-menus-switch-disabled, $bar-menus-menu-bluetooth-switch-disabled);
&:checked {
background: if($bar-menus-monochrome, $bar-menus-switch-enabled, $bar-menus-menu-bluetooth-switch-enabled);
}
slider {
background-color: if($bar-menus-monochrome, $bar-menus-switch-puck, $bar-menus-menu-bluetooth-switch-puck);
}
&:hover {
trough {
background: if($bar-menus-monochrome, $bar-menus-switch-disabled, $bar-menus-menu-bluetooth-switch-disabled);
}
slider {
background: if($bar-menus-monochrome, $bar-menus-switch-puck, $bar-menus-menu-bluetooth-switch-puck);
}
}
&:active {
background: if($bar-menus-monochrome, $bar-menus-switch-enabled, $bar-menus-menu-bluetooth-switch-enabled);
}
}
}

View File

@@ -161,7 +161,6 @@ tooltip label {
padding: 0.1em;
margin-bottom: -0.2em;
.menu-active-icon {
color: $overlay2;
font-size: 1.4em;
font-weight: bold;
@@ -201,9 +200,6 @@ tooltip label {
font-weight: bold;
}
.dim {
color: $overlay0;
}
.menu-icon-button {
&:hover {
color: $surface2;
@@ -229,12 +225,7 @@ tooltip label {
.menu-button-icon {
font-size: 1.3em;
font-weight: bold;
color: $overlay0;
margin-right: .5rem;
&.active {
color: $maroon;
}
}
.menu-item-box {