Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
refactor(styles): simplify button/menu structure and keep theme colors centralized. Add Inter font and refresh button/menu styling
johaven457240f527dd
diff --git a/frontend/package.json b/frontend/package.jsonindex a0efd8a0..c74acd1e 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -33,6 +33,7 @@"@angular/platform-browser-dynamic": "^20.1.7","@angular/router": "^20.1.7","@codemirror/language-data": "^6.5.2",+ "@fontsource/inter": "^5.2.8","@fortawesome/angular-fontawesome": "^3.0.0","@fortawesome/fontawesome-svg-core": "^7.0.0","@fortawesome/free-brands-svg-icons": "^7.0.0",diff --git a/frontend/src/app/applications/users/components/sidebar/user-profile.component.html b/frontend/src/app/applications/users/components/sidebar/user-profile.component.htmlindex 75a69f0f..ff27d004 100755--- a/frontend/src/app/applications/users/components/sidebar/user-profile.component.html+++ b/frontend/src/app/applications/users/components/sidebar/user-profile.component.html@@ -3,20 +3,20 @@<div class="sidebar-component-title"><div class="d-flex flex-fill justify-content-between">@if (!user?.isLink) {- <button class="btn btn-xs btn-secondary" (click)="collapseRSideBar()" type="button" [routerLink]=USER_PATH.BASE>+ <button class="btn btn-sm btn-secondary" (click)="collapseRSideBar()" type="button" [routerLink]=USER_PATH.BASE><fa-icon [icon]="icons.faUserAlt"></fa-icon></button>}- <button class="btn btn-xs btn-secondary" (click)="toggleTheme()" type="button">+ <button class="btn btn-sm btn-secondary" (click)="toggleTheme()" type="button"><fa-icon [icon]="icons.faCircleHalfStroke"></fa-icon></button>@if (user?.isAdmin) {- <button class="btn btn-xs btn-secondary" (click)="collapseRSideBar()" type="button" routerLink="/admin">+ <button class="btn btn-sm btn-secondary" (click)="collapseRSideBar()" type="button" routerLink="/admin"><fa-icon [icon]="icons.faCog"></fa-icon></button>}@if (!store.isElectronApp() || store.isElectronApp() && store.userImpersonate()) {- <button (click)="logOut()" class="btn btn-xs btn-secondary" type="button">+ <button (click)="logOut()" class="btn btn-sm btn-secondary" type="button"><fa-icon [icon]="store.userImpersonate() ? icons.faUserSecret : icons.faPowerOff"></fa-icon></button>}diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scssindex a1ef35a7..ddc0fd74 100755--- a/frontend/src/styles/components/_app.scss+++ b/frontend/src/styles/components/_app.scss@@ -259,19 +259,23 @@border-bottom: .5px solid;height: $sidebar-apps-icons-height;+ .btn.me-1, .btn-group.me-1 {+ // handles space between button+ margin-right: .4rem !important;+ }+.btn {- height: 30px;min-width: 36px;> fa-icon {- font-size: $font-size-md;+ font-size: .875rem;}span {font-size: $font-size-xs;fa-icon {- font-size: $font-size-md;+ font-size: .875rem;margin-right: 0.2rem;}}diff --git a/frontend/src/styles/components/_buttons.scss b/frontend/src/styles/components/_buttons.scssindex f5f89238..93e1dfa9 100644--- a/frontend/src/styles/components/_buttons.scss+++ b/frontend/src/styles/components/_buttons.scss@@ -1,39 +1,20 @@.btn {+ transition: background-color .2s ease, border-color .2s ease, color .2s ease;box-shadow: none !important;}-.btn-secondary {- &:hover {- background-color: darken($secondary, 10%);- border-color: darken($secondary, 10%);- }+.btn-link {+ box-shadow: none !important;}.btn-custom {@extend .btn-secondary;- background-color: $secondary;margin-right: 0.2rem;-- &.active {- background-color: $primary !important;- border-color: $primary !important;- color: white !important;-- &:hover {- color: white !important;- }- }+ transition: background-color .2s ease, border-color .2s ease, color .2s ease;}.btn-default {@extend .btn;- @include button-variant($gray-lightest, #f4f4f4, #000);- border-color: $gray-lightest;-- &:hover {- background-color: darken($gray-lightest, 5%);- border-color: darken($gray-lightest, 5%);- }}.btn-xs {@@ -48,22 +29,10 @@@extend .btn-xs;}-.btn-outline-blue {- @include button-outline-variant($primary);-}--.btn-outline-secondary-alt {@extend .btn-outline-secondary;-}-//General .btn with bg class-.btn[class*='bg-']:hover {- @include box-shadow(inset 0 0 100px rgba(0, 0, 0, 0.2));-}--.btn-file-upload {position: relative;overflow: hidden;@@ -76,14 +45,12 @@margin: 0;padding: 0;opacity: 0;- filter: alpha(opacity=0);}}.btn-minimize {@extend .btn-close;- 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;}.btn-minimize-white {diff --git a/frontend/src/styles/components/_contextmenu.scss b/frontend/src/styles/components/_contextmenu.scssindex 0f2e8df5..5c78bf1f 100644--- a/frontend/src/styles/components/_contextmenu.scss+++ b/frontend/src/styles/components/_contextmenu.scss@@ -1,6 +1,5 @@:root {--ngx-contextmenu-font-family: var(--bs-body-font-family) !important;- --ngx-contextmenu-border: .5px solid rgba(0, 0, 0, 0.18) !important;--ngx-contextmenu-item-separator-width: 100% !important;--ngx-contextmenu-outline: none !important;}@@ -10,12 +9,16 @@}.ngx-contextmenu {- padding: $dropdown-padding-y 0 !important;;+ padding: .25rem !important;font-size: $font-size-xs !important;+ border-width: .5px !important;+ border-style: solid !important;+ @include app-menu-surface-structure($btn-border-radius, .25rem, true);> button.ngx-context-menu-item {padding: $dropdown-item-padding-y $dropdown-item-padding-x !important;align-items: center !important;+ @include app-menu-item-structure($btn-border-radius, 0, true);> span {display: flex;@@ -29,6 +32,6 @@}> [role='separator'] {border-bottom: none !important;- @extend .dropdown-divider;+ @include app-menu-divider-structure(.2rem 0, .5px, true);}-}\ No newline at end of file+}diff --git a/frontend/src/styles/components/_dropdowns.scss b/frontend/src/styles/components/_dropdowns.scssindex 39ccd6c2..67eb5519 100644--- a/frontend/src/styles/components/_dropdowns.scss+++ b/frontend/src/styles/components/_dropdowns.scss@@ -1,28 +1,16 @@.dropdown-menu {min-width: 0 !important;font-size: $font-size-xs;- border-color: darken($secondary-light, 10%);- border-width: .5px;- line-height: normal;- box-shadow: none;+ @include app-menu-surface-structure(.72rem, .25rem);> li > a {- color: $body-color;-- &:hover {- background-color: lighten($gray-light, 5%);- color: $body-color;- }+ @include app-menu-item-structure(.55rem, 1px);> .fas, .far {margin-right: 10px;}}- > .divider {- background-color: #eee;- }-.dropdown-header {font-size: $font-size-xs;}@@ -30,14 +18,15 @@.dropdown-item {cursor: pointer;+ @include app-menu-item-structure(.55rem, 1px);+> span {display: flex;}}.dropdown-divider {- border-top: .5px solid !important;- margin: .1rem 0 !important;+ @include app-menu-divider-structure(.2rem 0, .5px);}.dropdown-toggle {diff --git a/frontend/src/styles/components/_mixins.scss b/frontend/src/styles/components/_mixins.scssindex d556d58b..fb5fb890 100644--- a/frontend/src/styles/components/_mixins.scss+++ b/frontend/src/styles/components/_mixins.scss@@ -15,3 +15,39 @@}}}++@mixin app-menu-surface-structure($radius: .72rem, $padding: .25rem, $important: false) {+ @if $important {+ border-radius: $radius !important;+ line-height: normal !important;+ box-shadow: none !important;+ padding: $padding !important;+ } @else {+ border-radius: $radius;+ line-height: normal;+ box-shadow: none;+ padding: $padding;+ }+}++@mixin app-menu-item-structure($radius: .55rem, $margin-y: 1px, $important: false) {+ @if $important {+ border-radius: $radius !important;+ margin: $margin-y 0 !important;+ } @else {+ border-radius: $radius;+ margin: $margin-y 0;+ }+}++@mixin app-menu-divider-structure($margin: .2rem 0, $width: .5px, $important: false) {+ @if $important {+ border-top-width: $width !important;+ border-top-style: solid !important;+ margin: $margin !important;+ } @else {+ border-top-width: $width;+ border-top-style: solid;+ margin: $margin;+ }+}diff --git a/frontend/src/styles/components/_modal.scss b/frontend/src/styles/components/_modal.scssindex a8d96731..34f8d8bc 100644--- a/frontend/src/styles/components/_modal.scss+++ b/frontend/src/styles/components/_modal.scss@@ -7,6 +7,7 @@}.modal-header {+ max-height: 41.5px;line-height: 1;@extend .no-select;diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scssindex 619d00fc..64d10a49 100755--- a/frontend/src/styles/components/_theme_dark.scss+++ b/frontend/src/styles/components/_theme_dark.scss@@ -1,5 +1,4 @@//Dark Sidebar Mixin-@mixin skin-dark-left-sidebar() {// Sidebar background color (Both .wrapper is responsible for sidebar bg color).wrapper, .left-sidebar {@@ -67,7 +66,6 @@//&.submenu {// background-color: darken($sidebar-dark-apps-menu-bg, 3%);//}-&:hover, &.active {background: $sidebar-dark-apps-menu-hover-bg;@@ -114,7 +112,6 @@opacity: 1;}}-.control-sidebar-menu {.sidebar-apps-icons {background-color: $sidebar-dark-icons-menu-bg;@@ -139,15 +136,12 @@.chat-border-bottom {border-bottom-color: $sidebar-dark-apps-menu-bg;}-.chat-input {background-color: $sidebar-dark-icons-menu-bg;}-.chat-container {background-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);}-.chat-button-bottom {color: $gray-light;@@ -155,7 +149,6 @@color: lighten($gray-light, 30%);}}-.chat-list-sidebar {color: $sidebar-dark-apps-menu-border-color;@@ -207,7 +200,104 @@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-offset: 1px;+ box-shadow: none !important;+ }+ }+ .btn-secondary,+ .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;++ &: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;+ }++ &: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;+ }+ }+ .btn-custom {+ fa-icon,+ span {+ color: inherit !important;+ }+ &:is(.active, :active, [aria-pressed='true']):not(:disabled) {+ background-color: $primary !important;+ border-color: $primary !important;+ color: $white !important;+ }+ }+ .btn-check:is(:checked, :active) + .btn-custom:not(:disabled) {+ background-color: $primary !important;+ border-color: $primary !important;+ color: $white !important;+ }+ .btn-outline-blue {+ @include button-outline-variant($primary);+ }+ .btn[class*='bg-']:hover {+ @include box-shadow(inset 0 0 100px rgba(0, 0, 0, 0.2));+ }+ .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;+ }+ .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;++ > li > a {+ color: var(--menu-item-color, var(--btn-premium-secondary-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;+ }+ }++ > .divider {+ background-color: #eee;+ }+ }+ .dropdown-item {+ color: var(--menu-item-color, var(--btn-premium-secondary-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;+ }+ }+ .dropdown-divider {+ border-top-color: var(--menu-surface-border, var(--btn-premium-secondary-border)) !important;+ }.app-table {color: $gray-light;// Bootstrap 5 fix@@ -242,7 +332,6 @@color: darken($gray-light, 5%);}}-.app-table-striped {> tbody > tr {&:nth-of-type(odd) {@@ -254,31 +343,19 @@}}}-.app-top-menu {border-top-color: $sidebar-dark-icons-menu-border-color;border-bottom-color: $sidebar-dark-icons-menu-border-color;- background-color: $sidebar-dark-apps-menu-title-bg;+ background: linear-gradient(170deg, lighten($sidebar-dark-apps-menu-title-bg, 7%) 0%, darken($sidebar-dark-icons-menu-bg, 1%) 100%);.dropdown-menu {- background-color: $sidebar-dark-icons-menu-border-color;- border-color: darken($sidebar-dark-icons-menu-border-color, 5%);-- .dropdown-item {- color: $gray-mid;-- &:hover, &.active {- background-color: $sidebar-dark-icons-menu-hover-bg;- }- }+ --menu-item-color: #{$gray-light};}}-.app-foot-menu {background-color: $sidebar-dark-icons-menu-bg;color: darken($gray-light, 5%);}-.app-div-hovered {&:hover {background-color: darken($sidebar-dark-apps-menu-bg, 4%) !important;@@ -288,7 +365,6 @@background-color: $sidebar-dark-apps-menu-title-bg !important;}}-.app-div-striped {&.selected {background-color: $sidebar-dark-apps-menu-title-bg !important;@@ -298,13 +374,11 @@background-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);}}-.app-div-striped-inverse {&:nth-of-type(odd) {background-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);}}-.app-thumbs {background-color: inherit !important;@@ -329,7 +403,6 @@}}}-.app-sync-clients {.left-panel {border-right-color: darken($sidebar-dark-icons-menu-border-color, 4%) !important;@@ -340,12 +413,10 @@border-bottom-color: darken($sidebar-dark-icons-menu-border-color, 4%) !important;}}-.list-group-item {background-color: lighten($sidebar-dark-apps-menu-title-bg, 8%);color: $white;}-.profile-page {select {background-color: transparent;@@ -353,7 +424,6 @@filter: brightness(0) invert(1);}}-.task-list {border-bottom-color: $sidebar-dark-icons-menu-border-color;@@ -361,11 +431,9 @@background-color: $sidebar-dark-apps-menu-title-bg;}}-.app-small-card {background-color: lighten($sidebar-dark-apps-menu-title-bg, 2%);}-.wizard {tbody tr {&:hover {@@ -381,7 +449,6 @@background-color: $sidebar-dark-icons-menu-bg;}}-.sidebar-item {.sidebar-item-container {&:hover {@@ -400,36 +467,34 @@background-color: lighten($sidebar-dark-apps-menu-bg, 4%);color: $gray-light;}-//.content-container {// border-left: .5px solid $sidebar-dark-icons-menu-border-color;//}-.ngx-contextmenu {- background-color: $sidebar-dark-icons-menu-border-color !important;- border-color: darken($sidebar-dark-icons-menu-border-color, 5%) !important;+ background-color: lighten($sidebar-dark-icons-menu-bg, 5%);+ border-color: lighten($sidebar-dark-icons-menu-border-color, 10%);- .ngx-context-menu-item {- color: $gray-mid !important;+ > button.ngx-context-menu-item {+ color: $gray-light !important;+ background-color: transparent !important;- &:hover, &.active {+ &:hover,+ &:focus-visible,+ &.active {background-color: $sidebar-dark-icons-menu-hover-bg !important;}}- }- .dropdown-divider {- border-top-color: #515f67 !important;+ > [role='separator'] {+ border-top-color: lighten($sidebar-dark-icons-menu-border-color, 10%) !important;+ }}-.modal-content {background: transparent !important;}-.modal-header {border-bottom-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);}-.modal-body {color: $gray-light;background-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);@@ -438,13 +503,11 @@background: transparent;}}-.modal-footer {color: $gray-light;background-color: $sidebar-dark-apps-menu-title-bg;border-top-color: $sidebar-dark-apps-menu-title-bg;}-.modal-auth-verify-2fa, .modal-viewer-select {.card {color: $gray-light;@@ -452,7 +515,6 @@border-color: $sidebar-dark-icons-menu-border-color;}}-typeahead-container, .ui-select-choices {&.dropdown-menu {background-color: $sidebar-dark-icons-menu-border-color;@@ -475,13 +537,6 @@}}}-- .btn-custom {- &:hover:not(.active) {- color: $body-color !important;- }- }-.nav-link {color: $gray-light;background: lighten($sidebar-dark-icons-menu-bg, 4%);@@ -500,11 +555,9 @@color: $muted;}}-.form-control-plaintext {color: $white;}-.form-control, .form-select, .input-group-text {background-color: $sidebar-dark-apps-menu-title-bg;color: $white;@@ -518,19 +571,15 @@color: $muted;background-color: lighten($sidebar-dark-apps-menu-title-bg, 4%);}-}-.small-box {color: $gray-light;border-color: lighten($sidebar-dark-icons-menu-bg, 4%);background-color: $sidebar-dark-icons-menu-bg;}-.box:not(.box-background-transparent) {background-color: $sidebar-dark-icons-menu-bg;}-.box-default {@include box-solid-variant($sidebar-dark-apps-menu-title-bg, $gray-light, true);@@ -542,7 +591,6 @@border-top: .5px solid $sidebar-dark-apps-menu-title-bg;}}-.box-footer-default {background-color: $sidebar-dark-apps-menu-title-bg;@@ -550,7 +598,6 @@background-color: darken($sidebar-dark-apps-menu-title-bg, 5%);}}-.box-transparent {background-color: darken($sidebar-dark-icons-menu-bg, 2%);border-color: $sidebar-dark-icons-menu-border-color;@@ -558,9 +605,9 @@> .box-header {background: linear-gradient(- 180deg,- darken($sidebar-dark-icons-menu-bg, 2%) 0%,- darken($sidebar-dark-icons-menu-bg, 6%) 100%+ 180deg,+ darken($sidebar-dark-icons-menu-bg, 2%) 0%,+ darken($sidebar-dark-icons-menu-bg, 6%) 100%);border-bottom-color: $sidebar-dark-icons-menu-border-color;}@@ -570,71 +617,56 @@border: 1px solid $sidebar-dark-icons-menu-border-color;}}-.products-list > li:hover {background-color: lighten($sidebar-dark-apps-menu-title-bg, 8%);}-.product-list-in-box {border-bottom-color: $sidebar-dark-icons-menu-border-color;}-.recents-grid::before {background: linear-gradient(- 180deg,- rgba($sidebar-dark-icons-menu-bg, 0.7) 0%,- rgba($sidebar-dark-icons-menu-bg, 0.45) 100%+ 180deg,+ rgba($sidebar-dark-icons-menu-bg, 0.7) 0%,+ rgba($sidebar-dark-icons-menu-bg, 0.45) 100%);}-.ui-disabled {background-color: $sidebar-dark-icons-menu-bg !important;color: $body-color;}-.ui-select-toggle {::after {color: $gray-light;}}-.text-purple {color: #b366ff !important;}-.text-primary {color: #2283dd !important;}-.bg-theme {background-color: darken($sidebar-dark-icons-menu-bg, 4%);}-.bg-theme-alt {background-color: $sidebar-dark-apps-menu-title-bg !important;}-.btn-close {filter: var(--bs-btn-close-white-filter)}-.btn-outline-secondary-alt {border-color: lighten($sidebar-dark-icons-menu-bg, 4%)}-.text-muted {color: #8a8f94 !important;}-.text-bg-light {color: $gray-light !important;background-color: lighten($sidebar-dark-apps-menu-title-bg, 8%) !important;}-.avatar-img {background-color: darken($gray-light, 5%);}-// Code Mirror.cm-panel.cm-search {button[aria-label="close"] {diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scssindex dbfe565e..dd9abc2f 100755--- a/frontend/src/styles/components/_theme_light.scss+++ b/frontend/src/styles/components/_theme_light.scss@@ -4,7 +4,6 @@.wrapper, .left-sidebar {background-color: $sidebar-light-apps-menu-bg;}-.left-sidebar {// Side bar Menu apps.sidebar-apps-icons {@@ -75,7 +74,6 @@//&.submenu {// background-color: darken($sidebar-light-apps-menu-bg, 3%);//}-&:hover, &.active {background: $sidebar-light-apps-menu-hover-bg;@@ -118,7 +116,6 @@opacity: 1;}}-.control-sidebar-menu {.sidebar-apps-icons {background-color: $sidebar-light-icons-menu-color;@@ -146,15 +143,12 @@.chat-border-bottom {border-bottom-color: $sidebar-light-apps-menu-border-color;}-.chat-input {background-color: $sidebar-light-apps-menu-hover-bg;}-.chat-container {background-color: $gray-lighter;}-.chat-button-bottom {color: darken(gray, 30%);@@ -162,7 +156,6 @@color: black;}}-.chat-list-sidebar {color: $sidebar-light-apps-menu-color;@@ -210,6 +203,104 @@}@mixin skin-light-app() {+ .btn {+ --btn-premium-focus: #{rgba($primary, 0.24)};++ &:focus-visible {+ outline: 2px solid var(--btn-premium-focus, rgba(13, 110, 253, 0.25));+ outline-offset: 1px;+ box-shadow: none !important;+ }+ }+ .btn-secondary,+ .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;++ &: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;+ }++ &: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;+ }+ }+ .btn-custom {+ fa-icon,+ span {+ color: inherit !important;+ }++ &:is(.active, :active, [aria-pressed='true']):not(:disabled) {+ background-color: $primary !important;+ border-color: $primary !important;+ color: $white !important;+ }+ }+ .btn-check:is(:checked, :active) + .btn-custom:not(:disabled) {+ background-color: $primary !important;+ border-color: $primary !important;+ color: $white !important;+ }+ .btn-outline-blue {+ @include button-outline-variant($primary);+ }+ .btn[class*='bg-']:hover {+ @include box-shadow(inset 0 0 100px rgba(0, 0, 0, 0.2));+ }+ .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;+ }+ .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;++ > li > a {+ color: var(--menu-item-color, var(--btn-premium-secondary-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;+ }+ }++ > .divider {+ background-color: #eee;+ }+ }+ .dropdown-item {+ color: var(--menu-item-color, var(--btn-premium-secondary-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;+ }+ }+ .dropdown-divider {+ border-top-color: var(--menu-surface-border, var(--btn-premium-secondary-border)) !important;+ }.app-table {color: $body-color;// Bootstrap 5 fix@@ -218,7 +309,7 @@}thead {- background-color: $gray-lightest;+ background: linear-gradient(170deg, mix($white, $primary, 88%) 0%, mix($white, $gray-lightest, 92%) 100%);;tr {th {@@ -244,7 +335,6 @@color: lighten($gray-dark, 5%);}}-.app-table-striped {> tbody > tr {&:nth-of-type(odd) {@@ -256,31 +346,19 @@}}}-.app-top-menu {border-top-color: $gray-light;border-bottom-color: $gray-light;- background-color: $gray-lightest;+ background: linear-gradient(170deg, mix($white, $primary, 88%) 0%, mix($white, $gray-lightest, 92%) 100%);.dropdown-menu {- background-color: $gray-light;- border-color: darken($gray-light, 10%);-- .dropdown-item {- color: $black !important;-- &:hover, &.active {- background-color: darken($gray-mid, 5%) !important;- }- }+ --menu-surface-bg: #EBF0F5;}}-.app-foot-menu {- background-color: $gray-light;+ background: #eaf1f8;color: $dropdown-link-color;}-.app-thumbs {background-color: $gray-lighter;@@ -304,7 +382,6 @@}}}-.app-sync-clients {.left-panel {border-right-color: $gray-light !important;@@ -315,7 +392,6 @@border-bottom-color: $gray-light !important;}}-.app-div-hovered {&:hover {background-color: $table-bg-hover !important;@@ -325,7 +401,6 @@background-color: darken($table-bg-hover, 4%) !important;}}-.app-div-striped {&:nth-of-type(even) {background-color: lighten($gray-lighter, 2%);@@ -335,30 +410,25 @@background-color: darken($table-bg-hover, 4%) !important;}}-.app-div-striped-inverse {&:nth-of-type(odd) {background-color: darken($body-bg, 4%);}}-.list-group-item {background-color: lighten($gray-light, 10%);color: $custom-color;}-.profile-page {.box {background-color: $gray-lighter;}}-.user-groups-page {.app-table > tbody {background-color: $white;}}-.user-details {color: $black;@@ -368,7 +438,6 @@filter: none;}}-.task-list {border-bottom-color: $gray-mid;@@ -376,11 +445,9 @@background-color: $table-bg-hover;}}-.app-small-card {background-color: $gray-light;}-.wizard {background-color: lighten($primary, 50%);@@ -398,7 +465,6 @@background-color: $gray-lightest;}}-.sidebar-item {.sidebar-item-container {&:hover {@@ -417,47 +483,44 @@background-color: white;color: $body-color;}-//.content-container {// border-left: .5px solid $sidebar-light-apps-menu-border-color;//}-.ngx-contextmenu {- background-color: $gray-light !important;- border-color: darken($gray-light, 10%) !important;+ background-color: #EBF0F5 !important;+ border-color: mix($primary, $gray-light, 14%) !important;- .ngx-context-menu-item {- color: $black !important;+ > button.ngx-context-menu-item {+ color: darken($gray-dark, 18%) !important;+ background-color: transparent !important;- &:hover, &.active {- background-color: darken($gray-mid, 5%) !important;+ &:hover,+ &:focus-visible,+ &.active {+ background-color: lighten($selected-background, 3%) !important;+ color: darken($gray-dark, 28%) !important;}}- }- .dropdown-divider {- border-top-color: darken($secondary-light, 15%) !important;+ > [role='separator'] {+ border-top-color: mix($primary, $gray-light, 14%) !important;+ }}-.modal-body {background-color: $body-bg;}-.modal-footer {background-color: $gray-lightest;}-typeahead-container, .ui-select-choices {&.dropdown-menu {background-color: $white !important;}}-.small-box {//background: $gray-lightest;border-color: $gray-lighter;}-.nav-link {color: $body-color;background-color: lighten($gray-mid, 4%);@@ -475,7 +538,6 @@color: $muted;}}-.box-default {@include box-solid-variant($gray-lighter, $body-color, true);@@ -487,7 +549,6 @@border-top: .5px solid darken($gray-lighter, 5%);}}-.box-footer-default {background-color: $gray-lighter;@@ -495,14 +556,13 @@background-color: darken($gray-lighter, 5%);}}-.box-transparent {background-color: $gray-lightest;border-color: $gray-lighter;box-shadow: 0 12px 26px rgba(24, 32, 58, 0.1);> .box-header {- background: linear-gradient(180deg, $white 0%, $gray-lightest 100%);+ background: #eaf1f8;border-bottom-color: $gray-lighter;}@@ -515,28 +575,24 @@border: 0.5px solid darken($gray-lighter, 4%);}}-.bg-theme {background-color: $gray-light;}-.bg-theme-alt {background-color: $gray-lightest !important;}-.recents-grid::before {background: linear-gradient(- 180deg,- rgba($gray-light, 0.9) 0%,- rgba($gray-lightest, 0.7) 100%+ 180deg,+ rgba($gray-light, 0.9) 0%,+ rgba($gray-lightest, 0.7) 100%);}-.recents-grid .box-transparent > .box-header {background: linear-gradient(- 180deg,- mix($primary, $white, 12%) 0%,- mix($primary, $white, 6%) 100%+ 180deg,+ mix($primary, $white, 12%) 0%,+ mix($primary, $white, 6%) 100%);border-bottom-color: mix($primary, $white, 20%);@@ -557,19 +613,15 @@color: darken($primary, 24%);}}-.products-list > li:hover {background-color: lighten($table-bg-hover, 2%);}-.product-list-in-box {border-bottom-color: $gray-lighter;}-.avatar-img {background-color: darken($gray-light, 5%);}-.code-editor {background-color: $white !important;}diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scssindex 09693c41..77833c7a 100644--- a/frontend/src/styles/index.scss+++ b/frontend/src/styles/index.scss@@ -1,4 +1,11 @@/* You can add global styles to this file, and also import other style files */+@import '@fontsource/inter/400.css';+@import '@fontsource/inter/500.css';+@import '@fontsource/inter/600.css';+@import '@fontsource/inter/700.css';++$font-family-sans-serif: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;+// Overload bootstrap variables@import 'variables';// Load Bootstrap 5diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scssindex ee90930d..4c7cba21 100644--- a/frontend/src/styles/variables.scss+++ b/frontend/src/styles/variables.scss@@ -63,15 +63,16 @@ $btn-close-width: .75em !default;$btn-close-padding-x: .5em !default;// Font, line-height, and color for body text, headings, and more.-$font-size-base: 0.9rem; // Assumes the browser default, typically `16px`-$font-size-xl: 1.1rem;-$font-size-lg: 1rem;-$font-size-md: .90rem;-$font-size-sm: .80rem;-$font-size-xs: .75rem;-$font-size-xxs: .70rem;-$font-size-xxxs: .65rem;-$font-size-xxxxs: .60rem;+// Base font size (slightly more compact than 1rem while preserving readability)+$font-size-base: 0.9375rem; // 15px+$font-size-xl: 1.17rem; // 18.7px+$font-size-lg: 1.055rem; // 16.9px+$font-size-md: $font-size-base; // 15px+$font-size-sm: 0.82rem; // 13.1px+$font-size-xs: 0.7625rem; // 12.2px+$font-size-xxs: 0.7rem; // 11.2px+$font-size-xxxs: 0.645rem; // 10.3px+$font-size-xxxxs: 0.5875rem; // 9.4px//LAYOUT//--------------------------------------------------------@@ -92,10 +93,10 @@ $input-focus-box-shadow: none !important;$form-group-margin-bottom: 0.6rem;$form-check-margin-bottom: 0rem;// Table-hover-$table-bg-hover: lighten($lighter-blue, 12%);+$table-bg-hover: lighten($lighter-blue, 14%);$table-bg: transparent !important;$table-color: inherit !important;-$selected-background: darken($lighter-blue, 6%);+$selected-background: $lighter-blue;// Dropdowns$dropdown-link-color: #444;$dropdown-link-active-color: $dropdown-link-color;@@ -129,6 +130,8 @@ $btn-padding-y-xs: .2rem !default;$btn-padding-x-xxs: .2rem !default;$btn-padding-y-xxs: .1rem !default;$btn-disabled-opacity: 0.4;+$btn-border-radius: .5rem;+$btn-border-radius-sm: .5rem;// Badges$badge-font-weight: 500 !default;// Paginationdiff --git a/package.json b/package.jsonindex f4d1ba88..18cb39cd 100755--- a/package.json+++ b/package.json@@ -84,6 +84,7 @@"reset": "rm -Rf frontend/node_modules frontend/.angular backend/node_modules node_modules .angular; npm cache clean --force","docker:build": "docker build -t $npm_package_name .","docker:buildx": "docker buildx build --platform linux/arm64,linux/amd64 --tag syncin/server:latest --tag syncin/server:${npm_package_version} --tag syncin/server:$(echo ${npm_package_version} | cut -d. -f1) . --push",+ "docker:buildx:dev": "docker buildx build --platform linux/arm64,linux/amd64 --tag syncin/server:dev . --push","docker:start": "docker run --name sync-in -it --rm -e SKIP_INIT=true -p 8080:8080 -v ./environment/environment.yaml:/app/environment/environment.yaml $npm_package_name"},"devDependencies": {