Skip to content

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

chore(frontend): fix badge spacing

johavene0c422209d03
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 19c2da1d..0b37ad62 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
@@ -68,49 +68,49 @@
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Lock</div>
@if (f.lock) {
@if (f.lock.isExclusive) {
- <span class="badge rounded-pill bg-maroon" l10nTranslate>
+ <span class="badge bg-maroon" l10nTranslate>
<fa-icon [icon]="icons.faLock"></fa-icon>
- <span class="ms-1" l10nTranslate>Exclusive</span>
+ <span l10nTranslate>Exclusive</span>
</span>
} @else {
- <span class="badge rounded-pill bg-maroon" l10nTranslate>
+ <span class="badge bg-maroon" l10nTranslate>
<fa-icon [icon]="icons.faUnlock"></fa-icon>
- <span class="ms-1" l10nTranslate>Shared</span>
+ <span l10nTranslate>Shared</span>
</span>
}
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Shared</div>
<div class="d-flex col-sm-7">
@if (f.shares.length || f.links.length) {
- <span class="badge rounded-pill bg-primary">
- <fa-icon [icon]="icons.SHARES"></fa-icon>&nbsp;{{ f.shares.length + f.links.length }}
+ <span class="badge bg-primary">
+ <fa-icon [icon]="icons.SHARES"></fa-icon>{{ f.shares.length + f.links.length }}
</span>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Anchored</div>
@if (f.spaces.length) {
- <span class="badge rounded-pill bg-primary"><fa-icon [icon]="icons.SPACES"></fa-icon>&nbsp;{{ f.spaces.length }}</span>
+ <span class="badge bg-primary"><fa-icon [icon]="icons.SPACES"></fa-icon>{{ f.spaces.length }}</span>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Synced</div>
- <span class="badge rounded-pill {{f.syncs.length ? 'bg-primary' : 'bg-secondary-alt'}}">
+ <span class="badge {{f.syncs.length ? 'bg-primary' : 'bg-secondary-alt'}}">
{{ (f.syncs.length ? 'yes' : 'no') | translate:locale.language }}
</span>
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Comments</div>
- <span (click)="goToComments()" class="badge rounded-pill {{f.hasComments ? 'bg-success' : 'bg-secondary-alt'}} cursor-pointer">
+ <span (click)="goToComments()" class="badge {{f.hasComments ? 'bg-success' : 'bg-secondary-alt'}} cursor-pointer">
{{ (f.hasComments ? 'yes' : 'no') | translate:locale.language }}
</span>
</div>
@@ -129,7 +129,7 @@
@if (f.root.permissions) {
<app-file-permissions [permissions]="f.root.hPerms"></app-file-permissions>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
</div>
@@ -139,33 +139,33 @@
<div class="d-flex flex-wrap align-items-center p-2 fs-xs">
@if (f.lock) {
<div (click)="openLockDialog(f)"
- class="badge rounded-pill white-space-normal bg-maroon cursor-pointer mb-2">
+ class="badge white-space-normal bg-maroon cursor-pointer mb-2">
<fa-icon [icon]="f.lock.isExclusive ? icons.faLock : icons.faUnlock"></fa-icon>
- <span>&nbsp;{{ f.lock | fileLockFormatPipe }}</span>
+ <span>{{ f.lock | fileLockFormatPipe }}</span>
</div>
}
@for (space of f.spaces; track space.id) {
- <div (click)="goToSpace(space)" class="badge rounded-pill white-space-normal bg-primary cursor-pointer me-1 mb-2">
+ <div (click)="goToSpace(space)" class="badge white-space-normal bg-primary cursor-pointer me-1 mb-2">
<fa-icon [icon]="icons.SPACES"></fa-icon>
- <span>&nbsp;{{ space.name }}</span>
+ <span>{{ space.name }}</span>
</div>
}
@for (share of f.shares; track share.id) {
- <div (click)="goToShare(share)" class="badge rounded-pill white-space-normal bg-primary cursor-pointer me-1 mb-2">
+ <div (click)="goToShare(share)" class="badge white-space-normal bg-primary cursor-pointer me-1 mb-2">
<fa-icon [icon]="icons.SHARES"></fa-icon>
- <span>&nbsp;{{ share.name }}</span>
+ <span>{{ share.name }}</span>
</div>
}
@for (link of f.links; track link.id) {
- <div (click)="goToShare(link)" class="badge rounded-pill white-space-normal bg-primary cursor-pointer me-1 mb-2">
+ <div (click)="goToShare(link)" class="badge white-space-normal bg-primary cursor-pointer me-1 mb-2">
<fa-icon [icon]="icons.LINKS"></fa-icon>
- <span>&nbsp;{{ link.name }}</span>
+ <span>{{ link.name }}</span>
</div>
}
@for (sync of f.syncs; track sync.id) {
- <div (click)="goToSync(sync)" class="badge rounded-pill white-space-normal bg-primary cursor-pointer me-1 mb-2">
+ <div (click)="goToSync(sync)" class="badge white-space-normal bg-primary cursor-pointer me-1 mb-2">
<fa-icon [icon]="icons.SYNC"></fa-icon>
- <span>&nbsp;{{ sync.clientName }}</span>
+ <span>{{ sync.clientName }}</span>
</div>
}
</div>
diff --git a/frontend/src/app/applications/links/components/dialogs/link-dialog.component.html b/frontend/src/app/applications/links/components/dialogs/link-dialog.component.html
index 76cdcd03..3caec3de 100644
--- a/frontend/src/app/applications/links/components/dialogs/link-dialog.component.html
+++ b/frontend/src/app/applications/links/components/dialogs/link-dialog.component.html
@@ -111,11 +111,11 @@
<span class="form-label mb-0" l10nTranslate>Current access count</span>
<span id="access" class="ms-auto">
@if (linkForm.value.limitAccess) {
- <span class="badge rounded-pill {{(share ? share.link.nbAccess : link.nbAccess) >= linkForm.value.limitAccess ? 'bg-danger': 'bg-success'}}">
+ <span class="badge {{(share ? share.link.nbAccess : link.nbAccess) >= linkForm.value.limitAccess ? 'bg-danger': 'bg-success'}}">
{{ (share ? share.link.nbAccess : link.nbAccess) }}/{{ linkForm.value.limitAccess }}
</span>
} @else {
- <span class="badge rounded-pill bg-success">{{ share ? share.link.nbAccess : link.nbAccess }}</span>
+ <span class="badge bg-success">{{ share ? share.link.nbAccess : link.nbAccess }}</span>
}
</span>
</div>
diff --git a/frontend/src/app/applications/links/components/links.component.html b/frontend/src/app/applications/links/components/links.component.html
index e239d40d..6a3f8ce7 100644
--- a/frontend/src/app/applications/links/components/links.component.html
+++ b/frontend/src/app/applications/links/components/links.component.html
@@ -69,7 +69,7 @@
<img [src]="s.mimeUrl" [height]="galleryMode.image" [width]="galleryMode.image" alt="" draggable="true" (error)="s.fallBackMimeUrl()">
<span class="label-top-right">
@if (s.newly) {
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-purple">
+ <span [style.font-size.px]="galleryMode.textSize" class="badge bg-purple">
{{ s.hTimeAccessAgo }}
</span>
}
@@ -149,22 +149,22 @@
}
@case ('info') {
@if (s.link.limitAccess) {
- <span class="badge rounded-pill {{s.link.nbAccess >= s.link.limitAccess ? 'bg-danger': 'bg-success'}}">
+ <span class="badge {{s.link.nbAccess >= s.link.limitAccess ? 'bg-danger': 'bg-success'}}">
{{ s.link.nbAccess }}/{{ s.link.limitAccess }}
</span>
} @else {
- <span class="badge rounded-pill bg-success">{{ s.link.nbAccess }}</span>
+ <span class="badge bg-success">{{ s.link.nbAccess }}</span>
}
@if (s.link.expiresAt) {
- <span class="badge rounded-pill bg-{{s.hTimeExpirationAgo >= 1 ? 'warning': 'danger'}} ms-1">
+ <span class="badge bg-{{s.hTimeExpirationAgo >= 1 ? 'warning': 'danger'}} ms-1">
<fa-icon [icon]="icons.faClock" [fixedWidth]="false"></fa-icon>
@if (s.hTimeExpirationAgo >= 1) {
- <span class="ms-2">{{ s.hTimeExpirationAgo }}&nbsp;{{ (s.hTimeExpirationAgo === 1 ? 'day' : 'days') | translate:locale.language }}</span>
+ <span>{{ s.hTimeExpirationAgo }}&nbsp;{{ (s.hTimeExpirationAgo === 1 ? 'day' : 'days') | translate:locale.language }}</span>
}
</span>
}
@if (s.link.requireAuth) {
- <span class="badge rounded-pill bg-gray-dark ms-1">
+ <span class="badge bg-gray-dark ms-1">
<fa-icon [icon]="icons.faLock"></fa-icon>
</span>
}
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 29c920e8..487d43ae 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
@@ -37,36 +37,34 @@
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Authentication</div>
- <span class="badge rounded-pill {{link().link.requireAuth ? 'bg-success' : 'bg-warning'}}">
+ <span class="badge {{link().link.requireAuth ? 'bg-success' : 'bg-warning'}}">
{{ (link().link.requireAuth ? 'yes' : 'no') | translate:locale.language }}
</span>
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Expired</div>
@if (link().link.expiresAt) {
- <span class="badge rounded-pill bg-{{link().hTimeExpirationAgo >= 1 ? 'warning': 'danger'}}">
+ <span class="badge bg-{{link().hTimeExpirationAgo >= 1 ? 'warning': 'danger'}}">
<span>{{ link().hTimeExpirationAgo >= 1 ? link().hTimeExpirationAgo + '&nbsp;' + ('days' | translate:locale.language) : 'expired' | translate:locale.language }}</span>
</span>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>
- no
- </span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Active</div>
- <span class="badge rounded-pill {{link().link.isActive ? 'bg-primary' : 'bg-danger'}}">
+ <span class="badge {{link().link.isActive ? 'bg-primary' : 'bg-danger'}}">
{{ (link().link.isActive ? 'yes' : 'no') | translate:locale.language }}
</span>
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Access</div>
@if (link().link.limitAccess !== 0) {
- <span class="badge rounded-pill {{link().link.nbAccess >= link().link.limitAccess ? 'bg-danger': 'bg-success'}}">
+ <span class="badge {{link().link.nbAccess >= link().link.limitAccess ? 'bg-danger': 'bg-success'}}">
{{ link().link.nbAccess }}/{{ link().link.limitAccess }}
</span>
} @else {
- <span class="badge rounded-pill bg-success">{{ link().link.nbAccess }}</span>
+ <span class="badge bg-success">{{ link().link.nbAccess }}</span>
}
</div>
</div>
@@ -81,7 +79,7 @@
@if (link().link.permissions) {
<app-file-permissions [permissions]="link().hPerms"></app-file-permissions>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" 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 68301946..9c4dbe80 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 rounded-pill bg-secondary-alt ms-2">{{ childSharesLength || 0 }}</span>
+ <span class="badge bg-secondary-alt 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/shared.component.html b/frontend/src/app/applications/shares/components/shared.component.html
index 842731dc..b64ae5fe 100644
--- a/frontend/src/app/applications/shares/components/shared.component.html
+++ b/frontend/src/app/applications/shares/components/shared.component.html
@@ -74,17 +74,22 @@
[style.width.px]="galleryMode.dimensions"
class="card">
<div [attr.rowIndex]="$index" class="card-body">
- <img [src]="s.mimeUrl" [height]="galleryMode.image" [width]="galleryMode.image" alt="" draggable="true" (error)="s.fallBackMimeUrl()">
+ <img [src]="s.mimeUrl"
+ [height]="galleryMode.image"
+ [width]="galleryMode.image"
+ alt=""
+ draggable="true"
+ (error)="s.fallBackMimeUrl()">
<span class="label-top-right">
@if (s.newly) {
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-purple">{{ s.hTimeAgo }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="badge bg-purple">{{ s.hTimeAgo }}</span>
}
</span>
@if (s.counts.shares) {
<div (click)="openChildShareDialog(s)"
[style.font-size.px]="galleryMode.textSize"
- class="label-bottom-right badge rounded-pill bg-purple cursor-pointer me-1">
- <fa-icon class="me-1" [icon]="icons.SHARED"></fa-icon>
+ class="label-bottom-right badge bg-purple cursor-pointer me-1">
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
<span>{{ s.counts.shares }}</span>
</div>
}
@@ -158,13 +163,13 @@
}
@case ('info') {
@if (s.counts.shares) {
- <span (click)="openChildShareDialog(s)" class="badge rounded-pill bg-purple cursor-pointer me-1">
- <fa-icon class="me-1" [icon]="icons.SHARED"></fa-icon>
+ <span (click)="openChildShareDialog(s)" class="badge bg-purple cursor-pointer me-1">
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
<span>{{ s.counts.shares }}</span>
</span>
}
@if (s.hasComments) {
- <span (click)="goToComments(s)" class="badge rounded-pill bg-success cursor-pointer">
+ <span (click)="goToComments(s)" class="badge bg-success cursor-pointer">
<fa-icon [icon]="icons.faCommentDots"></fa-icon>
</span>
}
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 dd0172f2..148951ab 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,23 +24,23 @@
@if (share().counts.users || share().counts.groups) {
<span>{{ share().counts | joinCounts:['shares'] }}</span>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Child shares</div>
@if (share().counts.shares) {
- <span (click)="childShareDialog(share())" class="badge rounded-pill bg-purple cursor-pointer me-1">
- <fa-icon class="me-1" [icon]="iconShared"></fa-icon>
+ <span (click)="childShareDialog(share())" class="badge bg-purple cursor-pointer me-1">
+ <fa-icon [icon]="iconShared"></fa-icon>
<span>{{ share().counts.shares }}</span>
</span>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Comments</div>
- <span (click)="goToComments()" class="badge rounded-pill {{share().hasComments ? 'bg-success' : 'bg-secondary-alt'}} cursor-pointer">
+ <span (click)="goToComments()" class="badge {{share().hasComments ? 'bg-success' : 'bg-secondary-alt'}} 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 76b5e194..073dfe4b 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,30 +32,30 @@
@if (space().counts.users || space().counts.groups) {
<span>{{ space().counts | joinCounts:['roots'] }}</span>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Anchored</div>
@if (space().counts.roots) {
- <span (click)="openSpaceRootsDialog()" class="badge rounded-pill bg-primary cursor-pointer me-1">
- <fa-icon class="me-1" [icon]="icons.ANCHORED"></fa-icon>
+ <span (click)="openSpaceRootsDialog()" class="badge bg-primary cursor-pointer me-1">
+ <fa-icon [icon]="icons.ANCHORED"></fa-icon>
<span>{{ space().counts.roots }}</span>
</span>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
@if (space().role === SPACE_ROLE.IS_MANAGER) {
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Child shares</div>
@if (space().counts.shares) {
- <span (click)="openChildShareDialog(space())" class="badge rounded-pill bg-purple cursor-pointer me-1">
- <fa-icon class="me-1" [icon]="icons.SHARED"></fa-icon>
+ <span (click)="openChildShareDialog(space())" class="badge bg-purple cursor-pointer me-1">
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
<span>{{ space().counts.shares }}</span>
</span>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
}
@@ -73,7 +73,7 @@
@if (space().permissions) {
<app-file-permissions [permissions]="space().hPerms"></app-file-permissions>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" 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 824f4ae4..fbf8a24d 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
@@ -29,9 +29,9 @@
<div class="d-flex align-items-center mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Elements</div>
@if (trash().nb) {
- <span class="badge rounded-pill bg-danger">{{ trash().nb }}</span>
+ <span class="badge bg-danger">{{ trash().nb }}</span>
} @else {
- <span class="badge rounded-pill bg-secondary-alt" l10nTranslate>no</span>
+ <span class="badge bg-secondary-alt" l10nTranslate>no</span>
}
</div>
</div>
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.html b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
index 123e8050..f0818f78 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -239,42 +239,46 @@
tooltip="{{f.lock | fileLockFormatPipe}}"
placement="auto"
[style.font-size.px]="galleryMode.textSize"
- class="badge rounded-pill bg-maroon cursor-pointer">
+ class="badge bg-maroon cursor-pointer">
<fa-icon [icon]="f.lock.isExclusive ? icons.faLock : icons.faLockOpen"></fa-icon>
</span>
}
@if (f.shares.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
[style.font-size.px]="galleryMode.textSize"
- class="badge rounded-pill bg-primary cursor-pointer">
- <fa-icon [icon]="icons.SHARES"></fa-icon>&nbsp;{{ f.shares.length }}
+ class="badge bg-primary cursor-pointer">
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
+ <span>{{ f.shares.length }}</span>
</span>
}
@if (f.spaces.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
[style.font-size.px]="galleryMode.textSize"
- class="badge rounded-pill bg-primary cursor-pointer ms-1">
- <fa-icon [icon]="icons.SPACES"></fa-icon>&nbsp;{{ f.spaces.length }}
- </span>
+ class="badge bg-primary cursor-pointer ms-1">
+ <fa-icon [icon]="icons.SPACES"></fa-icon>
+ <span>{{ f.spaces.length }}</span>
+ </span>
}
@if (f.links.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
[style.font-size.px]="galleryMode.textSize"
- class="badge rounded-pill bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.LINKS"></fa-icon>&nbsp;{{ f.links.length }}
+ class="badge bg-primary cursor-pointer me-1">
+ <fa-icon [icon]="icons.LINKS"></fa-icon>
+ <span>{{ f.links.length }}</span>
</span>
}
@if (f.syncs.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
[style.font-size.px]="galleryMode.textSize"
- class="badge rounded-pill bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.SYNC"></fa-icon>&nbsp;{{ f.syncs.length }}
+ class="badge bg-primary cursor-pointer me-1">
+ <fa-icon [icon]="icons.SYNC"></fa-icon>
+ <span>{{ f.syncs.length }}</span>
</span>
}
@if (f.hasComments) {
<span (click)="layout.showRSideBarTab(TAB_MENU.COMMENTS, true)"
[style.font-size.px]="galleryMode.textSize"
- class="badge rounded-pill bg-success cursor-pointer">
+ class="badge bg-success cursor-pointer">
<fa-icon [icon]="icons.faCommentDots"></fa-icon>
</span>
}
@@ -286,7 +290,7 @@
}
@if (f.newly) {
<span class="label-top-right">
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-purple">{{ f.hTimeAgo }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="badge bg-purple">{{ f.hTimeAgo }}</span>
</span>
}
</div>
@@ -385,36 +389,40 @@
<span (click)="openLockDialog(f)"
tooltip="{{f.lock | fileLockFormatPipe}}"
placement="auto"
- class="badge rounded-pill bg-maroon cursor-pointer me-1">
+ class="badge bg-maroon cursor-pointer me-1">
<fa-icon [icon]="f.lock.isExclusive ? icons.faLock : icons.faLockOpen"></fa-icon>
</span>
}
@if (f.shares.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- class="badge rounded-pill bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.SHARES"></fa-icon>&nbsp;{{ f.shares.length }}
+ class="badge bg-primary cursor-pointer me-1">
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
+ <span>{{ f.shares.length }}</span>
</span>
}
@if (f.links.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- class="badge rounded-pill bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.LINKS"></fa-icon>&nbsp;{{ f.links.length }}
+ class="badge bg-primary cursor-pointer me-1">
+ <fa-icon [icon]="icons.LINKS"></fa-icon>
+ <span>{{ f.links.length }}</span>
</span>
}
@if (f.spaces.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- class="badge rounded-pill bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.SPACES"></fa-icon>&nbsp;{{ f.spaces.length }}
+ class="badge bg-primary cursor-pointer me-1">
+ <fa-icon [icon]="icons.SPACES"></fa-icon>
+ {{ f.spaces.length }}
</span>
}
@if (f.syncs.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- class="badge rounded-pill bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.SYNC"></fa-icon>&nbsp;{{ f.syncs.length }}
+ class="badge bg-primary cursor-pointer me-1">
+ <fa-icon [icon]="icons.SYNC"></fa-icon>
+ <span>{{ f.syncs.length }}</span>
</span>
}
@if (f.hasComments) {
- <span (click)="layout.showRSideBarTab(TAB_MENU.COMMENTS, true)" class="badge rounded-pill bg-success cursor-pointer">
+ <span (click)="layout.showRSideBarTab(TAB_MENU.COMMENTS, true)" class="badge bg-success cursor-pointer">
<fa-icon [icon]="icons.faCommentDots"></fa-icon>
</span>
}
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.html b/frontend/src/app/applications/spaces/components/spaces.component.html
index e7fcd384..f39b97a8 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces.component.html
@@ -84,7 +84,7 @@
</fa-icon>
<span class="label-top-right">
@if (s.newly) {
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-purple">{{ s.hTimeAgo }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="badge bg-purple">{{ s.hTimeAgo }}</span>
}
</span>
@if (s.managers.length) {
@@ -163,13 +163,13 @@
}
@case ('info') {
@if (s.counts?.roots) {
- <span (click)="openSpaceRootsDialog()" class="badge rounded-pill bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.faAnchor"></fa-icon>&nbsp;{{ s.counts.roots }}
+ <span (click)="openSpaceRootsDialog()" class="badge bg-primary cursor-pointer me-1">
+ <fa-icon [icon]="icons.faAnchor"></fa-icon>{{ s.counts.roots }}
</span>
}
@if (s.role === SPACE_ROLE.IS_MANAGER && s.counts.shares) {
- <span (click)="openChildShareDialog(s)" class="badge rounded-pill bg-purple cursor-pointer me-1">
- <fa-icon class="me-1" [icon]="icons.SHARED"></fa-icon>
+ <span (click)="openChildShareDialog(s)" class="badge bg-purple cursor-pointer me-1">
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
<span>{{ s.counts.shares }}</span>
</span>
}
diff --git a/frontend/src/app/applications/spaces/components/trash.component.html b/frontend/src/app/applications/spaces/components/trash.component.html
index 60adad73..f493fb32 100644
--- a/frontend/src/app/applications/spaces/components/trash.component.html
+++ b/frontend/src/app/applications/spaces/components/trash.component.html
@@ -50,11 +50,11 @@
</fa-icon>
<span class="label-top-right">
@if (t.newly) {
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-purple">{{ t.hTimeAgo }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="badge bg-purple">{{ t.hTimeAgo }}</span>
}
</span>
<span class="label-bottom-right">
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-danger">{{ t.nb }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="badge bg-danger">{{ t.nb }}</span>
</span>
</div>
<div class="card-footer text-center text-truncate p-1">
@@ -124,7 +124,7 @@
</div>
}
@case ('nb') {
- <span class="badge rounded-pill bg-danger">{{ t.nb }}</span>
+ <span class="badge bg-danger">{{ t.nb }}</span>
}
@case ('modified') {
<span class="{{th.value.newly && t[th.value.newly] ? 'badge prop-newly-' + t[th.value.newly] : ''}}">
diff --git a/frontend/src/app/applications/sync/components/sync-clients.component.html b/frontend/src/app/applications/sync/components/sync-clients.component.html
index e52538e5..2c5b7a2d 100644
--- a/frontend/src/app/applications/sync/components/sync-clients.component.html
+++ b/frontend/src/app/applications/sync/components/sync-clients.component.html
@@ -32,7 +32,7 @@
</div>
</div>
<div class="d-flex align-items-center flex-nowrap ms-2">
- <div class="badge rounded-pill bg-primary">{{ client.info.version }}</div>
+ <div class="badge bg-primary">{{ client.info.version }}</div>
@if (client.isCurrentClient) {
<fa-icon [icon]="icons.faCircle"
[container]="'body'"
@@ -66,7 +66,7 @@
<div class="sync-client-paths">
<div class="sync-client-paths-header">
<span l10nTranslate>Synchronizations</span>
- <span class="badge rounded-pill sync-client-paths-count">{{ client.paths.length }}</span>
+ <span class="badge sync-client-paths-count">{{ client.paths.length }}</span>
</div>
@if (client.paths.length) {
@for (path of client.paths; track path.id) {
@@ -88,11 +88,11 @@
</div>
<div class="sync-path-side">
<div class="sync-path-badges">
- <div class="badge rounded-pill bg-dark">
+ <div class="badge bg-dark">
<fa-icon [icon]="icons.faPlusCircle"></fa-icon>
- {{ path.createdAt | amTimeAgo:true }}
+ <span>{{ path.createdAt | amTimeAgo:true }}</span>
</div>
- <div class="badge rounded-pill sync-newly-{{path.newly}}">
+ <div class="badge sync-newly-{{path.newly}}">
<fa-icon [icon]="icons.faRotate"></fa-icon>
@if (path.newly) {
{{ path.settings.lastSync | amTimeAgo:true }}
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 73da65ab..ae3e8123 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.html
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.html
@@ -188,15 +188,15 @@
<span>{{ s.settings.name }}</span>
<span class="d-flex align-items-center ms-auto">
@if (s.nbSyncTasks) {
- <span class="badge rounded-pill bg-maroon">{{ s._nbTasks }}</span>
+ <span class="badge bg-maroon">{{ s._nbTasks }}</span>
}
@if (s.mainError) {
- <span [tooltip]="s.mainError | translate:locale.language" class="badge rounded-pill bg-danger cursor-pointer ms-1" placement="right">
+ <span [tooltip]="s.mainError | translate:locale.language" class="badge bg-danger cursor-pointer ms-1" placement="right">
<fa-icon [icon]="icons.faExclamationTriangle" class="m-0"></fa-icon>
</span>
}
@if (s.lastErrors.length) {
- <span (click)="showErrors(s)" class="badge rounded-pill bg-danger cursor-pointer ms-1">
+ <span (click)="showErrors(s)" class="badge bg-danger cursor-pointer ms-1">
<fa-icon [icon]="icons.faExclamationTriangle" class="me-1"></fa-icon>
<span>{{ s.lastErrors.length }}</span>
</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 e232e68e..a87aa508 100755
--- a/frontend/src/app/applications/users/components/user-account.component.html
+++ b/frontend/src/app/applications/users/components/user-account.component.html
@@ -47,16 +47,16 @@
<div class="row g-2 align-items-center py-2 border-bottom border-secondary-subtle">
<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-purple rounded-pill">{{ user.currentIp }}</span>
- <span class="badge bg-secondary-alt rounded-pill ms-1">{{ user.lastIp }}</span>
+ <span class="badge bg-purple">{{ user.currentIp }}</span>
+ <span class="badge bg-secondary-alt ms-1">{{ user.lastIp }}</span>
</div>
</div>
<div class="row g-2 align-items-center py-2 border-bottom border-secondary-subtle">
<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-purple rounded-pill">{{ user.currentAccess | amDateFormat }}</span>
- <span class="badge bg-secondary-alt rounded-pill ms-1">{{ user.lastAccess | amDateFormat }}</span>
+ <span class="badge bg-purple">{{ user.currentAccess | amDateFormat }}</span>
+ <span class="badge bg-secondary-alt ms-1">{{ user.lastAccess | amDateFormat }}</span>
</div>
</div>
@@ -65,13 +65,13 @@
<label for="" class="col-5 col-sm-4" l10nTranslate>Permissions</label>
<div class="col-7 col-sm-8 d-flex flex-wrap justify-content-end">
@if (user.isAdmin) {
- <span class="badge bg-gray-dark rounded-pill">
- <fa-icon class="me-1" [icon]="icons.faKey"></fa-icon>
+ <span class="badge bg-gray-dark">
+ <fa-icon [icon]="icons.faKey"></fa-icon>
<span l10nTranslate>Administrator</span>
</span>
} @else {
@for (app of user.applications; track $index) {
- <span class="badge bg-gray-dark rounded-pill m-1" l10nTranslate>{{ app }}</span>
+ <span class="badge bg-gray-dark m-1" l10nTranslate>{{ app }}</span>
}
}
</div>
diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.html b/frontend/src/app/layout/sidebar/sidebar.left.component.html
index f98a6acb..218a6a4d 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.html
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.html
@@ -61,7 +61,7 @@
@if (menu.count) {
<span class="{{isMenuIcon ? 'menu-badge-icon' : 'menu-badge'}}">
@if (menu.count.value | async; as count) {
- <span class="badge bg-{{menu.count.level}} rounded-pill">{{ count }}</span>
+ <span class="badge bg-{{menu.count.level}}">{{ count }}</span>
}
</span>
}
diff --git a/frontend/src/app/layout/sidebar/sidebar.right.component.html b/frontend/src/app/layout/sidebar/sidebar.right.component.html
index f64a8f83..d976ee89 100644
--- a/frontend/src/app/layout/sidebar/sidebar.right.component.html
+++ b/frontend/src/app/layout/sidebar/sidebar.right.component.html
@@ -32,7 +32,7 @@
<fa-icon [icon]="tab.icon"></fa-icon>
@if (tab.count && tab.count.value | async; as count) {
<span class="menu-badge">
- <span class="badge bg-{{tab.count.level}} rounded-pill">{{ count }}</span>
+ <span class="badge bg-{{tab.count.level}}">{{ count }}</span>
</span>
}
</a>
diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scss
index 3b741a01..ab3f6177 100755
--- a/frontend/src/styles/components/_app.scss
+++ b/frontend/src/styles/components/_app.scss
@@ -226,11 +226,6 @@
color: transparent;
font-size: $font-size-3xs;
border-top: none;
-
- .badge {
- display: inline;
- line-height: normal;
- }
}
}
diff --git a/frontend/src/styles/components/_badges.scss b/frontend/src/styles/components/_badges.scss
index 416089e6..16be5d98 100644
--- a/frontend/src/styles/components/_badges.scss
+++ b/frontend/src/styles/components/_badges.scss
@@ -77,11 +77,6 @@
display: none;
}
- &.rounded-pill {
- border-radius: 9999px !important;
- }
-
-
&.badge-small {
gap: 0.15rem;
padding: calc(#{$badge-padding-y} * 0.55) calc(#{$badge-padding-x} * 0.55);
@@ -94,6 +89,10 @@
color: white !important;
}
+ fa-icon {
+ font-size: $font-size-2xs;
+ }
+
}
body.theme-dark .badge {