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,5 +1,4 @@
/* eslint-disable max-len */
import { exec } from "resource:///com/github/Aylur/ags/utils.js";
import { type Opt } from "lib/option"
import options from "options"
import { bash, dependencies } from "lib/utils"
@@ -53,10 +52,9 @@ async function resetCss() {
const imports = [vars].map(f => `@import '${f}';`)
console.log(variables());
await Utils.writeFile(variables().join("\n"), vars)
let mainScss = await Utils.readFile(localScss);
let mainScss = Utils.readFile(localScss);
mainScss = `${imports}\n${mainScss}`;
await Utils.writeFile(mainScss, scss)

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 {

View File

@@ -63,17 +63,19 @@ $bar-menus-background: #11111b;
$bar-menus-cards: #1e1e2e;
$bar-menus-border: #313244;
$bar-menus-text: #cdd6f4;
$bar-menus-dimtext: #cdd6f4;
$bar-menus-label: #b4befe;
$bar-menus-listitems-passive: #cdd6f4;
$bar-menus-listitems-active: #b4befe;
$bar-menus-icons-passive: #9399b2;
$bar-menus-icons-passive: #585b70;
$bar-menus-icons-active: #b4befe;
$bar-menus-switch-enabled: #b4befe;
$bar-menus-switch-disabled: #313244;
$bar-menus-switch-puck: #6c7086;
$bar-menus-buttons-default: #b4befe;
$bar-menus-buttons-hover: #f5c2e7;
$bar-menus-buttons-text: #11111b;
$bar-menus-iconbuttons-passive: #cdd6f4;
$bar-menus-iconbuttons-active: #b4befe;
$bar-menus-dashboard-background: #242438;
$bar-menus-dashboard-text: #f9e2af;
$bar-menus-workspaces-background: #242438;
@@ -96,20 +98,15 @@ $bar-menus-menu-media-album: #242438;
$bar-menus-menu-media-buttons-inactive-background: #585b70;
$bar-menus-menu-media-buttons-inactive-text: #11111b;
$bar-menus-menu-media-buttons-shuffle-background: #b4befe;
$bar-menus-menu-media-buttons-shuffle-hover: #f5c2e7;
$bar-menus-menu-media-buttons-shuffle-active: #f5c2e7;
$bar-menus-menu-media-buttons-shuffle-text: #11111b;
$bar-menus-menu-media-buttons-previous-background: #b4befe;
$bar-menus-menu-media-buttons-previous-hover: #f5c2e7;
$bar-menus-menu-media-buttons-previous-text: #11111b;
$bar-menus-menu-media-buttons-playpause-background: #b4befe;
$bar-menus-menu-media-buttons-playpause-hover: #f5c2e7;
$bar-menus-menu-media-buttons-playpause-text: #11111b;
$bar-menus-menu-media-buttons-next-background: #b4befe;
$bar-menus-menu-media-buttons-next-hover: #f5c2e7;
$bar-menus-menu-media-buttons-next-text: #11111b;
$bar-menus-menu-media-buttons-loop-background: #b4befe;
$bar-menus-menu-media-buttons-loop-hover: #f5c2e7;
$bar-menus-menu-media-buttons-loop-active: #f5c2e7;
$bar-menus-menu-media-buttons-loop-text: #11111b;
$bar-menus-menu-media-slider-primary: #f5c2e7;
@@ -123,9 +120,8 @@ $bar-menus-menu-volume-label-color: #eba0ac;
$bar-menus-menu-volume-text: #cdd6f4;
$bar-menus-menu-volume-listitems-passive: #cdd6f4;
$bar-menus-menu-volume-listitems-active: #eba0ac;
$bar-menus-menu-volume-icons-passive: #9399b2;
$bar-menus-menu-volume-icons-active: #eba0ac;
$bar-menus-menu-volume-icons-hover: #eba0ac;
$bar-menus-menu-volume-iconbutton-passive: #9399b2;
$bar-menus-menu-volume-iconbutton-active: #eba0ac;
$bar-menus-menu-volume-audio_slider-primary: #eba0ac;
$bar-menus-menu-volume-audio_slider-background: #585b70;
$bar-menus-menu-volume-audio_slider-backgroundhover: #45475a;
@@ -144,7 +140,6 @@ $bar-menus-menu-network-listitems-passive: #cdd6f4;
$bar-menus-menu-network-listitems-active: #cba6f7;
$bar-menus-menu-network-icons-passive: #9399b2;
$bar-menus-menu-network-icons-active: #cba6f7;
$bar-menus-menu-network-icons-hover: #cba6f7;
$bar-menus-menu-network-iconbuttons-passive: #cdd6f4;
$bar-menus-menu-network-iconbuttons-hover: #cba6f7;
$bar-menus-menu-bluetooth-card-color: #1e1e2e;
@@ -159,9 +154,8 @@ $bar-menus-menu-bluetooth-switch-disabled: #313244;
$bar-menus-menu-bluetooth-switch-puck: #6c7086;
$bar-menus-menu-bluetooth-listitems-passive: #cdd6f4;
$bar-menus-menu-bluetooth-listitems-active: #89dceb;
$bar-menus-menu-bluetooth-icons-passive: #9399b2;
$bar-menus-menu-bluetooth-icons-passive: #cdd6f4;
$bar-menus-menu-bluetooth-icons-active: #89dceb;
$bar-menus-menu-bluetooth-icons-hover: #89dceb;
$bar-menus-menu-bluetooth-iconbuttons-passive: #cdd6f4;
$bar-menus-menu-bluetooth-iconbuttons-hover: #89dceb;
$bar-menus-menu-systray-background-color: #242438;
@@ -177,7 +171,6 @@ $bar-menus-menu-battery-listitems-passive: #cdd6f4;
$bar-menus-menu-battery-listitems-active: #f9e2af;
$bar-menus-menu-battery-icons-passive: #9399b2;
$bar-menus-menu-battery-icons-active: #f9e2af;
$bar-menus-menu-battery-icons-hover: #f9e2af;
$bar-menus-menu-clock-card-color: #1e1e2e;
$bar-menus-menu-clock-background-color: #11111b;
$bar-menus-menu-clock-border-color: #313244;
@@ -218,28 +211,20 @@ $bar-menus-menu-dashboard-powermenu-confirmation-body: #cdd6f4;
$bar-menus-menu-dashboard-powermenu-confirmation-confirm: #a6e3a1;
$bar-menus-menu-dashboard-powermenu-confirmation-deny: #f38ba8;
$bar-menus-menu-dashboard-shortcuts_left-shortcut1-background: #b4befe;
$bar-menus-menu-dashboard-shortcuts_left-shortcut1-hover: #f5c2e7;
$bar-menus-menu-dashboard-shortcuts_left-shortcut1-text: #11111b;
$bar-menus-menu-dashboard-shortcuts_left-shortcut2-background: #b4befe;
$bar-menus-menu-dashboard-shortcuts_left-shortcut2-hover: #f5c2e7;
$bar-menus-menu-dashboard-shortcuts_left-shortcut2-text: #11111b;
$bar-menus-menu-dashboard-shortcuts_left-shortcut3-background: #b4befe;
$bar-menus-menu-dashboard-shortcuts_left-shortcut3-hover: #f5c2e7;
$bar-menus-menu-dashboard-shortcuts_left-shortcut3-text: #11111b;
$bar-menus-menu-dashboard-shortcuts_left-shortcut4-background: #b4befe;
$bar-menus-menu-dashboard-shortcuts_left-shortcut4-hover: #f5c2e7;
$bar-menus-menu-dashboard-shortcuts_left-shortcut4-text: #11111b;
$bar-menus-menu-dashboard-shortcuts_right-shortcut1-background: #b4befe;
$bar-menus-menu-dashboard-shortcuts_right-shortcut1-hover: #f5c2e7;
$bar-menus-menu-dashboard-shortcuts_right-shortcut1-text: #11111b;
$bar-menus-menu-dashboard-shortcuts_right-shortcut2-background: #b4befe;
$bar-menus-menu-dashboard-shortcuts_right-shortcut2-hover: #f5c2e7;
$bar-menus-menu-dashboard-shortcuts_right-shortcut2-text: #11111b;
$bar-menus-menu-dashboard-shortcuts_right-shortcut3-background: #b4befe;
$bar-menus-menu-dashboard-shortcuts_right-shortcut3-hover: #f5c2e7;
$bar-menus-menu-dashboard-shortcuts_right-shortcut3-text: #11111b;
$bar-menus-menu-dashboard-shortcuts_right-shortcut4-background: #b4befe;
$bar-menus-menu-dashboard-shortcuts_right-shortcut4-hover: #f5c2e7;
$bar-menus-menu-dashboard-shortcuts_right-shortcut4-text: #11111b;
$bar-menus-menu-dashboard-controls-wifi-background: #cba6f7;
$bar-menus-menu-dashboard-controls-wifi-text: #11111b;