4050bab0f1
* build: start new build system * fix: keys * fix: suffixes * feat: assets * fix: naming; xfwm4; remove todos * style: refactor the whole build script * feat: actually use our palette * feat: zipping * ci: adapt to new build system * ci: whoops * fix: allow all accents to be generated in 1 task * ci: don't explode the ci * fix: allow skipping of patch procedures * fix: daArKrDaRkdarkdark * feat: first pass at install script * fix: use shebang * fix: use `dark` for gtk css universally
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
|
|
index e8366fa0..97fa670c 100644
|
|
--- a/src/sass/_colors.scss
|
|
+++ b/src/sass/_colors.scss
|
|
@@ -57,9 +57,8 @@
|
|
@else { @return rgba($white, 0.1); }
|
|
}
|
|
|
|
-@function theme($color) {
|
|
+@function theme() {
|
|
@if ($variant == 'light') {
|
|
- @if ($theme == 'default') { @return $default-dark; }
|
|
@if ($theme == 'purple') { @return $purple-dark; }
|
|
@if ($theme == 'pink') { @return $pink-dark; }
|
|
@if ($theme == 'red') { @return $red-dark; }
|
|
@@ -68,8 +67,9 @@
|
|
@if ($theme == 'green') { @return $green-dark; }
|
|
@if ($theme == 'teal') { @return $teal-dark; }
|
|
@if ($theme == 'grey') { @return $grey-600; }
|
|
+
|
|
+ @return $default-dark;
|
|
} @else {
|
|
- @if ($theme == 'default') { @return $default-light; }
|
|
@if ($theme == 'purple') { @return $purple-light; }
|
|
@if ($theme == 'pink') { @return $pink-light; }
|
|
@if ($theme == 'red') { @return $red-light; }
|
|
@@ -78,6 +78,8 @@
|
|
@if ($theme == 'green') { @return $green-light; }
|
|
@if ($theme == 'teal') { @return $teal-light; }
|
|
@if ($theme == 'grey') { @return $grey-200; }
|
|
+
|
|
+ @return $default-light;
|
|
}
|
|
}
|
|
|
|
@@ -113,9 +115,9 @@
|
|
// Basic colors
|
|
//
|
|
|
|
-$primary: theme(color);
|
|
+$primary: theme();
|
|
$drop_target_color: $orange-dark;
|
|
-$indicator: theme(color);
|
|
+$indicator: theme();
|
|
$titlebar-indicator: if($variant == 'dark', currentColor, $primary);
|
|
$inverse-indicator: if($theme == 'grey', $white, $primary);
|
|
$applet-primary: if($theme == 'grey' and variant == 'light' and $topbar == 'dark', $grey-200, $primary);
|