Skip to content

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

chore(frontend): adjust badges

johaven82c88b0bcd80
diff --git a/frontend/src/app/applications/admin/components/admin-groups.component.html b/frontend/src/app/applications/admin/components/admin-groups.component.html
index 6ef81d8b..560540c2 100644
--- a/frontend/src/app/applications/admin/components/admin-groups.component.html
+++ b/frontend/src/app/applications/admin/components/admin-groups.component.html
@@ -130,9 +130,9 @@
}
@case ('createdAndModified') {
<span class="d-flex flex-column {{th.value.newly && m[th.value.newly] ? 'badge prop-newly-' + m[th.value.newly] : ''}}">
- <span>{{ m.createdAt | amDateFormat }}</span>
+ {{ m.createdAt | amDateFormat }}
@if (m.modifiedAt) {
- <span>{{ m.modifiedAt | amDateFormat }}</span>
+ {{ m.modifiedAt | amDateFormat }}
}
</span>
}
diff --git a/frontend/src/app/applications/admin/components/admin-users.component.html b/frontend/src/app/applications/admin/components/admin-users.component.html
index e8cdea4f..c5ba1e97 100644
--- a/frontend/src/app/applications/admin/components/admin-users.component.html
+++ b/frontend/src/app/applications/admin/components/admin-users.component.html
@@ -145,7 +145,7 @@
<span>{{ u.lastAccess | amDateFormat }}</span>
</span>
} @else {
- <span>{{ u.hTimeAgo }}</span>
+ {{ u.hTimeAgo }}
}
</span>
} @else {
diff --git a/frontend/src/app/applications/files/components/sidebar/files-selection.component.html b/frontend/src/app/applications/files/components/sidebar/files-selection.component.html
index ef462807..d9dea001 100644
--- a/frontend/src/app/applications/files/components/sidebar/files-selection.component.html
+++ b/frontend/src/app/applications/files/components/sidebar/files-selection.component.html
@@ -77,7 +77,7 @@
</span>
}
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
@@ -89,7 +89,7 @@
{{ f.shares.length + f.links.length }}
</span>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
</div>
@@ -100,18 +100,18 @@
<fa-icon [icon]="icons.SPACES"></fa-icon>
{{ f.spaces.length }}</span>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Synced</div>
- <span class="badge {{f.syncs.length ? 'bg-primary' : 'bg-secondary-alt'}}">
+ <span class="badge {{f.syncs.length ? 'bg-primary' : 'bg-default'}}">
{{ (f.syncs.length ? 'yes' : 'no') | translate:locale.language }}
</span>
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Comments</div>
- <span (click)="goToComments()" class="badge {{f.hasComments ? 'bg-success' : 'bg-secondary-alt'}} cursor-pointer">
+ <span (click)="goToComments()" class="badge {{f.hasComments ? 'bg-success' : 'bg-default'}} cursor-pointer">
{{ (f.hasComments ? 'yes' : 'no') | translate:locale.language }}
</span>
</div>
@@ -130,7 +130,7 @@
@if (f.root.permissions) {
<app-badge-permissions [permissions]="f.root.hPerms"></app-badge-permissions>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
</div>
diff --git a/frontend/src/app/applications/links/components/sidebar/link-selection.component.html b/frontend/src/app/applications/links/components/sidebar/link-selection.component.html
index 7c266df4..377724e5 100644
--- a/frontend/src/app/applications/links/components/sidebar/link-selection.component.html
+++ b/frontend/src/app/applications/links/components/sidebar/link-selection.component.html
@@ -48,7 +48,7 @@
{{ link().hTimeExpirationAgo >= 1 ? link().hTimeExpirationAgo + '&nbsp;' + ('days' | translate:locale.language) : 'expired' | translate:locale.language }}
</span>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
@@ -79,7 +79,7 @@
@if (link().link.permissions) {
<app-badge-permissions [permissions]="link().hPerms"></app-badge-permissions>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
</div>
diff --git a/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.html b/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.html
index 28e0b6de..6ba693fd 100644
--- a/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.html
+++ b/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.html
@@ -5,7 +5,7 @@
</h4>
<h4 class="modal-title ms-auto">
<span l10nTranslate>Child shares</span>
- <span class="badge bg-secondary-alt ms-2">{{ childSharesLength || 0 }}</span>
+ <span class="badge bg-default ms-2">{{ childSharesLength || 0 }}</span>
</h4>
<button (click)="layout.closeDialog()" aria-label="Close" class="btn-close btn-close-white ms-2" type="button"></button>
</div>
diff --git a/frontend/src/app/applications/shares/components/sidebar/share-selection.component.html b/frontend/src/app/applications/shares/components/sidebar/share-selection.component.html
index edda49ea..d1af1622 100644
--- a/frontend/src/app/applications/shares/components/sidebar/share-selection.component.html
+++ b/frontend/src/app/applications/shares/components/sidebar/share-selection.component.html
@@ -24,7 +24,7 @@
@if (share().counts.users || share().counts.groups) {
<app-badge-members [members]="share().counts"></app-badge-members>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
@@ -35,12 +35,12 @@
{{ share().counts.shares }}
</span>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Comments</div>
- <span (click)="goToComments()" class="badge {{share().hasComments ? 'bg-success' : 'bg-secondary-alt'}} cursor-pointer">
+ <span (click)="goToComments()" class="badge {{share().hasComments ? 'bg-success' : 'bg-default'}} cursor-pointer">
{{ (share().hasComments ? 'yes' : 'no') | translate:locale.language }}
</span>
</div>
diff --git a/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.html b/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.html
index 6ac9a464..c382f28a 100644
--- a/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.html
+++ b/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.html
@@ -32,7 +32,7 @@
@if (space().counts.users || space().counts.groups) {
<app-badge-members [members]="space().counts"></app-badge-members>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
@@ -43,7 +43,7 @@
{{ space().counts.roots }}
</span>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
@if (space().role === SPACE_ROLE.IS_MANAGER) {
@@ -55,7 +55,7 @@
{{ space().counts.shares }}
</span>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
}
@@ -73,7 +73,7 @@
@if (space().permissions) {
<app-badge-permissions [permissions]="space().hPerms"></app-badge-permissions>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
</div>
diff --git a/frontend/src/app/applications/spaces/components/sidebar/trash-selection.component.html b/frontend/src/app/applications/spaces/components/sidebar/trash-selection.component.html
index 7a487ac8..14778a8a 100644
--- a/frontend/src/app/applications/spaces/components/sidebar/trash-selection.component.html
+++ b/frontend/src/app/applications/spaces/components/sidebar/trash-selection.component.html
@@ -31,7 +31,7 @@
@if (trash().nb) {
<span class="badge bg-danger">{{ trash().nb }}</span>
} @else {
- <span class="badge bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-default" l10nTranslate>no</span>
}
</div>
</div>
diff --git a/frontend/src/app/applications/sync/components/sync-transfers.component.html b/frontend/src/app/applications/sync/components/sync-transfers.component.html
index 01e71b93..52ab386f 100644
--- a/frontend/src/app/applications/sync/components/sync-transfers.component.html
+++ b/frontend/src/app/applications/sync/components/sync-transfers.component.html
@@ -19,6 +19,7 @@
<div class="d-flex ms-auto">
<button (click)="refresh()"
[tooltip]="'Refresh' | translate:locale.language"
+
class="btn btn-default me-1"
type="button">
<fa-icon [icon]="icons.faRedo"></fa-icon>
@@ -98,7 +99,7 @@
<span class="{{th.value.newly && t[th.value.newly] ? 'badge prop-newly-' + t[th.value.newly] : ''}}"
(mouseenter)="t.hovered = true"
(mouseleave)="t.hovered = false">
- <span>{{ t.hovered ? t.timestamp : t.hTimeAgo }}</span>
+ {{ t.hovered ? t.timestamp : t.hTimeAgo }}
</span>
}
}
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 11d78b14..fac57953 100755
--- a/frontend/src/app/applications/users/components/user-account.component.html
+++ b/frontend/src/app/applications/users/components/user-account.component.html
@@ -43,7 +43,7 @@
<label for="" class="col-5 col-sm-4" l10nTranslate>IP Addresses</label>
<div class="col-7 col-sm-8 d-flex flex-wrap justify-content-end">
<span class="badge bg-warning">{{ user.currentIp }}</span>
- <span class="badge bg-secondary-alt ms-1">{{ user.lastIp }}</span>
+ <span class="badge bg-default ms-1">{{ user.lastIp }}</span>
</div>
</div>
@@ -51,7 +51,7 @@
<label for="" class="col-5 col-sm-4" l10nTranslate>Connections</label>
<div class="col-7 col-sm-8 d-flex flex-wrap justify-content-end">
<span class="badge bg-warning">{{ user.currentAccess | amDateFormat }}</span>
- <span class="badge bg-secondary-alt ms-1">{{ user.lastAccess | amDateFormat }}</span>
+ <span class="badge bg-default ms-1">{{ user.lastAccess | amDateFormat }}</span>
</div>
</div>
diff --git a/frontend/src/app/applications/users/components/user-guests.component.html b/frontend/src/app/applications/users/components/user-guests.component.html
index 01bd6b8f..04539de8 100644
--- a/frontend/src/app/applications/users/components/user-guests.component.html
+++ b/frontend/src/app/applications/users/components/user-guests.component.html
@@ -111,7 +111,7 @@
<span>{{ u.lastAccess | amDateFormat }}</span>
</span>
} @else {
- <span>{{ u.hTimeAgo }}</span>
+ {{ u.hTimeAgo }}
}
</span>
} @else {
diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scss
index 64a5a3cf..08a25690 100755
--- a/frontend/src/styles/components/_app.scss
+++ b/frontend/src/styles/components/_app.scss
@@ -282,9 +282,7 @@
}
.badge {
- display: inline-block;
max-width: 100%;
- vertical-align: middle;
}
}
@@ -301,7 +299,7 @@
tbody td:not(:first-child) {
color: transparent;
- font-size: $font-size-xs;
+ font-size: 0.7rem !important;
border-top: none;
}
}
diff --git a/frontend/src/styles/components/_badges.scss b/frontend/src/styles/components/_badges.scss
index 0a41b14d..9624b5cd 100644
--- a/frontend/src/styles/components/_badges.scss
+++ b/frontend/src/styles/components/_badges.scss
@@ -65,7 +65,7 @@
border-radius: 9999px;
font-size: $font-size-xs;
font-weight: 500;
- line-height: 1.1;
+ line-height: 1;
letter-spacing: 0.01em;
white-space: nowrap;
vertical-align: middle;