Skip to content

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

chore(frontend): refine modified-time badge styling

johavena1503294fc86
diff --git a/frontend/src/app/applications/links/components/links.component.html b/frontend/src/app/applications/links/components/links.component.html
index 3311a431..ac3986c7 100644
--- a/frontend/src/app/applications/links/components/links.component.html
+++ b/frontend/src/app/applications/links/components/links.component.html
@@ -125,7 +125,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly !== undefined ? 'props-newly-' + s[th.value.newly] : ''}}">
+ class="{{th.value.class}} {{th.value.newly !== undefined ? 'prop-newly-' + s[th.value.newly] : ''}}">
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center">
@@ -218,4 +218,4 @@
<span l10nTranslate><fa-icon [icon]="icons.faCircleInfo"></fa-icon>Info</span>
</ng-template>
</context-menu>
-<!--End Context Menu-->
\ No newline at end of file
+<!--End Context Menu-->
diff --git a/frontend/src/app/applications/sync/components/sync-paths.component.html b/frontend/src/app/applications/sync/components/sync-paths.component.html
index b33e2045..4685a8fe 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.html
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.html
@@ -220,13 +220,11 @@
{{ s.settings.filters.length }}
}
@case ('lastSync') {
- <div class="sync-newly-{{s.newly}}">
- @if (s.newly) {
- {{ s.settings.lastSync | amTimeAgo:true }}
- } @else {
- {{ 'never' | translate:locale.language }}
- }
- </div>
+ @if (s.newly) {
+ {{ s.settings.lastSync | amTimeAgo:true }}
+ } @else {
+ {{ 'never' | translate:locale.language }}
+ }
}
}
</td>
@@ -267,7 +265,8 @@
<context-menu #SyncSchedulerContextMenu>
@if (store.clientScheduler() !== CLIENT_SCHEDULER_STATE.DISABLED) {
<ng-template (execute)="setScheduler(CLIENT_SCHEDULER_STATE.DISABLED)" contextMenuItem>
- <span><fa-icon [icon]="icons.faCalendarXmark"></fa-icon>{{'disabled' | translate:locale.language | capitalize}}</span>
+ <span><fa-icon [icon]="icons.faCalendarXmark"></fa-icon>
+ {{ 'disabled' | translate:locale.language | capitalize }}</span>
</ng-template>
}
<ng-template (execute)="setScheduler(CLIENT_SCHEDULER_STATE.SEQ)" contextMenuItem><span l10nTranslate><fa-icon [icon]="icons.faArrowsSpin"></fa-icon>Sequentially</span>
diff --git a/frontend/src/app/applications/sync/components/sync-paths.component.ts b/frontend/src/app/applications/sync/components/sync-paths.component.ts
index d0479294..b4daa799 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.ts
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.ts
@@ -158,7 +158,7 @@ export class SyncPathsComponent implements OnInit, OnDestroy {
},
lastSync: {
label: 'Synced',
- width: 10,
+ width: 12,
textCenter: true,
class: '',
newly: 'newly',
diff --git a/frontend/src/app/applications/sync/components/sync-transfers.component.ts b/frontend/src/app/applications/sync/components/sync-transfers.component.ts
index f2bb7f2c..21cead38 100644
--- a/frontend/src/app/applications/sync/components/sync-transfers.component.ts
+++ b/frontend/src/app/applications/sync/components/sync-transfers.component.ts
@@ -77,7 +77,7 @@ export class SyncTransfersComponent {
},
date: {
label: 'Date',
- width: 15,
+ width: 20,
textCenter: true,
class: '',
newly: 'newly',
diff --git a/frontend/src/app/applications/users/components/user-account.component.html b/frontend/src/app/applications/users/components/user-account.component.html
index 1db81a89..3c29364f 100755
--- a/frontend/src/app/applications/users/components/user-account.component.html
+++ b/frontend/src/app/applications/users/components/user-account.component.html
@@ -162,8 +162,8 @@
<div class="d-flex flex-column gap-2">
@if (user.isUser) {
<div class="row g-2 align-items-center">
- <label for="" class="form-label col-12 col-md-5 mb-0" l10nTranslate>Avatar</label>
- <div class="col-12 col-md-7">
+ <label for="" class="form-label col-12 col-md-6 mb-0" l10nTranslate>Avatar</label>
+ <div class="col-12 col-md-6">
<div class="d-flex flex-wrap gap-2">
<button (click)="genAvatar()" class="btn btn-xs btn-success" type="button" l10nTranslate>Generate</button>
<button class="btn-file-upload btn btn-xs btn-secondary" type="button">
@@ -176,8 +176,8 @@
}
<div class="row g-2 align-items-center">
- <label class="form-label col-12 col-md-5 mb-0" for="userLanguage" l10nTranslate>Language</label>
- <div class="col-12 col-md-7">
+ <label class="form-label col-12 col-md-6 mb-0" for="userLanguage" l10nTranslate>Language</label>
+ <div class="col-12 col-md-6">
<select id="userLanguage" [(ngModel)]="language" class="form-select form-select-sm">
@for (l of languages; track $index) {
<option [ngValue]="l">{{ i18nLanguageText[l] }}</option>
@@ -187,8 +187,8 @@
</div>
<div class="row g-2 align-items-center">
- <label class="form-label col-12 col-md-5 mb-0" for="userNotification" l10nTranslate>Notification</label>
- <div class="col-12 col-md-7">
+ <label class="form-label col-12 col-md-6 mb-0" for="userNotification" l10nTranslate>Notification</label>
+ <div class="col-12 col-md-6">
<select id="userNotification"
[ngModel]="user.notification"
(ngModelChange)="updateNotification($event)"
@@ -209,15 +209,15 @@
<div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Password</div>
<div class="d-flex flex-column gap-2">
<div class="row g-2 align-items-center">
- <label for="" class="form-label col-12 col-md-5 mb-0">{{ 'current password' | translate:locale.language | capitalize }}</label>
- <div class="col-12 col-md-7">
+ <label for="" class="form-label col-12 col-md-6 mb-0">{{ 'current password' | translate:locale.language | capitalize }}</label>
+ <div class="col-12 col-md-6">
<app-input-password [(password)]="oldPassword" placeholder="current password"></app-input-password>
</div>
</div>
<div class="row g-2 align-items-center">
- <label for="" class="form-label col-12 col-md-5 mb-0" l10nTranslate>{{ 'new password' | translate:locale.language | capitalize }}</label>
- <div class="col-12 col-md-7">
+ <label for="" class="form-label col-12 col-md-6 mb-0" l10nTranslate>{{ 'new password' | translate:locale.language | capitalize }}</label>
+ <div class="col-12 col-md-6">
<app-input-password [(password)]="newPassword"
[disabled]="!oldPassword?.length"
[isRequired]="!!oldPassword?.length"
@@ -229,14 +229,14 @@
@if (newPassword) {
<div class="row g-2">
- <div class="col-12 col-md-7 offset-md-5">
+ <div class="col-12 col-md-6 offset-md-6">
<app-password-strength-bar [passwordToCheck]="newPassword"></app-password-strength-bar>
</div>
</div>
}
<div class="row g-2">
- <div class="col-12 col-md-7 offset-md-5">
+ <div class="col-12 col-md-6 offset-md-6">
<button [disabled]="!newPassword || !oldPassword || newPassword.length < passwordMinLength"
(click)="submitPassword()"
class="btn btn-xs btn-primary text-nowrap"
@@ -255,8 +255,8 @@
<div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Security</div>
<div class="d-flex flex-column gap-3">
<div class="row g-2 align-items-center">
- <label for="" class="form-label col-12 col-md-5 mb-0" l10nTranslate>Two-Factor Authentication</label>
- <div class="col-12 col-md-7 d-flex flex-wrap align-items-center gap-2">
+ <label for="" class="form-label col-12 col-md-6 mb-0" l10nTranslate>Two-Factor Authentication</label>
+ <div class="col-12 col-md-6 d-flex flex-wrap align-items-center gap-2">
<button (click)="enable2Fa()"
[disabled]="!store.server().twoFaEnabled"
class="btn btn-xs btn-primary"
@@ -277,8 +277,8 @@
</div>
<div class="row g-2 align-items-center">
- <label for="" class="form-label col-12 col-md-5 mb-0" l10nTranslate>Application Passwords</label>
- <div class="col-12 col-md-7 d-flex align-items-center">
+ <label for="" class="form-label col-12 col-md-6 mb-0" l10nTranslate>Application Passwords</label>
+ <div class="col-12 col-md-6 d-flex align-items-center">
<button (click)="manageAppPasswords()"
class="btn btn-xs btn-primary"
type="button"
diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scss
index 54e9fb8e..0af65a62 100755
--- a/frontend/src/styles/components/_app.scss
+++ b/frontend/src/styles/components/_app.scss
@@ -216,6 +216,80 @@
}
}
+ tbody td {
+ &.newly-1,
+ &.newly-2,
+ &.newly-3,
+ &.sync-newly-0,
+ &.sync-newly-1,
+ &.sync-newly-2,
+ &.sync-newly-3,
+ &.sync-newly-4,
+ &.prop-newly-1,
+ &.prop-newly-2,
+ &.prop-newly-3 {
+ position: relative;
+ isolation: isolate;
+ background-color: transparent !important;
+ padding-top: .26rem !important;
+ padding-bottom: .26rem !important;
+ text-align: center;
+ overflow: hidden !important;
+ text-overflow: ellipsis !important;
+ white-space: nowrap;
+
+ &::before {
+ content: "";
+ position: absolute;
+ top: .25rem;
+ bottom: .25rem;
+ left: clamp(.5rem, 9%, 1.2rem);
+ right: clamp(.5rem, 9%, 1.2rem);
+ border-radius: 999px;
+ z-index: -1;
+ }
+ }
+
+ &.prop-newly-3 {
+ color: $body-color !important;
+ }
+
+ &.newly-1::before,
+ &.prop-newly-1::before {
+ background-color: $purple !important;
+ }
+
+ &.newly-2::before,
+ &.prop-newly-2::before {
+ background-color: lighten($purple, 15%) !important;
+ }
+
+ &.newly-3::before,
+ &.prop-newly-3::before {
+ background-color: lighten($purple, 30%) !important;
+ }
+
+ &.sync-newly-0::before {
+ background-color: $red !important;
+ }
+
+ &.sync-newly-1::before {
+ background-color: $primary !important;
+ }
+
+ &.sync-newly-2::before {
+ background-color: lighten($primary, 15%) !important;
+ }
+
+ &.sync-newly-3::before {
+ background-color: lighten($primary, 30%) !important;
+ }
+
+ &.sync-newly-4::before {
+ background-color: $orange !important;
+ }
+ }
+
tbody td:first-child {
img, fa-icon {
margin-right: 0.3rem;
diff --git a/frontend/src/styles/components/_backgrounds.scss b/frontend/src/styles/components/_backgrounds.scss
index 500a78f9..3de566a1 100644
--- a/frontend/src/styles/components/_backgrounds.scss
+++ b/frontend/src/styles/components/_backgrounds.scss
@@ -2,22 +2,10 @@
background-color: $gray-700;
}
-.bg-gray-light {
- background-color: $gray-light;
-}
-
.bg-gray-light-important {
background-color: $gray-light !important;
}
-.bg-gray-lighter {
- background-color: $gray-lighter;
-}
-
-.bg-primary-purple {
- background: linear-gradient(110deg, $primary 50%, $purple 50%);
-}
-
.bg-purple {
background-color: $purple !important;
}
@@ -26,18 +14,6 @@
background-color: $maroon;
}
-.bg-green-active {
- background-color: lighten($green, 5%) !important;
-}
-
-.bg-white {
- background-color: white;
-}
-
-.bg-body {
- background-color: $body-bg;
-}
-
.bg-secondary-alt {
background-color: $secondary;
color: black;
@@ -48,84 +24,38 @@
color: black !important;
}
-.newly {
- border-bottom: .5px solid $gray-light;
-}
-
-.newly-0 {
- @extend .newly;
- background-color: transparent !important;
-}
-
-.newly-1, .prop-newly-1 {
- @extend .newly-0;
- color: white !important;
- background-color: $purple !important;
-}
-
-.newly-2, .prop-newly-2 {
- @extend .newly-0;
+.newly-1,
+.newly-2,
+.prop-newly-1,
+.prop-newly-2,
+.sync-newly-0,
+.sync-newly-1,
+.sync-newly-2,
+.sync-newly-3,
+.sync-newly-4 {
color: white !important;
- background-color: lighten($purple, 15%) !important;
-}
-
-.newly-3, .prop-newly-3 {
- @extend .newly-0;
- background-color: lighten($purple, 30%) !important;
- color: inherit !important;
}
-.prop-newly-0 {
- color: inherit;
- background-color: inherit;
-}
-
-.prop-newly-4 {
- @extend .text-danger
+.newly-1 {
+ background-color: $purple !important;
}
.sync-newly-0 {
- color: white;
background-color: $red !important;
}
.sync-newly-1 {
- @extend .sync-newly-0;
background-color: $primary !important;
}
.sync-newly-2 {
- @extend .sync-newly-0;
background-color: lighten($primary, 15%) !important;
}
.sync-newly-3 {
- @extend .sync-newly-0;
background-color: lighten($primary, 30%) !important;
}
.sync-newly-4 {
- @extend .sync-newly-0;
background-color: $orange !important;
}
-
-.comment-newly-0 {
- border-bottom: .5px solid $gray-light;
-}
-
-.comment-newly-1 {
- @extend .comment-newly-0;
- color: white !important;
- background-color: $green !important;
-}
-
-.comment-newly-2 {
- @extend .comment-newly-1;
- background-color: lighten($green, 5%) !important;
-}
-
-.comment-newly-3 {
- @extend .comment-newly-1;
- background-color: lighten($green, 12%) !important;
- color: inherit !important;
-}
diff --git a/frontend/src/styles/components/_sidebar_left.scss b/frontend/src/styles/components/_sidebar_left.scss
index 699951e3..ba9ae38b 100755
--- a/frontend/src/styles/components/_sidebar_left.scss
+++ b/frontend/src/styles/components/_sidebar_left.scss
@@ -210,7 +210,7 @@
display: flex;
flex-direction: column;
flex: 1 1 auto;
- padding-top: 4px;
+ padding-top: 3px;
}
.menus-group {
diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scss
index e5ec4e70..a8dbc603 100755
--- a/frontend/src/styles/components/_theme_dark.scss
+++ b/frontend/src/styles/components/_theme_dark.scss
@@ -227,11 +227,6 @@
background: $dark-dialog-tab-count-bg;
color: $dark-dialog-tab-count-color;
}
-
- }
- .newly {
- color: $custom-color !important;
- border-bottom: none;
}
.btn {
&:focus-visible {
@@ -298,9 +293,8 @@
&:focus-within {
border-color: $primary;
- box-shadow:
- 0 0 0 2px $dark-btn-focus-color,
- inset 0 1px 1px rgba($black, 0.2);
+ box-shadow: 0 0 0 2px $dark-btn-focus-color,
+ inset 0 1px 1px rgba($black, 0.2);
}
&.has-value {
@@ -419,6 +413,7 @@
color: $gray-light;
}
}
+
.dropdown-item {
color: $gray-light;
}
diff --git a/frontend/src/styles/components/_variables.scss b/frontend/src/styles/components/_variables.scss
index c8a6a73f..b6e20612 100644
--- a/frontend/src/styles/components/_variables.scss
+++ b/frontend/src/styles/components/_variables.scss
@@ -148,7 +148,7 @@ $light-dialog-check-card-hover-shadow-color: rgba(31, 56, 86, 0.12);
$light-dialog-check-card-active-border-color: rgba(30, 59, 89, 0.3);
$light-dialog-tabs-bar-bg: mix($light-dialog-tab-card-bg, #eaf2fc, 74%);
$light-dialog-tabs-bar-border-color: rgba(51, 84, 121, 0.24);
-$light-dialog-tab-bg: #b5c8e3;
+$light-dialog-tab-bg: #bfcfe7;
$light-dialog-tab-color: $black;
$light-dialog-tab-hover-bg: mix($primary, $light-dialog-tab-bg, 30%);
$light-dialog-tab-hover-border-color: mix($primary, $light-dialog-tab-bg, 52%);