Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

chore(frontend): refactor colors

johavenf893df9a4dd8
diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scss
index 485b26c5..9deffda4 100755
--- a/frontend/src/styles/components/_app.scss
+++ b/frontend/src/styles/components/_app.scss
@@ -25,13 +25,21 @@
.body {
.btn.btn-primary {
- @include btn-badge-dark-vars(#1d4ed833, #60a5fa66, #bfdbfe);
+ @include btn-dark-vars(
+ semantic-dark('primary', bg),
+ semantic-dark('primary', border),
+ semantic-dark('primary', fg)
+ );
--btn-chip-bg: #203255;
--btn-chip-active-bg: white;
border-width: .5px !important;
}
.btn.btn-secondary {
- @include btn-badge-dark-vars(#33415566, #64748b80, #e2e8f0);
+ @include btn-dark-vars(
+ semantic-dark('secondary', bg),
+ semantic-dark('secondary', border),
+ semantic-dark('secondary', fg)
+ );
border-width: .5px !important;
}
diff --git a/frontend/src/styles/components/_backgrounds.scss b/frontend/src/styles/components/_backgrounds.scss
index 3f7b98ae..e573d959 100644
--- a/frontend/src/styles/components/_backgrounds.scss
+++ b/frontend/src/styles/components/_backgrounds.scss
@@ -1,29 +1,30 @@
-.bg-gray-dark {
- background-color: $gray-700;
-}
-
-.bg-gray-light-important {
- background-color: $gray-light !important;
-}
+$background-variants: (
+ 'bg-gray-dark': (tone: 'gray-dark-bg'),
+ 'bg-purple': (tone: 'purple', important: true),
+ 'bg-maroon': (tone: 'maroon'),
+ 'bg-secondary-alt': (tone: 'secondary-alt-bg', text: black),
+ 'bg-gray-light-important': (tone: 'gray-light', important: true)
+);
-.bg-purple {
- background-color: $purple !important;
-}
+@each $selector, $config in $background-variants {
+ .#{$selector} {
+ @if map-get($config, important) == true {
+ background-color: semantic-tone(map-get($config, tone)) !important;
+ } @else {
+ background-color: semantic-tone(map-get($config, tone));
+ }
-.bg-maroon {
- background-color: $maroon;
-}
-
-.bg-secondary-alt {
- background-color: $secondary;
- color: black;
+ @if map-get($config, text) != null {
+ color: map-get($config, text);
+ }
+ }
}
.bg-soft-warning {
- background-color: rgba($warning, 0.6) !important;
+ background-color: rgba(semantic-tone('warning'), 0.6) !important;
}
.drag-over {
- background-color: $secondary !important;
+ background-color: semantic-tone('secondary-alt-bg') !important;
color: black !important;
-}
\ No newline at end of file
+}
diff --git a/frontend/src/styles/components/_badges.scss b/frontend/src/styles/components/_badges.scss
index aaefae91..a507914c 100644
--- a/frontend/src/styles/components/_badges.scss
+++ b/frontend/src/styles/components/_badges.scss
@@ -104,44 +104,70 @@ body.theme-dark .badge {
--badge-border-full: #64748b;
}
-@include badge-variant('bg-primary', $primary, mix($primary, $black, 86%));
-@include badge-variant('bg-secondary', darken($secondary, 22%), mix($gray-dark, $black, 94%), 62%, 34%);
-@include badge-variant('bg-success', $success);
-@include badge-variant('bg-danger', $danger);
-@include badge-variant('bg-warning', $warning, #a35400);
-@include badge-variant('bg-info', $info, mix($info, $black, 88%));
-@include badge-variant('bg-light', $gray-lightest, mix($gray-dark, $black, 82%), 80%, 60%);
-@include badge-variant('bg-dark', $gray-dark, mix($gray-dark, $black, 88%), 82%, 62%);
-@include badge-variant('bg-purple', $purple, mix($purple, $black, 88%));
-@include badge-variant('bg-maroon', $maroon, mix($maroon, $black, 90%));
-@include badge-variant('bg-gray-dark', $gray-dark, mix($gray-dark, $black, 88%), 82%, 62%);
-@include badge-variant('bg-secondary-alt', darken($secondary, 22%), mix($gray-dark, $black, 94%), 62%, 34%);
-@include badge-variant('sync-newly-0', $red);
-@include badge-variant('sync-newly-1', $primary);
-@include badge-variant('sync-newly-2', lighten($primary, 15%), mix($primary, $black, 84%));
-@include badge-variant('sync-newly-3', lighten($primary, 30%), mix($primary, $black, 82%));
-@include badge-variant('sync-newly-4', $orange, #a35400);
-@include badge-variant('prop-newly-1', $purple, mix($purple, $black, 88%));
-@include badge-variant('prop-newly-2', lighten($purple, 15%), mix($purple, $black, 84%));
-@include badge-variant('prop-newly-3', lighten($purple, 30%), mix($purple, $black, 82%));
-
-@include badge-dark-variant('bg-secondary', #33415566, #64748b80, #e2e8f0);
-@include badge-dark-variant('bg-secondary-alt', #ffffff14, #cbd5e14d, #f8fafc);
-@include badge-dark-variant('bg-primary', #1d4ed833, #60a5fa66, #bfdbfe);
-@include badge-dark-variant('bg-success', #16a34a33, #4ade8080, #bbf7d0);
-@include badge-dark-variant('bg-danger', #dc262633, #f8717180, #fecaca);
-@include badge-dark-variant('bg-warning', #f59e0b33, #fbbf2480, #fde68a);
-@include badge-dark-variant('bg-info', #4f46e533, #818cf880, #c7d2fe);
-@include badge-dark-variant('bg-purple', #7e22ce33, #c084fc80, #e9d5ff);
-@include badge-dark-variant('bg-maroon', #be185d33, #f472b680, #fbcfe8);
-@include badge-dark-variant('bg-light', #e2e8f014, #cbd5e14d, #f1f5f9);
-@include badge-dark-variant('bg-dark', #33415559, #94a3b866, #e2e8f0);
-@include badge-dark-variant('bg-gray-dark', #33415559, #94a3b866, #e2e8f0);
-@include badge-dark-variant('sync-newly-0', #dc262633, #f8717180, #fecaca);
-@include badge-dark-variant('sync-newly-1', #1d4ed833, #60a5fa66, #bfdbfe);
-@include badge-dark-variant('sync-newly-2', #1e40af33, #93c5fd80, #dbeafe);
-@include badge-dark-variant('sync-newly-3', #0369a133, #67e8f980, #cffafe);
-@include badge-dark-variant('sync-newly-4', #f59e0b33, #fbbf2480, #fde68a);
-@include badge-dark-variant('prop-newly-1', #7e22ce33, #c084fc80, #e9d5ff);
-@include badge-dark-variant('prop-newly-2', #9333ea33, #d8b4fe80, #f3e8ff);
-@include badge-dark-variant('prop-newly-3', #a855f733, #e9d5ff80, #faf5ff);
+$badge-variants: (
+ 'bg-primary': (tone: 'primary', text: semantic-ink('primary', 86%)),
+ 'bg-secondary': (tone: 'secondary', text: semantic-ink('gray-dark', 94%), bg-mix: 62%, border-mix: 34%),
+ 'bg-success': (tone: 'success'),
+ 'bg-danger': (tone: 'danger'),
+ 'bg-warning': (tone: 'warning', text: #a35400),
+ 'bg-info': (tone: 'info', text: semantic-ink('info', 88%)),
+ 'bg-light': (tone: 'light', text: semantic-ink('gray-dark', 82%), bg-mix: 80%, border-mix: 60%),
+ 'bg-dark': (tone: 'dark', text: semantic-ink('gray-dark', 88%), bg-mix: 82%, border-mix: 62%),
+ 'bg-purple': (tone: 'purple', text: semantic-ink('purple', 88%)),
+ 'bg-maroon': (tone: 'maroon', text: semantic-ink('maroon', 90%)),
+ 'bg-gray-dark': (tone: 'gray-dark', text: semantic-ink('gray-dark', 88%), bg-mix: 82%, border-mix: 62%),
+ 'bg-secondary-alt': (tone: 'secondary', text: semantic-ink('gray-dark', 94%), bg-mix: 62%, border-mix: 34%),
+ 'sync-newly-0': (tone: 'sync-newly-0'),
+ 'sync-newly-1': (tone: 'sync-newly-1'),
+ 'sync-newly-2': (tone: 'sync-newly-2', text: semantic-ink('primary', 84%)),
+ 'sync-newly-3': (tone: 'sync-newly-3', text: semantic-ink('primary', 82%)),
+ 'sync-newly-4': (tone: 'sync-newly-4', text: #a35400),
+ 'prop-newly-1': (tone: 'prop-newly-1', text: semantic-ink('purple', 88%)),
+ 'prop-newly-2': (tone: 'prop-newly-2', text: semantic-ink('purple', 84%)),
+ 'prop-newly-3': (tone: 'prop-newly-3', text: semantic-ink('purple', 82%))
+);
+
+$badge-dark-variants: (
+ 'bg-secondary': 'secondary',
+ 'bg-secondary-alt': 'secondary-alt',
+ 'bg-primary': 'primary',
+ 'bg-success': 'success',
+ 'bg-danger': 'danger',
+ 'bg-warning': 'warning',
+ 'bg-info': 'info',
+ 'bg-purple': 'purple',
+ 'bg-maroon': 'maroon',
+ 'bg-light': 'light',
+ 'bg-dark': 'dark',
+ 'bg-gray-dark': 'gray-dark',
+ 'sync-newly-0': 'sync-newly-0',
+ 'sync-newly-1': 'sync-newly-1',
+ 'sync-newly-2': 'sync-newly-2',
+ 'sync-newly-3': 'sync-newly-3',
+ 'sync-newly-4': 'sync-newly-4',
+ 'prop-newly-1': 'prop-newly-1',
+ 'prop-newly-2': 'prop-newly-2',
+ 'prop-newly-3': 'prop-newly-3'
+);
+
+@each $selector, $config in $badge-variants {
+ $bg-mix: map-get($config, bg-mix);
+ $border-mix: map-get($config, border-mix);
+
+ @include badge-variant(
+ $selector,
+ semantic-tone(map-get($config, tone)),
+ map-get($config, text),
+ if($bg-mix == null, 84%, $bg-mix),
+ if($border-mix == null, 66%, $border-mix)
+ );
+}
+
+@each $selector, $dark-key in $badge-dark-variants {
+ @include badge-dark-variant(
+ $selector,
+ semantic-dark($dark-key, bg),
+ semantic-dark($dark-key, border),
+ semantic-dark($dark-key, fg)
+ );
+}
diff --git a/frontend/src/styles/components/_buttons.scss b/frontend/src/styles/components/_buttons.scss
index 801c09fc..5617445d 100644
--- a/frontend/src/styles/components/_buttons.scss
+++ b/frontend/src/styles/components/_buttons.scss
@@ -1,4 +1,4 @@
-@mixin btn-badge-vars(
+@mixin btn-vars(
$tone,
$light-text: null,
$light-bg-mix: 84%,
@@ -25,7 +25,7 @@
--btn-chip-active-fg: #{$active-fg};
}
-@mixin btn-badge-dark-vars($bg, $border, $fg) {
+@mixin btn-dark-vars($bg, $border, $fg) {
--btn-chip-bg: #{$bg};
--btn-chip-border: #{$border};
--btn-chip-fg: #{$fg};
@@ -37,7 +37,7 @@
--btn-chip-active-fg: #{mix($fg, $white, 90%)};
}
-@mixin btn-badge-variant(
+@mixin btn-variant(
$selector,
$tone,
$light-text: null,
@@ -45,13 +45,13 @@
$light-border-mix: 66%
) {
.btn.#{$selector} {
- @include btn-badge-vars($tone, $light-text, $light-bg-mix, $light-border-mix);
+ @include btn-vars($tone, $light-text, $light-bg-mix, $light-border-mix);
}
}
-@mixin btn-badge-dark-variant($selector, $bg, $border, $fg) {
+@mixin btn-dark-variant($selector, $bg, $border, $fg) {
body.theme-dark .btn.#{$selector} {
- @include btn-badge-dark-vars($bg, $border, $fg);
+ @include btn-dark-vars($bg, $border, $fg);
}
}
@@ -156,16 +156,42 @@
@extend .btn-close-white;
}
-@include btn-badge-variant('btn-primary', $primary, mix($primary, $black, 88%), 70%, 48%);
-@include btn-badge-variant('btn-secondary', darken($secondary, 22%), mix($gray-dark, $black, 94%), 62%, 34%);
-@include btn-badge-variant('btn-success', $success, mix($success, $black, 90%), 68%, 46%);
-@include btn-badge-variant('btn-danger', $danger);
-@include btn-badge-variant('btn-warning', $warning, #a35400, 54%, 34%);
-@include btn-badge-variant('btn-info', mix($info, $gray-dark, 16%), mix($gray-dark, $black, 90%), 68%, 48%);
-
-@include btn-badge-dark-variant('btn-primary', #1d4ed833, #60a5fa66, #bfdbfe);
-@include btn-badge-dark-variant('btn-secondary', #33415566, #64748b80, #e2e8f0);
-@include btn-badge-dark-variant('btn-success', #16a34a33, #4ade8080, #bbf7d0);
-@include btn-badge-dark-variant('btn-danger', #dc262633, #f8717180, #fecaca);
-@include btn-badge-dark-variant('btn-warning', #f59e0b33, #fbbf2480, #fde68a);
-@include btn-badge-dark-variant('btn-info', #0f4c5a33, #67a8ba80, #cfeaf1);
+$button-variants: (
+ 'btn-primary': (tone: 'primary', text: semantic-ink('primary', 88%), bg-mix: 70%, border-mix: 48%),
+ 'btn-secondary': (tone: 'secondary', text: semantic-ink('gray-dark', 94%), bg-mix: 62%, border-mix: 34%),
+ 'btn-success': (tone: 'success', text: semantic-ink('success', 90%), bg-mix: 68%, border-mix: 46%),
+ 'btn-danger': (tone: 'danger'),
+ 'btn-warning': (tone: 'warning', text: #a35400, bg-mix: 54%, border-mix: 34%),
+ 'btn-info': (tone: 'info-btn', text: semantic-ink('gray-dark', 90%), bg-mix: 68%, border-mix: 48%)
+);
+
+$button-dark-variants: (
+ 'btn-primary': 'primary',
+ 'btn-secondary': 'secondary',
+ 'btn-success': 'success',
+ 'btn-danger': 'danger',
+ 'btn-warning': 'warning',
+ 'btn-info': 'btn-info'
+);
+
+@each $selector, $config in $button-variants {
+ $bg-mix: map-get($config, bg-mix);
+ $border-mix: map-get($config, border-mix);
+
+ @include btn-variant(
+ $selector,
+ semantic-tone(map-get($config, tone)),
+ map-get($config, text),
+ if($bg-mix == null, 84%, $bg-mix),
+ if($border-mix == null, 66%, $border-mix)
+ );
+}
+
+@each $selector, $dark-key in $button-dark-variants {
+ @include btn-dark-variant(
+ $selector,
+ semantic-dark($dark-key, bg),
+ semantic-dark($dark-key, border),
+ semantic-dark($dark-key, fg)
+ );
+}
diff --git a/frontend/src/styles/components/_colors.scss b/frontend/src/styles/components/_colors.scss
new file mode 100644
index 00000000..b9f48d18
--- /dev/null
+++ b/frontend/src/styles/components/_colors.scss
@@ -0,0 +1,62 @@
+$semantic-tones: (
+ 'primary': $primary,
+ 'secondary': darken($secondary, 22%),
+ 'secondary-alt-bg': $secondary,
+ 'gray-light': $gray-light,
+ 'success': $success,
+ 'danger': $danger,
+ 'warning': $warning,
+ 'info': $info,
+ 'info-btn': mix($info, $gray-dark, 16%),
+ 'light': $gray-lightest,
+ 'dark': $gray-dark,
+ 'purple': $purple,
+ 'maroon': $maroon,
+ 'gray-dark': $gray-dark,
+ 'gray-dark-bg': $gray-700,
+ 'sync-newly-0': $red,
+ 'sync-newly-1': $primary,
+ 'sync-newly-2': lighten($primary, 15%),
+ 'sync-newly-3': lighten($primary, 30%),
+ 'sync-newly-4': $orange,
+ 'prop-newly-1': $purple,
+ 'prop-newly-2': lighten($purple, 15%),
+ 'prop-newly-3': lighten($purple, 30%)
+);
+
+$semantic-dark-triplets: (
+ 'secondary': (bg: #33415566, border: #64748b80, fg: #e2e8f0),
+ 'secondary-alt': (bg: #ffffff14, border: #cbd5e14d, fg: #f8fafc),
+ 'primary': (bg: #1d4ed833, border: #60a5fa66, fg: #bfdbfe),
+ 'success': (bg: #16a34a33, border: #4ade8080, fg: #bbf7d0),
+ 'danger': (bg: #dc262633, border: #f8717180, fg: #fecaca),
+ 'warning': (bg: #f59e0b33, border: #fbbf2480, fg: #fde68a),
+ 'info': (bg: #4f46e533, border: #818cf880, fg: #c7d2fe),
+ 'btn-info': (bg: #0f4c5a33, border: #67a8ba80, fg: #cfeaf1),
+ 'purple': (bg: #7e22ce33, border: #c084fc80, fg: #e9d5ff),
+ 'maroon': (bg: #be185d33, border: #f472b680, fg: #fbcfe8),
+ 'light': (bg: #e2e8f014, border: #cbd5e14d, fg: #f1f5f9),
+ 'dark': (bg: #33415559, border: #94a3b866, fg: #e2e8f0),
+ 'gray-dark': (bg: #33415559, border: #94a3b866, fg: #e2e8f0),
+ 'sync-newly-0': (bg: #dc262633, border: #f8717180, fg: #fecaca),
+ 'sync-newly-1': (bg: #1d4ed833, border: #60a5fa66, fg: #bfdbfe),
+ 'sync-newly-2': (bg: #1e40af33, border: #93c5fd80, fg: #dbeafe),
+ 'sync-newly-3': (bg: #0369a133, border: #67e8f980, fg: #cffafe),
+ 'sync-newly-4': (bg: #f59e0b33, border: #fbbf2480, fg: #fde68a),
+ 'prop-newly-1': (bg: #7e22ce33, border: #c084fc80, fg: #e9d5ff),
+ 'prop-newly-2': (bg: #9333ea33, border: #d8b4fe80, fg: #f3e8ff),
+ 'prop-newly-3': (bg: #a855f733, border: #e9d5ff80, fg: #faf5ff)
+);
+
+@function semantic-tone($name) {
+ @return map-get($semantic-tones, $name);
+}
+
+@function semantic-dark($name, $field) {
+ $triplet: map-get($semantic-dark-triplets, $name);
+ @return if($triplet == null, null, map-get($triplet, $field));
+}
+
+@function semantic-ink($tone, $mix-amount: 90%) {
+ @return mix(semantic-tone($tone), $black, $mix-amount);
+}
diff --git a/frontend/src/styles/components/index.scss b/frontend/src/styles/components/index.scss
index 2dda9bb4..0950fd64 100644
--- a/frontend/src/styles/components/index.scss
+++ b/frontend/src/styles/components/index.scss
@@ -11,6 +11,7 @@
@import 'sidebar_right';
@import 'dropdowns';
@import 'forms';
+@import 'colors';
@import 'badges';
@import 'buttons';
@import 'boxes';