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);