Fixed an issue where the correct global colors to the icon weren't being applied in split variant. (#409)

* Fix global icon coloring

* Fix themes

* Update custom modules to use global colors if enabled

* Fix icons

* Fix custom module icon color
This commit is contained in:
Jas Singh
2024-10-31 00:49:05 -07:00
committed by GitHub
parent 77d4512c82
commit c2e46f098e
25 changed files with 399 additions and 385 deletions

View File

@@ -13,7 +13,7 @@
.bar-button-icon.volume {
border-top-left-radius: $bar-buttons-radius;
border-bottom-left-radius: $bar-buttons-radius;
background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-volume-icon_background);
background: if($bar-buttons-monochrome, $bar-buttons-icon_background, $bar-buttons-volume-icon_background);
padding: $bar-buttons-padding_y 0em;
padding-left: $bar-buttons-padding_x;
padding-right: $bar-buttons-volume-spacing;
@@ -27,6 +27,7 @@
$bar-buttons-radius * 0.4,
$bar-buttons-radius
);
color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-volume-icon);
}
.bar-button-label.volume {

View File

@@ -11,7 +11,7 @@
.bar-button-icon.battery {
border-top-left-radius: $bar-buttons-radius;
border-bottom-left-radius: $bar-buttons-radius;
background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-battery-icon_background);
background: if($bar-buttons-monochrome, $bar-buttons-icon_background, $bar-buttons-battery-icon_background);
padding: $bar-buttons-padding_y 0em;
padding-left: $bar-buttons-padding_x;
padding-right: $bar-buttons-battery-spacing;
@@ -29,6 +29,7 @@
&:last-child {
border-radius: $bar-buttons-radius;
}
color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-battery-icon);
}
.bar-button-label.battery {
@@ -60,4 +61,3 @@
0em
);
}

View File

@@ -23,7 +23,7 @@
.bar-button-icon.bluetooth {
border-top-left-radius: $bar-buttons-radius;
border-bottom-left-radius: $bar-buttons-radius;
background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-bluetooth-icon_background);
background: if($bar-buttons-monochrome, $bar-buttons-icon_background, $bar-buttons-bluetooth-icon_background);
padding: $bar-buttons-padding_y 0em;
padding-left: $bar-buttons-padding_x;
padding-right: $bar-buttons-bluetooth-spacing;
@@ -37,6 +37,7 @@
$bar-buttons-radius * 0.4,
$bar-buttons-radius
);
color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-bluetooth-icon);
}
.bar-button-label.bluetooth {

View File

@@ -12,7 +12,7 @@
.bar-button-icon.clock {
border-top-left-radius: $bar-buttons-radius;
border-bottom-left-radius: $bar-buttons-radius;
background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-clock-icon_background);
background: if($bar-buttons-monochrome, $bar-buttons-icon_background, $bar-buttons-clock-icon_background);
padding: $bar-buttons-padding_y 0em;
padding-left: $bar-buttons-padding_x;
padding-right: $bar-buttons-clock-spacing;
@@ -26,6 +26,7 @@
$bar-buttons-radius * 0.4,
$bar-buttons-radius
);
color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-clock-icon);
}
.bar-button-label.clock {

View File

@@ -10,7 +10,7 @@
.style2 {
.bar-button-icon.media {
background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-media-icon_background);
background: if($bar-buttons-monochrome, $bar-buttons-icon_background, $bar-buttons-media-icon_background);
padding: $bar-buttons-padding_y 0em;
padding-left: $bar-buttons-padding_x;
padding-right: $bar-buttons-media-spacing;
@@ -24,6 +24,7 @@
$bar-buttons-radius * 0.4,
$bar-buttons-radius
);
color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-media-icon);
}
.bar-button-label.media {

View File

@@ -5,7 +5,7 @@
}
.bar_item_box_visible.style2.dashboard {
background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-dashboard-background);
background: if($bar-buttons-monochrome, $bar-buttons-icon_background, $bar-buttons-dashboard-background);
.bar-menu_label {
color: if($bar-buttons-monochrome, $bar-buttons-background, $bar-buttons-dashboard-icon);

View File

@@ -11,7 +11,7 @@
.bar-button-icon.network-icon {
border-top-left-radius: $bar-buttons-radius;
border-bottom-left-radius: $bar-buttons-radius;
background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-network-icon_background);
background: if($bar-buttons-monochrome, $bar-buttons-icon_background, $bar-buttons-network-icon_background);
padding: $bar-buttons-padding_y 0em;
padding-left: $bar-buttons-padding_x;
padding-right: $bar-buttons-network-spacing;
@@ -25,6 +25,7 @@
$bar-buttons-radius * 0.4,
$bar-buttons-radius
);
color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-network-icon);
}
.bar-button-label.network-label {

View File

@@ -13,7 +13,11 @@
.bar-button-icon.notifications {
border-top-left-radius: $bar-buttons-radius;
border-bottom-left-radius: $bar-buttons-radius;
background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-notifications-icon_background);
background: if(
$bar-buttons-monochrome,
$bar-buttons-icon_background,
$bar-buttons-notifications-icon_background
);
padding: $bar-buttons-padding_y 0em;
padding-left: $bar-buttons-padding_x;
padding-right: $bar-buttons-notifications-spacing;
@@ -27,11 +31,11 @@
$bar-buttons-radius * 0.4,
$bar-buttons-radius
);
color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-notifications-icon);
&:last-child {
border-radius: $bar-buttons-radius;
}
color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-notifications-icon);
}
.bar-button-label.notifications {

View File

@@ -15,7 +15,7 @@
.bar-button-icon.windowtitle {
border-top-left-radius: $bar-buttons-radius;
border-bottom-left-radius: $bar-buttons-radius;
background: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-windowtitle-icon_background);
background: if($bar-buttons-monochrome, $bar-buttons-icon_background, $bar-buttons-windowtitle-icon_background);
padding: $bar-buttons-padding_y 0em;
padding-left: $bar-buttons-padding_x;
padding-right: $bar-buttons-windowtitle-spacing;
@@ -29,6 +29,7 @@
$bar-buttons-radius * 0.4,
$bar-buttons-radius
);
color: if($bar-buttons-monochrome, $bar-buttons-icon, $bar-buttons-windowtitle-icon);
}
.bar-button-label.windowtitle {

View File

@@ -54,7 +54,10 @@
$transparency-value-hover: 1 - $bar-button-background-hover-opacity-ratio;
.bar_item_box_visible {
&.#{$class} {
background: transparentize($labelBackground, $transparency-value);
background: transparentize(
if($bar-buttons-monochrome, $bar-buttons-background, $labelBackground),
$transparency-value
);
border: if(
$borderEnabled or $bar-buttons-enableBorders,
$bar-buttons-borderSize solid if($bar-buttons-monochrome, $bar-buttons-icon, $borderColor),
@@ -84,9 +87,9 @@
.style2 {
.module-icon.#{$class} {
background: if($bar-buttons-monochrome, $bar-buttons-icon, $iconBackground);
background: if($bar-buttons-monochrome, $bar-buttons-icon_background, $iconBackground);
padding-right: $spacing;
color: if($bar-buttons-monochrome, $bar-buttons-background, $iconColor);
color: if($bar-buttons-monochrome, $bar-buttons-icon, $iconColor);
border-top-left-radius: if(
$borderEnabled or $bar-buttons-enableBorders,
$bar-buttons-radius * 0.4,