Skip to content

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

chore(frontend): scss optimization

johavenfcd311e218c8
diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scss
index 56cdef84..ed1bb83b 100755
--- a/frontend/src/styles/components/_theme_dark.scss
+++ b/frontend/src/styles/components/_theme_dark.scss
@@ -90,7 +90,8 @@
background: $sidebar-dark-apps-menu-bg;
border-left: .5px solid $sidebar-dark-icons-menu-border-color;
- .sidebar-component-title {
+ .sidebar-component-title,
+ .sidebar-title {
color: $sidebar-dark-apps-menu-color;
background: $sidebar-dark-apps-menu-title-bg;
border-bottom: .5px solid $sidebar-dark-icons-menu-border-color;
@@ -100,14 +101,8 @@
color: $gray-light;
}
- .sidebar-title {
- color: $sidebar-dark-apps-menu-color;
- background: $sidebar-dark-apps-menu-title-bg;
- border-bottom: .5px solid $sidebar-dark-icons-menu-border-color;
- }
-
hr {
- border-top-color: rgba(146, 173, 204, 0.4) !important;
+ border-top-color: $dark-control-sidebar-separator-color !important;
opacity: 1;
}
}
@@ -163,63 +158,48 @@
@mixin skin-dark-tree() {
.angular-tree-component {
- .node-wrapper {
- &:hover,
- &:focus,
- &:active {
- background-color: $sidebar-dark-apps-menu-title-bg;
- }
-
- &.tree-selected {
- background-color: darken($sidebar-dark-apps-menu-title-bg, 4%);
- }
- }
-
+ .node-wrapper,
.node-content-wrapper {
&:hover,
&:focus,
&:active {
- background-color: $sidebar-dark-apps-menu-title-bg;
+ background-color: $dark-tree-node-hover-bg;
}
+ }
- &.node-content-wrapper-active {
- background-color: darken($sidebar-dark-apps-menu-title-bg, 4%);
-
- &:hover {
- background-color: darken($sidebar-dark-apps-menu-title-bg, 4%);
- }
- }
+ .node-wrapper.tree-selected,
+ .node-content-wrapper.node-content-wrapper-active,
+ .node-content-wrapper.node-content-wrapper-active:hover {
+ background-color: $dark-tree-node-selected-bg;
}
}
}
@mixin skin-dark-app() {
.dialog-tab-card {
- box-shadow: 0 12px 24px rgba(0, 0, 0, 0.28);
+ box-shadow: 0 12px 24px $dark-dialog-tab-card-shadow-color;
}
.dialog-check-card {
- border: 1px solid rgba(132, 157, 185, 0.24);
+ border: 1px solid $dark-dialog-check-card-border-color;
}
.dialog-check-card--interactive {
cursor: pointer;
transition: background-color 0.2s ease, border-color 0.2s ease, box-shadow 0.2s ease;
}
.dialog-check-card--interactive:hover {
- border-color: rgba(146, 173, 204, 0.4);
- box-shadow: 0 6px 14px rgba(0, 0, 0, 0.24);
+ border-color: $dark-dialog-check-card-hover-border-color;
+ box-shadow: 0 6px 14px $dark-dialog-check-card-hover-shadow-color;
}
.dialog-check-card--active {
- border-color: rgba(92, 141, 202, 0.62);
+ border-color: $dark-dialog-check-card-active-border-color;
}
.newly {
color: $custom-color !important;
border-bottom: none;
}
.btn {
- --btn-premium-focus: #{rgba($primary, 0.28)};
-
&:focus-visible {
- outline: 2px solid var(--btn-premium-focus, rgba(13, 110, 253, 0.25));
+ outline: 2px solid $dark-btn-focus-color;
outline-offset: 1px;
box-shadow: none !important;
}
@@ -228,27 +208,20 @@
.btn-default,
.btn-custom,
.btn-outline-secondary-alt {
- --btn-premium-secondary-bg: #{lighten($sidebar-dark-icons-menu-bg, 5%)};
- --btn-premium-secondary-bg-hover: #{$sidebar-dark-icons-menu-bg};
- --btn-premium-secondary-border: #{lighten($sidebar-dark-icons-menu-border-color, 10%)};
- --btn-premium-secondary-border-hover: #{mix($primary, $sidebar-dark-icons-menu-border-color, 34%)};
- --btn-premium-secondary-color: #{lighten($gray-light, 8%)};
- --btn-premium-secondary-color-hover: #{lighten($gray-light, 14%)};
- --btn-premium-secondary-disabled-color: #{darken($gray-light, 12%)};
- border-color: var(--btn-premium-secondary-border) !important;
- color: var(--btn-premium-secondary-color) !important;
- background-color: var(--btn-premium-secondary-bg) !important;
+ border-color: $dark-surface-border !important;
+ color: $dark-item-color !important;
+ background-color: $dark-surface-bg !important;
&:hover:not(:disabled) {
- border-color: var(--btn-premium-secondary-border-hover) !important;
- color: var(--btn-premium-secondary-color-hover) !important;
- background-color: var(--btn-premium-secondary-bg-hover) !important;
+ border-color: mix($primary, $sidebar-dark-icons-menu-border-color, 34%) !important;
+ color: $dark-item-hover-color !important;
+ background-color: $sidebar-dark-icons-menu-bg !important;
}
&:disabled {
- border-color: var(--btn-premium-secondary-border) !important;
- color: var(--btn-premium-secondary-disabled-color) !important;
- background-color: var(--btn-premium-secondary-bg) !important;
+ border-color: $dark-surface-border !important;
+ color: $dark-item-disabled-color !important;
+ background-color: $dark-surface-bg !important;
}
}
.btn-custom {
@@ -272,50 +245,46 @@
@include button-outline-variant($primary);
}
.btn[class*='bg-']:hover {
- @include box-shadow(inset 0 0 100px rgba(0, 0, 0, 0.2));
+ @include box-shadow(inset 0 0 100px $theme-btn-bg-hover-overlay-shadow);
}
.btn-minimize {
- background: transparent url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' fill='%23000'%3e%3cpath d='M32,224c-17.7,0-32,14.3-32,32s14.3,32,32,32h448c17.7,0,32-14.3,32-32s-14.3-32-32-32H32z'/%3e%3c/svg%3e") center/1em auto no-repeat;
+ background: transparent url("#{$theme-btn-minimize-icon-svg}") center/1em auto no-repeat;
}
.dropdown-menu {
- --menu-surface-bg: #{lighten($sidebar-dark-icons-menu-bg, 5%)};
- --menu-surface-border: #{lighten($sidebar-dark-icons-menu-border-color, 10%)};
- --menu-item-color: #{lighten($gray-light, 8%)};
- --menu-item-hover-bg: #{$sidebar-dark-icons-menu-bg};
- --menu-item-hover-color: #{lighten($gray-light, 14%)};
- border: .5px solid var(--menu-surface-border, var(--btn-premium-secondary-border)) !important;
- background-color: var(--menu-surface-bg, var(--btn-premium-secondary-bg)) !important;
+ border: .5px solid $dark-surface-border !important;
+ background-color: $dark-surface-bg !important;
+ box-shadow: $dark-menu-surface-shadow;
> li > a {
- color: var(--menu-item-color, var(--btn-premium-secondary-color));
+ color: $dark-item-color;
background-color: transparent;
&:hover {
- background-color: var(--menu-item-hover-bg, var(--btn-premium-secondary-bg-hover)) !important;
- color: var(--menu-item-hover-color, var(--btn-premium-secondary-color-hover)) !important;
+ background-color: $sidebar-dark-icons-menu-bg !important;
+ color: $dark-item-hover-color !important;
}
}
> .divider {
- background-color: #eee;
+ background-color: $theme-dropdown-divider-bg;
}
}
.dropdown-item {
- color: var(--menu-item-color, var(--btn-premium-secondary-color));
+ color: $dark-item-color;
&:hover,
&.active,
&:active {
- background-color: var(--menu-item-hover-bg, var(--btn-premium-secondary-bg-hover)) !important;
- color: var(--menu-item-hover-color, var(--btn-premium-secondary-color-hover)) !important;
+ background-color: $sidebar-dark-icons-menu-bg !important;
+ color: $dark-item-hover-color !important;
}
}
.dropdown-divider {
- border-top-color: var(--menu-surface-border, var(--btn-premium-secondary-border)) !important;
+ border-top-color: $dark-surface-border !important;
}
.virtual-scroll-border-top {
- border-top: 0.5px solid darken($sidebar-dark-icons-menu-border-color, 3%) !important;
+ border-top: 0.5px solid $dark-border-subtle !important;
}
.app-table {
@@ -330,10 +299,10 @@
}
tbody tr {
- border-bottom-color: darken($sidebar-dark-icons-menu-border-color, 3%) !important;
+ border-bottom-color: $dark-border-subtle !important;
&:hover {
- background-color: darken($sidebar-dark-icons-menu-bg, 3%) !important;
+ background-color: $dark-table-row-hover-bg !important;
}
&.selected {
@@ -353,7 +322,7 @@
}
&:hover {
- background-color: darken($sidebar-dark-icons-menu-bg, 3%);
+ background-color: $dark-table-row-hover-bg;
}
}
}
@@ -363,11 +332,16 @@
background: linear-gradient(170deg, lighten($sidebar-dark-apps-menu-title-bg, 7%) 0%, darken($sidebar-dark-icons-menu-bg, 1%) 100%);
.dropdown-menu {
- --menu-item-color: #{$gray-light};
+ > li > a {
+ color: $gray-light;
+ }
+ }
+ .dropdown-item {
+ color: $gray-light;
}
}
.app-foot-menu {
- border-top: 0.5px solid darken($sidebar-dark-icons-menu-border-color, 3%) !important;
+ border-top: 0.5px solid $dark-border-subtle !important;
background-color: $sidebar-dark-icons-menu-bg;
color: darken($gray-light, 5%);
}
@@ -391,7 +365,7 @@
}
.app-div-striped-inverse {
&:nth-of-type(odd) {
- background-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);
+ background-color: $dark-striped-bg;
}
}
.app-thumbs {
@@ -434,7 +408,7 @@
}
.border-bottom {
border-bottom-width: 0.5px !important;
- border-bottom-color: rgba(146, 173, 204, 0.4) !important;
+ border-bottom-color: $dark-control-sidebar-separator-color !important;
}
.profile-page {
background-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);
@@ -492,8 +466,9 @@
// border-left: .5px solid $sidebar-dark-icons-menu-border-color;
//}
.ngx-contextmenu {
- background-color: lighten($sidebar-dark-icons-menu-bg, 5%);
- border-color: lighten($sidebar-dark-icons-menu-border-color, 10%);
+ background-color: $dark-surface-bg !important;
+ border-color: $dark-surface-border !important;
+ box-shadow: $dark-menu-surface-shadow !important;
> button.ngx-context-menu-item {
color: $gray-light !important;
@@ -507,10 +482,11 @@
}
> [role='separator'] {
- border-top-color: lighten($sidebar-dark-icons-menu-border-color, 10%) !important;
+ border-top-color: $dark-surface-border !important;
}
}
- .dialog-tab-card, .dialog-check-card {
+ .dialog-tab-card,
+ .dialog-check-card {
color: $gray-light;
background-color: $sidebar-dark-icons-menu-bg;
border-color: $sidebar-dark-icons-menu-border-color;
@@ -519,26 +495,29 @@
background: transparent !important;
}
.modal-header {
- border-bottom-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);
+ border-bottom-color: $dark-striped-bg;
}
.modal-body {
color: $gray-light;
- background-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);
+ background-color: $dark-striped-bg;
.app-top-menu {
background: transparent;
}
-
- .card {
- @extend .dialog-tab-card;
- }
}
.modal-footer {
color: $gray-light;
background-color: $sidebar-dark-apps-menu-title-bg;
border-top-color: $sidebar-dark-apps-menu-title-bg;
}
- typeahead-container, .ui-select-choices {
+ .modal-auth-verify-2fa,
+ .modal-viewer-select {
+ .card {
+ @extend .dialog-tab-card;
+ }
+ }
+ typeahead-container,
+ .ui-select-choices {
&.dropdown-menu {
background-color: $sidebar-dark-icons-menu-border-color;
border-color: $sidebar-dark-apps-menu-title-bg;
@@ -584,7 +563,7 @@
.form-control, .form-select, .input-group-text {
background-color: $sidebar-dark-apps-menu-title-bg;
color: $white;
- border-color: lighten($sidebar-dark-icons-menu-bg, 4%);
+ border-color: $dark-field-border;
&:focus {
border-color: $primary;
@@ -598,7 +577,7 @@
}
.small-box {
color: $gray-light;
- border-color: lighten($sidebar-dark-icons-menu-bg, 4%);
+ border-color: $dark-field-border;
background-color: $sidebar-dark-icons-menu-bg;
}
.box:not(.box-background-transparent) {
@@ -625,7 +604,7 @@
.box-transparent {
background-color: darken($sidebar-dark-icons-menu-bg, 2%);
border-color: $sidebar-dark-icons-menu-border-color;
- box-shadow: 0 10px 24px rgba(0, 0, 0, 0.35);
+ box-shadow: 0 10px 24px $dark-box-transparent-shadow-color;
> .box-header {
background: linear-gradient(
@@ -657,10 +636,10 @@
}
}
.text-purple {
- color: #b366ff !important;
+ color: $dark-text-purple-color !important;
}
.text-primary {
- color: #2283dd !important;
+ color: $dark-text-primary-color !important;
}
.bg-theme {
background-color: darken($sidebar-dark-icons-menu-bg, 4%);
@@ -669,13 +648,13 @@
background-color: $sidebar-dark-apps-menu-title-bg !important;
}
.btn-close {
- filter: var(--bs-btn-close-white-filter)
+ filter: $theme-btn-close-white-filter;
}
.btn-outline-secondary-alt {
- border-color: lighten($sidebar-dark-icons-menu-bg, 4%)
+ border-color: $dark-field-border;
}
.text-muted {
- color: #8a8f94 !important;
+ color: $dark-text-muted-color !important;
}
.text-bg-light {
color: $gray-light !important;
diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scss
index fc4d308f..f39b5663 100755
--- a/frontend/src/styles/components/_theme_light.scss
+++ b/frontend/src/styles/components/_theme_light.scss
@@ -23,39 +23,39 @@
}
.menu-mini {
- background-color: #ebeef5;
+ background-color: $light-sidebar-mini-bg;
> a {
color: $sidebar-light-apps-menu-hover-color;
border: .5px solid transparent;
&:hover {
- background: lighten(#d4e1f1, 2%);
+ background: $light-sidebar-mini-hover-bg;
}
&.active {
- background: darken(#d4e1f1, 4%);
- border-color: mix($primary, $gray-light, 30%);
+ background: $light-sidebar-mini-active-bg;
+ border-color: $light-sidebar-mini-active-border;
font-weight: 500;
color: $navy;
> fa-icon:first-child {
- color: darken($primary, 5%);
+ color: $light-sidebar-mini-active-icon;
}
}
}
.chat-item-sidebar {
- background-color: #ebeef5;
+ background-color: $light-sidebar-mini-bg;
color: $sidebar-light-apps-menu-hover-color;
&:not(:last-child) {
- border-bottom: .5px solid #ebeef5 !important;
+ border-bottom: .5px solid $light-sidebar-mini-bg !important;
}
&:hover, &.active {
border-left-color: transparent !important;
- background: darken(#d4e1f1, 4%) !important;
+ background: $light-sidebar-mini-active-bg !important;
color: $navy;
}
}
@@ -64,7 +64,7 @@
.sidebar-apps-menus {
.menus-content {
- background-color: #ebeef5;
+ background-color: $light-sidebar-mini-bg;
border-right: .5px solid $sidebar-light-apps-menu-border-color;
}
@@ -82,19 +82,19 @@
&:hover {
> a {
- background: lighten(#d4e1f1, 2%);
+ background: $light-sidebar-mini-hover-bg;
}
}
&.active {
> a {
- background: darken(#d4e1f1, 4%);
- border-color: mix($primary, $gray-light, 30%);
+ background: $light-sidebar-mini-active-bg;
+ border-color: $light-sidebar-mini-active-border;
font-weight: 500;
color: $navy;
> fa-icon:first-child {
- color: darken($primary, 5%);
+ color: $light-sidebar-mini-active-icon;
}
}
}
@@ -109,17 +109,12 @@
@mixin skin-light-right-sidebar() {
.control-sidebar-theme-light {
- background: #fcfdff;
+ background: $light-sidebar-surface;
border-left: .5px solid $sidebar-light-apps-menu-border-color;
- .sidebar-component-title {
- background-color: #eaf1fb;
- color: $black;
- border-bottom: .5px solid $secondary;
- }
-
+ .sidebar-component-title,
.sidebar-title {
- background-color: #eaf1fb;
+ background-color: $theme-light-panel-bg;
color: $black;
border-bottom: .5px solid $secondary;
}
@@ -131,7 +126,7 @@
}
.control-sidebar-menu {
.sidebar-apps-icons {
- background-color: #f2f6fd;
+ background-color: $light-sidebar-icons-bg;
border-left: .5px solid $sidebar-light-apps-menu-border-color;
.menu {
@@ -140,7 +135,7 @@
&:hover, &.active {
color: $black;
- background: darken(#d4e1f1, 4%);
+ background: $light-sidebar-mini-active-bg;
}
}
}
@@ -159,10 +154,10 @@
background-color: $gray-lighter;
}
.chat-button-bottom {
- color: darken(gray, 30%);
+ color: $light-chat-button-color;
&:hover {
- color: black;
+ color: $light-chat-button-hover-color;
}
}
.chat-list-sidebar {
@@ -181,63 +176,48 @@
@mixin skin-light-tree() {
.angular-tree-component {
- .node-wrapper {
- &:hover,
- &:focus,
- &:active {
- background-color: $table-bg-hover;
- }
-
- &.tree-selected {
- background-color: $selected-background;
- }
- }
-
+ .node-wrapper,
.node-content-wrapper {
&:hover,
&:focus,
&:active {
- background-color: $table-bg-hover;
+ background-color: $light-tree-node-hover-bg;
}
+ }
- &.node-content-wrapper-active {
- background-color: $selected-background;
-
- &:hover {
- background-color: $selected-background;
- }
- }
+ .node-wrapper.tree-selected,
+ .node-content-wrapper.node-content-wrapper-active,
+ .node-content-wrapper.node-content-wrapper-active:hover {
+ background-color: $light-tree-node-selected-bg;
}
}
}
@mixin skin-light-app() {
.dialog-tab-card {
- background: rgba(255, 255, 255, 0.52);
- border: 1px solid rgba(20, 45, 72, 0.11);
- box-shadow: 0 12px 24px rgba(31, 56, 86, 0.1);
+ background: $light-dialog-tab-card-bg;
+ border: 1px solid $light-dialog-tab-card-border-color;
+ box-shadow: 0 12px 24px $light-dialog-tab-card-shadow-color;
}
.dialog-check-card {
- background: rgba(236, 243, 251, 0.72);
- border: 1px solid rgba(30, 59, 89, 0.14);
+ background: $light-dialog-check-card-bg;
+ border: 1px solid $light-dialog-check-card-border-color;
}
.dialog-check-card--interactive {
cursor: pointer;
transition: background-color 0.2s ease, border-color 0.2s ease, box-shadow 0.2s ease;
}
.dialog-check-card--interactive:hover {
- background: rgba(236, 243, 251, 0.88);
- border-color: rgba(30, 59, 89, 0.3);
- box-shadow: 0 6px 14px rgba(31, 56, 86, 0.12);
+ background: $light-dialog-check-card-hover-bg;
+ border-color: $light-dialog-check-card-hover-border-color;
+ box-shadow: 0 6px 14px $light-dialog-check-card-hover-shadow-color;
}
.dialog-check-card--active {
- border-color: rgba(52, 94, 146, 0.48);
+ border-color: $light-dialog-check-card-active-border-color;
}
.btn {
- --btn-premium-focus: #{rgba($primary, 0.24)};
-
&:focus-visible {
- outline: 2px solid var(--btn-premium-focus, rgba(13, 110, 253, 0.25));
+ outline: 2px solid $light-btn-focus-color;
outline-offset: 1px;
box-shadow: none !important;
}
@@ -246,27 +226,20 @@
.btn-default,
.btn-custom,
.btn-outline-secondary-alt {
- --btn-premium-secondary-bg: #{mix($white, $gray-lightest, 94%)};
- --btn-premium-secondary-bg-hover: #{$table-bg-hover};
- --btn-premium-secondary-border: #{mix($primary, $gray-light, 14%)};
- --btn-premium-secondary-border-hover: #{mix($primary, $gray-light, 26%)};
- --btn-premium-secondary-color: #{darken($gray-dark, 18%)};
- --btn-premium-secondary-color-hover: #{darken($gray-dark, 28%)};
- --btn-premium-secondary-disabled-color: #{lighten($gray-dark, 18%)};
- border-color: var(--btn-premium-secondary-border) !important;
- color: var(--btn-premium-secondary-color) !important;
- background-color: var(--btn-premium-secondary-bg) !important;
+ border-color: $light-surface-border !important;
+ color: $light-item-color !important;
+ background-color: $light-surface-bg !important;
&:hover:not(:disabled) {
- border-color: var(--btn-premium-secondary-border-hover) !important;
- color: var(--btn-premium-secondary-color-hover) !important;
- background-color: var(--btn-premium-secondary-bg-hover) !important;
+ border-color: mix($primary, $gray-light, 26%) !important;
+ color: $light-item-hover-color !important;
+ background-color: $table-bg-hover !important;
}
&:disabled {
- border-color: var(--btn-premium-secondary-border) !important;
- color: var(--btn-premium-secondary-disabled-color) !important;
- background-color: var(--btn-premium-secondary-bg) !important;
+ border-color: $light-surface-border !important;
+ color: $light-item-disabled-color !important;
+ background-color: $light-surface-bg !important;
}
}
.btn-custom {
@@ -290,46 +263,42 @@
@include button-outline-variant($primary);
}
.btn[class*='bg-']:hover {
- @include box-shadow(inset 0 0 100px rgba(0, 0, 0, 0.2));
+ @include box-shadow(inset 0 0 100px $theme-btn-bg-hover-overlay-shadow);
}
.btn-minimize {
- background: transparent url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' fill='%23000'%3e%3cpath d='M32,224c-17.7,0-32,14.3-32,32s14.3,32,32,32h448c17.7,0,32-14.3,32-32s-14.3-32-32-32H32z'/%3e%3c/svg%3e") center/1em auto no-repeat;
+ background: transparent url("#{$theme-btn-minimize-icon-svg}") center/1em auto no-repeat;
}
.dropdown-menu {
- --menu-surface-bg: #{mix($white, $gray-lightest, 94%)};
- --menu-surface-border: #{mix($primary, $gray-light, 14%)};
- --menu-item-color: #{darken($gray-dark, 18%)};
- --menu-item-hover-bg: #{lighten($selected-background, 3%)};
- --menu-item-hover-color: #{darken($gray-dark, 28%)};
- border: .5px solid var(--menu-surface-border, var(--btn-premium-secondary-border)) !important;
- background-color: var(--menu-surface-bg, var(--btn-premium-secondary-bg)) !important;
+ border: .5px solid $light-menu-surface-border !important;
+ background-color: $light-menu-surface-bg !important;
+ box-shadow: $light-menu-surface-shadow;
> li > a {
- color: var(--menu-item-color, var(--btn-premium-secondary-color));
+ color: $light-item-color;
background-color: transparent;
&:hover {
- background-color: var(--menu-item-hover-bg, var(--btn-premium-secondary-bg-hover)) !important;
- color: var(--menu-item-hover-color, var(--btn-premium-secondary-color-hover)) !important;
+ background-color: $light-menu-item-hover-bg !important;
+ color: $light-item-hover-color !important;
}
}
> .divider {
- background-color: #eee;
+ background-color: $light-menu-surface-border;
}
}
.dropdown-item {
- color: var(--menu-item-color, var(--btn-premium-secondary-color));
+ color: $light-item-color;
&:hover,
&.active,
&:active {
- background-color: var(--menu-item-hover-bg, var(--btn-premium-secondary-bg-hover)) !important;
- color: var(--menu-item-hover-color, var(--btn-premium-secondary-color-hover)) !important;
+ background-color: $light-menu-item-hover-bg !important;
+ color: $light-item-hover-color !important;
}
}
.dropdown-divider {
- border-top-color: var(--menu-surface-border, var(--btn-premium-secondary-border)) !important;
+ border-top-color: $light-menu-surface-border !important;
}
.virtual-scroll-border-top {
border-top: 0.5px solid $gray-light;
@@ -342,18 +311,18 @@
}
thead {
- background-color: #F3F7FD;
+ background-color: $light-table-head-bg;
}
tbody tr {
border-bottom-color: $gray-lighter !important;
&:hover {
- background-color: mix($table-bg-hover, $white, 50%) !important;
+ background-color: $light-table-row-hover-bg !important;
}
&.selected {
- background-color: mix($selected-background, $white, 50%) !important;
+ background-color: $light-table-row-selected-bg !important;
box-shadow: inset 2px 0 0 darken($primary, 4%);
}
}
@@ -369,22 +338,22 @@
}
&:hover {
- background-color: mix($table-bg-hover, $white, 55%);
+ background-color: $light-table-striped-hover-bg;
}
}
}
.app-top-menu {
border-top-color: $gray-light;
border-bottom-color: $gray-light;
- background: linear-gradient(to right, #e1ebf8 0%, #eaf1fb 50%, #f4f8fe 100%);
+ background: linear-gradient(to right, $light-app-top-menu-gradient-start 0%, $light-app-top-menu-gradient-mid 50%, $light-app-top-menu-gradient-end 100%);
.dropdown-menu {
- --menu-surface-bg: #f4f6fa;
+ background-color: $light-menu-surface-bg !important;
}
}
.app-foot-menu {
border-top: 0.5px solid $gray-light;
- background: #eaf1f8;
+ background: $theme-light-panel-alt-bg;
color: $custom-color;
}
.app-thumbs {
@@ -426,7 +395,7 @@
}
&.selected {
- background-color: darken($table-bg-hover, 4%) !important;
+ background-color: $light-row-selected-bg !important;
}
}
.app-div-striped {
@@ -435,7 +404,7 @@
}
&.selected {
- background-color: darken($table-bg-hover, 4%) !important;
+ background-color: $light-row-selected-bg !important;
}
}
.app-div-striped-inverse {
@@ -464,7 +433,7 @@
select {
background-color: $white !important;
- color: black;
+ color: $black;
filter: none;
}
}
@@ -492,7 +461,7 @@
}
.wizard-nav-content {
- background-color: white;
+ background-color: $white;
}
}
.sidebar-item {
@@ -510,30 +479,31 @@
@mixin skin-light-miscellaneous() {
.content-wrapper {
- background-color: white;
+ background-color: $white;
color: $body-color;
}
//.content-container {
// border-left: .5px solid $sidebar-light-apps-menu-border-color;
//}
.ngx-contextmenu {
- background-color: #f4f6fa !important;
- border-color: mix($primary, $gray-light, 14%) !important;
+ background-color: $light-menu-surface-bg !important;
+ border-color: $light-menu-surface-border !important;
+ box-shadow: $light-menu-surface-shadow !important;
> button.ngx-context-menu-item {
- color: darken($gray-dark, 18%) !important;
+ color: $light-item-color !important;
background-color: transparent !important;
&:hover,
&:focus-visible,
&.active {
- background-color: lighten($selected-background, 3%) !important;
- color: darken($gray-dark, 28%) !important;
+ background-color: $light-menu-item-hover-bg !important;
+ color: $light-item-hover-color !important;
}
}
> [role='separator'] {
- border-top-color: mix($primary, $gray-light, 14%) !important;
+ border-top-color: $light-menu-surface-border !important;
}
}
.modal-body {
@@ -542,12 +512,15 @@
.modal-footer {
background-color: $gray-lightest;
}
- typeahead-container, .ui-select-choices {
+ typeahead-container,
+ .ui-select-choices {
&.dropdown-menu {
background-color: $white !important;
}
}
- .form-control, .form-select, .input-group-text {
+ .form-control,
+ .form-select,
+ .input-group-text {
&:disabled {
color: $muted;
cursor: not-allowed;
@@ -561,10 +534,10 @@
}
.nav-link {
color: $body-color;
- background-color: lighten($gray-mid, 4%);
+ background-color: $light-nav-bg;
&:hover {
- background: darken($gray-mid, 2%);
+ background: $light-nav-hover-bg;
}
&.active {
@@ -580,11 +553,11 @@
@include box-solid-variant($gray-lighter, $body-color, true);
> .box-header {
- border-bottom: .5px solid darken($gray-lighter, 5%);
+ border-bottom: .5px solid $light-box-border-strong;
}
> .box-footer {
- border-top: .5px solid darken($gray-lighter, 5%);
+ border-top: .5px solid $light-box-border-strong;
}
}
.box-footer-default {
@@ -597,10 +570,10 @@
.box-transparent {
background-color: $gray-lightest;
border-color: $gray-lighter;
- box-shadow: 0 12px 26px rgba(24, 32, 58, 0.1);
+ box-shadow: 0 12px 26px $light-box-transparent-shadow-color;
> .box-header {
- background: #eaf1f8;
+ background: $theme-light-panel-alt-bg;
border-bottom-color: $gray-lighter;
}
@@ -620,7 +593,7 @@
background-color: $gray-lightest !important;
}
.recents-grid .box-transparent > .box-header {
- background: #e2ecf8;
+ background: $light-recents-box-header-bg;
border-bottom-color: mix($primary, $white, 20%);
> fa-icon {
diff --git a/frontend/src/styles/components/_variables.scss b/frontend/src/styles/components/_variables.scss
index bda8a0fb..ae7a81ca 100644
--- a/frontend/src/styles/components/_variables.scss
+++ b/frontend/src/styles/components/_variables.scss
@@ -16,48 +16,122 @@ $control-sidebar-small-width: 250px;
$control-sidebar-menu-width: 40px;
$control-sidebar-menu-z-index: 1010;
//=== Nav Styles
-$nav-link-hover-bg: lighten($gray-dark, 5%);
-$nav-disabled-link-color: $gray-light;
-$nav-disabled-link-hover-color: $gray-light;
$nav-link-padding: 10px;
//Transition global options
$transition-speed: .3s;
$transition-fn: ease-out;
+//Shared color primitives
+$theme-muted-blue: #a6bdd5;
+$theme-light-panel-bg: #eaf1fb;
+$theme-light-panel-alt-bg: #eaf1f8;
//SIDEBAR SKINS
//--------------------------------------------------------
//Dark sidebar
$sidebar-dark-icons-menu-bg: $custom-dark-color;
$sidebar-dark-icons-menu-hover-bg: darken($sidebar-dark-icons-menu-bg, 4%);
-$sidebar-dark-icons-menu-color: #a6bdd5;
+$sidebar-dark-icons-menu-color: $theme-muted-blue;
$sidebar-dark-icons-menu-hover-color: $primary;
$sidebar-dark-icons-menu-border-color: #304047;
$sidebar-dark-apps-menu-title-bg: $sidebar-dark-icons-menu-hover-bg;
-$sidebar-dark-apps-menu-title-color: lighten($sidebar-dark-icons-menu-hover-bg, 20%);
$sidebar-dark-apps-menu-bg: lighten($sidebar-dark-icons-menu-bg, 2%);
$sidebar-dark-apps-menu-hover-bg: $sidebar-dark-icons-menu-hover-bg;
$sidebar-dark-apps-menu-color: lighten($sidebar-dark-icons-menu-bg, 60%);
$sidebar-dark-apps-menu-hover-color: #fff;
-$sidebar-dark-apps-menu-border-color: lighten($sidebar-dark-apps-menu-bg, 40%);
+$sidebar-dark-apps-menu-border-color: #8ea8b4;
$sidebar-dark-mini-menu-bg: $sidebar-dark-icons-menu-hover-bg;
-$sidebar-dark-mini-menu-color: $sidebar-dark-apps-menu-border-color;
-$sidebar-dark-mini-menu-hover-color: $sidebar-dark-apps-menu-hover-color;
//Light sidebar
$sidebar-light-icons-menu-bg: $primary;
//$sidebar-light-icons-menu-hover-bg: #2a445e;
$sidebar-light-icons-menu-hover-bg: darken($sidebar-light-icons-menu-bg, 15%);
$sidebar-light-icons-menu-color: $gray-lightest;
$sidebar-light-icons-menu-hover-color: $white;
-$sidebar-light-icons-menu-border-color: lighten($sidebar-light-icons-menu-bg, 10%);
-$sidebar-light-apps-menu-title-bg: $primary;
-$sidebar-light-apps-menu-title-color: #a6bdd5;
+$sidebar-light-apps-menu-title-bg: $sidebar-light-icons-menu-bg;
+$sidebar-light-apps-menu-title-color: $theme-muted-blue;
$sidebar-light-apps-menu-bg: mix($gray-lightest, $gray-lighter, 60%);
$sidebar-light-apps-menu-hover-bg: mix($gray-light, $gray-lighter, 55%);
$sidebar-light-apps-menu-color: $custom-dark-color;
$sidebar-light-apps-menu-hover-color: $black;
$sidebar-light-apps-menu-border-color: $gray-mid;
-$sidebar-light-mini-menu-bg: $secondary;
-$sidebar-light-mini-menu-color: $custom-dark-color;
-$sidebar-light-mini-menu-hover-color: $black;
+
+//THEME TOKENS
+//--------------------------------------------------------
+//Shared theme tokens
+$theme-btn-focus-outline-fallback: rgba(13, 110, 253, 0.25);
+$theme-btn-bg-hover-overlay-shadow: rgba(0, 0, 0, 0.2);
+$theme-dropdown-divider-bg: #eee;
+$theme-btn-close-white-filter: $btn-close-white-filter;
+$theme-btn-minimize-icon-svg: "data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' fill='%23000'%3e%3cpath d='M32,224c-17.7,0-32,14.3-32,32s14.3,32,32,32h448c17.7,0,32-14.3,32-32s-14.3-32-32-32H32z'/%3e%3c/svg%3e";
+
+//Dark theme
+$dark-tree-node-hover-bg: $sidebar-dark-apps-menu-title-bg;
+$dark-tree-node-selected-bg: darken($sidebar-dark-apps-menu-title-bg, 4%);
+$dark-surface-bg: lighten($sidebar-dark-icons-menu-bg, 5%);
+$dark-surface-border: lighten($sidebar-dark-icons-menu-border-color, 10%);
+$dark-item-color: lighten($gray-light, 8%);
+$dark-item-hover-color: lighten($gray-light, 14%);
+$dark-item-disabled-color: darken($gray-light, 12%);
+$dark-border-subtle: darken($sidebar-dark-icons-menu-border-color, 3%);
+$dark-table-row-hover-bg: darken($sidebar-dark-icons-menu-bg, 3%);
+$dark-striped-bg: lighten($sidebar-dark-apps-menu-title-bg, 4%);
+$dark-field-border: lighten($sidebar-dark-icons-menu-bg, 4%);
+$dark-btn-focus-color: rgba($primary, 0.28);
+$dark-control-sidebar-separator-color: rgba(146, 173, 204, 0.4);
+$dark-dialog-tab-card-shadow-color: rgba(0, 0, 0, 0.28);
+$dark-dialog-check-card-border-color: rgba(132, 157, 185, 0.24);
+$dark-dialog-check-card-hover-border-color: $dark-control-sidebar-separator-color;
+$dark-dialog-check-card-hover-shadow-color: rgba(0, 0, 0, 0.24);
+$dark-dialog-check-card-active-border-color: rgba(92, 141, 202, 0.62);
+$dark-box-transparent-shadow-color: rgba(0, 0, 0, 0.35);
+$dark-menu-surface-shadow: 0 12px 26px rgba(0, 0, 0, 0.35);
+$dark-text-purple-color: #cb97ff;
+$dark-text-primary-color: #6ab8f0;
+$dark-text-muted-color: #b6bcc2;
+
+//Light theme
+$light-sidebar-mini-bg: #ebeef5;
+$light-sidebar-mini-hover-bg: lighten(#d4e1f1, 2%);
+$light-sidebar-mini-active-bg: darken(#d4e1f1, 4%);
+$light-sidebar-mini-active-border: mix($primary, $gray-light, 30%);
+$light-sidebar-mini-active-icon: darken($primary, 5%);
+$light-sidebar-surface: #fcfdff;
+$light-sidebar-icons-bg: #f2f6fd;
+$light-tree-node-hover-bg: $table-bg-hover;
+$light-tree-node-selected-bg: $selected-background;
+$light-surface-bg: mix($white, $gray-lightest, 94%);
+$light-surface-border: mix($primary, $gray-light, 14%);
+$light-item-color: darken($gray-dark, 18%);
+$light-item-hover-bg: lighten($selected-background, 3%);
+$light-item-hover-color: darken($gray-dark, 28%);
+$light-item-disabled-color: lighten($gray-dark, 18%);
+$light-table-head-bg: #F3F7FD;
+$light-table-row-hover-bg: mix($table-bg-hover, $white, 50%);
+$light-table-row-selected-bg: mix($selected-background, $white, 50%);
+$light-table-striped-hover-bg: mix($table-bg-hover, $white, 55%);
+$light-row-selected-bg: darken($table-bg-hover, 4%);
+$light-menu-surface-bg: #eef4fc;
+$light-menu-surface-border: #cfdded;
+$light-menu-item-hover-bg: #bdd7f4;
+$light-menu-surface-shadow: 0 12px 24px rgba(27, 56, 94, 0.14);
+$light-nav-bg: lighten($gray-mid, 4%);
+$light-nav-hover-bg: darken($gray-mid, 2%);
+$light-box-border-strong: darken($gray-lighter, 5%);
+$light-btn-focus-color: rgba($primary, 0.24);
+$light-chat-button-color: darken($gray, 30%);
+$light-chat-button-hover-color: $black;
+$light-dialog-tab-card-bg: rgba(255, 255, 255, 0.52);
+$light-dialog-tab-card-border-color: rgba(20, 45, 72, 0.11);
+$light-dialog-tab-card-shadow-color: rgba(31, 56, 86, 0.1);
+$light-dialog-check-card-bg: rgba(236, 243, 251, 0.72);
+$light-dialog-check-card-border-color: rgba(30, 59, 89, 0.14);
+$light-dialog-check-card-hover-bg: rgba(236, 243, 251, 0.88);
+$light-dialog-check-card-hover-border-color: rgba(30, 59, 89, 0.3);
+$light-dialog-check-card-hover-shadow-color: rgba(31, 56, 86, 0.12);
+$light-dialog-check-card-active-border-color: rgba(52, 94, 146, 0.48);
+$light-app-top-menu-gradient-start: #e1ebf8;
+$light-app-top-menu-gradient-mid: $theme-light-panel-bg;
+$light-app-top-menu-gradient-end: #f4f8fe;
+$light-box-transparent-shadow-color: rgba(24, 32, 58, 0.1);
+$light-recents-box-header-bg: #e2ecf8;
//BOXES
//--------------------------------------------------------
$box-border-color: #f4f4f4;
diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss
index ab835989..edb63646 100644
--- a/frontend/src/styles/variables.scss
+++ b/frontend/src/styles/variables.scss
@@ -12,25 +12,18 @@ $gray-mid: #b3c2d9;
$gray-light: #cfd9e7;
$gray-lighter: #dde5f0;
$gray-lightest: #edf2f8;
-$light-blue: #2e92ce;
$lighter-blue: #94c7e8;
$red: #dc3545;
$green: #06854b;
-$dark-green: #008000;
$light-green: #37cb46;
$aqua: #0dcaf0;
$blue: #0576b9;
-$dark-mid-blue: #337abd;
$dark-blue: #195d9e;
$navy: #0b2640;
$cyan: #17a2b8;
$teal: #39CCCC;
-$dark-teal: #527a7a;
-$olive: #3D9970;
-$lime: #01FF70;
$orange: #ff6f00;
$yellow: #ffc107;
-$fuchsia: #F012BE;
$purple: #9b59b6;
$maroon: #b33c00;
$black: #111;
@@ -93,7 +86,7 @@ $input-box-shadow: none !important;
$input-focus-box-shadow: none !important;
$form-group-margin-bottom: 0.6rem;
$form-check-margin-bottom: 0;
-$form-label-margin-bottom: .2rem;
+$form-label-margin-bottom: 0.25rem;
// Table-hover
$table-bg-hover: lighten($lighter-blue, 14%);
$table-bg: transparent !important;