Skip to content

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

chore(frontend): various enhancements

johaven926a5f730a3a
diff --git a/frontend/src/app/applications/comments/components/sidebar/comments-selection.component.html b/frontend/src/app/applications/comments/components/sidebar/comments-selection.component.html
index 7b955101..200d423f 100644
--- a/frontend/src/app/applications/comments/components/sidebar/comments-selection.component.html
+++ b/frontend/src/app/applications/comments/components/sidebar/comments-selection.component.html
@@ -36,24 +36,24 @@
<div class="pb-2 px-2">
@if (comment.isEdited) {
<textarea #CommentUpdate [ngModel]="comment.content" [disabled]="!comment.author.isAuthor && comment.isFileOwner" class="form-control form-control-sm mt-1 mb-2" required></textarea>
- <div class="d-flex">
+ <div class="d-flex gap-2 w-100">
<button (click)="updateComment(comment, CommentUpdate.value)"
[disabled]="!CommentUpdate.value || comment.content === CommentUpdate.value"
- class="btn btn-xxs btn-primary me-auto"
+ class="btn btn-xxs btn-primary flex-fill"
role="button"
type="button"
l10nTranslate>
Update
</button>
<button (click)="onEditComment(comment)"
- class="btn btn-xxs btn-default align-content-around"
+ class="btn btn-xxs btn-default flex-fill"
role="button"
type="button"
l10nTranslate>
Cancel
</button>
<button (click)="removeComment(comment)"
- class="btn btn-xxs btn-danger ms-auto"
+ class="btn btn-xxs btn-danger flex-fill"
role="button"
type="button"
l10nTranslate>
diff --git a/frontend/src/app/applications/files/components/sidebar/files-tree.component.html b/frontend/src/app/applications/files/components/sidebar/files-tree.component.html
index cffd016f..ced7f849 100644
--- a/frontend/src/app/applications/files/components/sidebar/files-tree.component.html
+++ b/frontend/src/app/applications/files/components/sidebar/files-tree.component.html
@@ -4,16 +4,16 @@
<fa-icon [icon]="icons.faArrowRotateRight"></fa-icon>
</button>
@if (errorMsg) {
- <span class="text-danger fs-2xs p-2" l10nTranslate>{{ errorMsg }}</span>
+ <span class="text-danger fs-3xs p-1" l10nTranslate>{{ errorMsg }}</span>
} @else {
<span l10nTranslate>Navigation Tree</span>
}
</div>
}
@if (copyMoveOn) {
- <div class="px-2 pt-2 pb-0 fs-xs">
+ <div class="bg-white px-2 pt-2 pb-0 fs-2xs">
<div class="text-start text-truncate">
- <span class="fs-xs fw-semibold me-2" l10nTranslate><span l10nTranslate>Source</span>:</span>
+ <span class="fs-2xs fw-semibold me-2" l10nTranslate><span l10nTranslate>Source</span>:</span>
@switch (store.filesSelection().length) {
@case (1) {
<span>
@@ -33,19 +33,30 @@
}
</div>
<div class="text-start text-truncate mt-1">
- <span class="fs-xs fw-semibold me-2" l10nTranslate><span l10nTranslate>Destination</span>:</span>
+ <span class="fs-2xs fw-semibold me-2" l10nTranslate><span l10nTranslate>Destination</span>:</span>
<span>{{ selection?.data.name || '' }}</span>
</div>
- <div class="d-flex justify-content-between mt-2">
- <button (click)="actionMove()" [disabled]="!selection || !store.filesSelection().length || !srcAllowed || !dstAllowed" class="btn btn-xxs btn-primary" type="button" l10nTranslate>
+ <div class="d-flex gap-2 pt-1 w-100 mt-2">
+ <button (click)="actionMove()"
+ [disabled]="!selection || !store.filesSelection().length || !srcAllowed || !dstAllowed"
+ class="btn btn-xxs btn-warning flex-fill"
+ type="button"
+ l10nTranslate>
<fa-icon [icon]="icons.faArrowsAlt"></fa-icon>
Move
</button>
- <button (click)="actionCopy()" [disabled]="!selection || !store.filesSelection().length || !dstAllowed" class="btn btn-xxs btn-primary" type="button" l10nTranslate>
+ <button (click)="actionCopy()"
+ [disabled]="!selection || !store.filesSelection().length || !dstAllowed"
+ class="btn btn-xxs btn-primary flex-fill"
+ type="button"
+ l10nTranslate>
<fa-icon [icon]="icons.faClone"></fa-icon>
Copy
</button>
- <button (click)="actionCancel()" class="btn btn-xxs btn-default" type="button" l10nTranslate>
+ <button (click)="actionCancel()"
+ class="btn btn-xxs btn-secondary flex-fill"
+ type="button"
+ l10nTranslate>
<fa-icon [icon]="icons.faTimes"></fa-icon>
Cancel
</button>
diff --git a/frontend/src/app/applications/files/models/file.model.ts b/frontend/src/app/applications/files/models/file.model.ts
index 40bb01e4..a09b550b 100644
--- a/frontend/src/app/applications/files/models/file.model.ts
+++ b/frontend/src/app/applications/files/models/file.model.ts
@@ -69,6 +69,8 @@ export class FileModel implements File {
hSize: string
hTimeAgo: string
hDirSize: Observable<string>
+ nbBadges = 0
+ galleryBadges: ('lock' | 'shares' | 'spaces' | 'links' | 'syncs' | 'comments')[] = []
// States
newly = 0
@@ -92,6 +94,7 @@ export class FileModel implements File {
this.setMimeUrl()
this.setHSize()
this.setRoot(inShare)
+ this.updateNbBadges()
}
get dataUrl(): string {
@@ -244,6 +247,18 @@ export class FileModel implements File {
this.links.push(s)
}
}
+ this.updateNbBadges()
}
}
+
+ updateNbBadges() {
+ this.galleryBadges = []
+ if (this.lock) this.galleryBadges.push('lock')
+ if (this.shares.length) this.galleryBadges.push('shares')
+ if (this.spaces.length) this.galleryBadges.push('spaces')
+ if (this.links.length) this.galleryBadges.push('links')
+ if (this.syncs.length) this.galleryBadges.push('syncs')
+ if (this.hasComments) this.galleryBadges.push('comments')
+ this.nbBadges = this.galleryBadges.length
+ }
}
diff --git a/frontend/src/app/applications/links/components/links.component.html b/frontend/src/app/applications/links/components/links.component.html
index bc84d583..8b1d4068 100644
--- a/frontend/src/app/applications/links/components/links.component.html
+++ b/frontend/src/app/applications/links/components/links.component.html
@@ -74,6 +74,23 @@
</span>
}
</span>
+ <span class="label-bottom-right">
+ @if (s.link.limitAccess) {
+ <span class="badge {{s.link.nbAccess >= s.link.limitAccess ? 'bg-danger': 'bg-success'}}">
+ {{ s.link.nbAccess }}/{{ s.link.limitAccess }}
+ </span>
+ } @else {
+ <span class="badge bg-success">{{ s.link.nbAccess }}</span>
+ }
+ @if (s.link.expiresAt) {
+ <span class="badge bg-{{s.hTimeExpirationAgo >= 1 ? 'warning': 'danger'}} ms-1">
+ <fa-icon [icon]="icons.faClock" [fixedWidth]="false"></fa-icon>
+ @if (s.hTimeExpirationAgo >= 1) {
+ {{ s.hTimeExpirationAgo }}&nbsp;{{ (s.hTimeExpirationAgo === 1 ? 'day' : 'days') | translate:locale.language }}
+ }
+ </span>
+ }
+ </span>
<span class="label-bottom-left">
<app-share-repository [share]="s" [galleryMode]="galleryMode"></app-share-repository>
</span>
diff --git a/frontend/src/app/applications/shares/components/shared.component.html b/frontend/src/app/applications/shares/components/shared.component.html
index 3f5b6c44..fa77dbe6 100644
--- a/frontend/src/app/applications/shares/components/shared.component.html
+++ b/frontend/src/app/applications/shares/components/shared.component.html
@@ -85,17 +85,27 @@
<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 bg-purple cursor-pointer me-1">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
- <span>{{ s.counts.shares }}</span>
- </div>
- }
+ <span class="label-bottom-right">
+ @if (s.hasComments) {
+ <span (click)="goToComments(s)"
+ [style.font-size.px]="galleryMode.textSize"
+ class="badge bg-success cursor-pointer">
+ <fa-icon [icon]="icons.faCommentDots"></fa-icon>
+ </span>
+ }
+ @if (s.counts.shares) {
+ <div (click)="openChildShareDialog(s)"
+ [style.font-size.px]="galleryMode.textSize"
+ class="badge bg-purple cursor-pointer">
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
+ {{ s.counts.shares }}
+ </div>
+ }
+ </span>
<span class="label-bottom-left">
<app-share-repository [share]="s" [galleryMode]="galleryMode"></app-share-repository>
</span>
+
</div>
<div class="card-footer text-center text-truncate p-1">
<span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
diff --git a/frontend/src/app/applications/shares/components/utils/share-repository.component.ts b/frontend/src/app/applications/shares/components/utils/share-repository.component.ts
index a4a55161..cd497f56 100644
--- a/frontend/src/app/applications/shares/components/utils/share-repository.component.ts
+++ b/frontend/src/app/applications/shares/components/utils/share-repository.component.ts
@@ -25,9 +25,9 @@ interface ShareRepository {
<fa-icon
[icon]="repository.icon"
[class]="repository.class"
- [style.min-width.px]="galleryMode.dimensions / 3"
- [style.min-height.px]="galleryMode.dimensions / 3"
- [style.font-size.px]="galleryMode.faSize / 1.8"
+ [style.min-width.px]="galleryMode.dimensions / 3.5"
+ [style.min-height.px]="galleryMode.dimensions / 3.5"
+ [style.font-size.px]="galleryMode.faSize / 2.2"
></fa-icon>
} @else {
<div class="d-flex align-items-center overflow-wrap-and-whitespace">
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 284ade86..f5521869 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -234,58 +234,79 @@
<img [src]="f.mimeUrl" [height]="galleryMode.image" [width]="galleryMode.image" alt="" draggable="true" (error)="f.fallBackMimeUrl()">
}
<span class="label-bottom-right">
- @if (f.lock) {
- <span (click)="openLockDialog(f)"
- tooltip="{{f.lock | fileLockFormatPipe}}"
- placement="auto"
- [style.font-size.px]="galleryMode.textSize"
- class="badge bg-maroon cursor-pointer">
- <fa-icon [icon]="f.lock.isExclusive ? icons.faLock : icons.faLockOpen"></fa-icon>
- </span>
+ @let maxBadges = galleryMode.maxBadges || 0;
+ @let hiddenBadges = f.nbBadges - maxBadges;
+ @for (badge of f.galleryBadges; track badge; let i = $index) {
+ @if (i < maxBadges) {
+ @switch (badge) {
+ @case ('lock') {
+ <span (click)="openLockDialog(f)"
+ tooltip="{{f.lock | fileLockFormatPipe}}"
+ placement="auto"
+ [style.font-size.px]="galleryMode.textSize"
+ class="badge bg-maroon cursor-pointer">
+ <fa-icon [icon]="f.lock.isExclusive ? icons.faLock : icons.faLockOpen"></fa-icon>
+ </span>
+ }
+ @case ('comments') {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.COMMENTS, true)"
+ [style.font-size.px]="galleryMode.textSize"
+ class="badge bg-success cursor-pointer">
+ <fa-icon [icon]="icons.faCommentDots"></fa-icon>
+ </span>
+ }
+ @case ('shares') {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
+ [style.font-size.px]="galleryMode.textSize"
+ class="badge bg-primary cursor-pointer">
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
+ {{ f.shares.length }}
+ </span>
+ }
+ @case ('spaces') {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
+ [style.font-size.px]="galleryMode.textSize"
+ class="badge bg-primary cursor-pointer">
+ <fa-icon [icon]="icons.SPACES"></fa-icon>
+ {{ f.spaces.length }}
+ </span>
+ }
+ @case ('links') {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
+ [style.font-size.px]="galleryMode.textSize"
+ class="badge bg-primary cursor-pointer">
+ <fa-icon [icon]="icons.LINKS"></fa-icon>
+ {{ f.links.length }}
+ </span>
+ }
+ @case ('syncs') {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
+ [style.font-size.px]="galleryMode.textSize"
+ class="badge bg-primary cursor-pointer">
+ <fa-icon [icon]="icons.SYNC"></fa-icon>
+ {{ f.syncs.length }}
+ </span>
+ }
+ }
+ }
}
- @if (f.shares.length) {
+ @if (hiddenBadges > 0) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
[style.font-size.px]="galleryMode.textSize"
class="badge bg-primary cursor-pointer">
- <fa-icon [icon]="icons.SHARES"></fa-icon>
- {{ f.shares.length }}
+ <fa-icon [icon]="icons.faCirclePlus"></fa-icon>
+ {{ hiddenBadges }}
</span>
}
- @if (f.spaces.length) {
- <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- [style.font-size.px]="galleryMode.textSize"
- class="badge bg-primary cursor-pointer ms-1">
- <fa-icon [icon]="icons.SPACES"></fa-icon>
- {{ f.spaces.length }}
- </span>
- }
- @if (f.links.length) {
- <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- [style.font-size.px]="galleryMode.textSize"
- class="badge bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.LINKS"></fa-icon>
- {{ f.links.length }}
- </span>
- }
- @if (f.syncs.length) {
- <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- [style.font-size.px]="galleryMode.textSize"
- class="badge bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.SYNC"></fa-icon>
- {{ f.syncs.length }}
- </span>
- }
- @if (f.hasComments) {
- <span (click)="layout.showRSideBarTab(TAB_MENU.COMMENTS, true)"
- [style.font-size.px]="galleryMode.textSize"
- class="badge bg-success cursor-pointer">
- <fa-icon [icon]="icons.faCommentDots"></fa-icon>
- </span>
- }
</span>
@if (f.root) {
<span class="label-bottom-left">
- <app-user-avatar [user]="f.root.owner" [height]="galleryMode.dimensions / 3" [width]="galleryMode.dimensions / 3" [fontSize]="galleryMode.faSize / 2"></app-user-avatar>
+ <app-user-avatar
+ [user]="f.root.owner"
+ [height]="galleryMode.dimensions / 3.5"
+ [width]="galleryMode.dimensions / 3.5"
+ [fontSize]="galleryMode.faSize / 2.5">
+ </app-user-avatar>
</span>
}
@if (f.newly) {
@@ -385,48 +406,48 @@
}
}
@case ('info') {
- @if (f.lock) {
- <span (click)="openLockDialog(f)"
- tooltip="{{f.lock | fileLockFormatPipe}}"
- placement="auto"
- class="badge bg-maroon cursor-pointer me-1">
+ @if (f.lock) {
+ <span (click)="openLockDialog(f)"
+ tooltip="{{f.lock | fileLockFormatPipe}}"
+ placement="auto"
+ 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 bg-primary cursor-pointer me-1">
+ }
+ @if (f.hasComments) {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.COMMENTS, true)"
+ class="badge bg-success cursor-pointer me-1">
+ <fa-icon [icon]="icons.faCommentDots"></fa-icon>
+ </span>
+ }
+ @if (f.shares.length) {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
+ class="badge bg-primary cursor-pointer me-1">
<fa-icon [icon]="icons.SHARES"></fa-icon>
- {{ f.shares.length }}
+ {{ f.shares.length }}
</span>
- }
- @if (f.links.length) {
- <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- class="badge bg-primary cursor-pointer me-1">
+ }
+ @if (f.links.length) {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
+ class="badge bg-primary cursor-pointer me-1">
<fa-icon [icon]="icons.LINKS"></fa-icon>
- {{ f.links.length }}
+ {{ f.links.length }}
</span>
- }
- @if (f.spaces.length) {
- <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- class="badge bg-primary cursor-pointer me-1">
+ }
+ @if (f.spaces.length) {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
+ class="badge bg-primary cursor-pointer me-1">
<fa-icon [icon]="icons.SPACES"></fa-icon>
- {{ f.spaces.length }}
+ {{ f.spaces.length }}
</span>
- }
- @if (f.syncs.length) {
- <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
- class="badge bg-primary cursor-pointer me-1">
+ }
+ @if (f.syncs.length) {
+ <span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
+ class="badge bg-primary cursor-pointer">
<fa-icon [icon]="icons.SYNC"></fa-icon>
- {{ f.syncs.length }}
+ {{ f.syncs.length }}
</span>
- }
- @if (f.hasComments) {
- <span (click)="layout.showRSideBarTab(TAB_MENU.COMMENTS, true)"
- class="badge bg-success cursor-pointer">
- <fa-icon [icon]="icons.faCommentDots"></fa-icon>
- </span>
- }
+ }
}
@case ('permissions') {
@if (f.root && f.root.permissions) {
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
index 8e0a2d0a..a3419fd5 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
@@ -11,6 +11,7 @@ import {
faArrowUp,
faBan,
faCircleInfo,
+ faCirclePlus,
faClipboardList,
faCommentDots,
faDownload,
@@ -127,6 +128,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
SYNC: SYNC_ICON.SYNC,
faArrowRotateRight,
faPlus,
+ faCirclePlus,
faFileAlt,
faGlobe,
faUpload,
@@ -523,6 +525,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
const s = r[1]
if (this.selection[0].id < 0) this.selection[0].id = s.file.id
this.selection[0].shares.push({ id: s.id, alias: s.alias, name: s.name, type: SHARE_TYPE.COMMON })
+ this.selection[0].updateNbBadges()
})
}
@@ -541,6 +544,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
if (action === 'add') {
if (this.selection[0].id < 0) this.selection[0].id = s.file.id
this.selection[0].links.push({ id: s.id, alias: s.alias, name: s.name, type: SHARE_TYPE.LINK })
+ this.selection[0].updateNbBadges()
}
})
}
@@ -555,6 +559,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
if (rootFile && f.spaces.map((s: Partial<SpaceModel>) => s.id).indexOf(up.space.id) === -1) {
if (f.id < 0) f.id = rootFile.id
f.spaces.push(up.space)
+ f.updateNbBadges()
}
}
})
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.html b/frontend/src/app/applications/spaces/components/spaces.component.html
index b05f2f66..d7ae5769 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces.component.html
@@ -90,10 +90,30 @@
@if (s.managers.length) {
<span class="label-bottom-left">
@for (m of s.managers; track m.mid) {
- <app-user-avatar [user]="m" [isMember]="true" [height]="galleryMode.dimensions / 3" [width]="galleryMode.dimensions / 3"></app-user-avatar>
+ <app-user-avatar
+ [user]="m"
+ [isMember]="true"
+ [height]="galleryMode.dimensions / 3.5"
+ [width]="galleryMode.dimensions / 3.5"
+ [fontSize]="galleryMode.faSize / 2.5">
+ </app-user-avatar>
}
</span>
}
+ <span class="label-bottom-right">
+ @if (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 bg-purple cursor-pointer me-1">
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
+ {{ s.counts.shares }}
+ </span>
+ }
+ </span>
</div>
<div class="card-footer text-center text-truncate p-1">
<span [style.font-size.px]="galleryMode.textSize" class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
diff --git a/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.html
index ea4fcd41..5f7b1b47 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-auth-manage-app-passwords-dialog.component.html
@@ -140,7 +140,7 @@
<div class="card-body p-2 d-flex flex-column gap-2">
<div class="d-flex align-items-center text-muted text-uppercase fs-3xs fw-semibold px-1 pt-1">
<span l10nTranslate>Existing passwords</span>
- <span class="badge bg-primary ms-auto">{{ appPasswords.length }}</span>
+ <span class="badge bg-secondary ms-auto">{{ appPasswords.length }}</span>
</div>
@for (p of appPasswords; track p.name) {
diff --git a/frontend/src/app/common/components/navigation-view/navigation-view.component.ts b/frontend/src/app/common/components/navigation-view/navigation-view.component.ts
index 37e6d81c..1ad06dd0 100644
--- a/frontend/src/app/common/components/navigation-view/navigation-view.component.ts
+++ b/frontend/src/app/common/components/navigation-view/navigation-view.component.ts
@@ -13,6 +13,7 @@ export interface ViewMode {
text: string
icon: IconDefinition
dimensions?: number
+ maxBadges?: number
image?: number
imageRes?: number
faSize?: number
@@ -35,11 +36,22 @@ export class NavigationViewComponent {
protected readonly icons = { faCog, faArrowDown, faArrowUp }
protected viewsMode: Record<string, ViewMode> = {
tl: { enabled: false, text: 'List', icon: faThList },
- th: { enabled: true, text: 'S', icon: faTh, dimensions: 96, image: 56, imageRes: 128, faSize: 30, textSize: 11, margins: 18 },
- thM: { enabled: true, text: 'M', icon: faTh, dimensions: 112, image: 72, imageRes: 192, faSize: 34, textSize: 11, margins: 18 },
- thL: { enabled: true, text: 'L', icon: faTh, dimensions: 152, image: 112, imageRes: 256, faSize: 50, textSize: 12, margins: 18 },
- thXl: { enabled: true, text: 'XL', icon: faTh, dimensions: 192, image: 152, imageRes: 512, faSize: 65, textSize: 13, margins: 18 },
- thXxl: { enabled: true, text: 'XXL', icon: faThLarge, dimensions: 232, image: 192, imageRes: 1024, faSize: 80, textSize: 14, margins: 18 }
+ th: { enabled: true, text: 'S', icon: faTh, maxBadges: 0, dimensions: 96, image: 56, imageRes: 128, faSize: 30, textSize: 11, margins: 18 },
+ thM: { enabled: true, text: 'M', icon: faTh, maxBadges: 1, dimensions: 112, image: 72, imageRes: 192, faSize: 34, textSize: 11, margins: 18 },
+ thL: { enabled: true, text: 'L', icon: faTh, maxBadges: 2, dimensions: 152, image: 112, imageRes: 256, faSize: 50, textSize: 12, margins: 18 },
+ thXl: { enabled: true, text: 'XL', icon: faTh, maxBadges: 6, dimensions: 192, image: 152, imageRes: 512, faSize: 65, textSize: 13, margins: 18 },
+ thXxl: {
+ enabled: true,
+ text: 'XXL',
+ icon: faThLarge,
+ maxBadges: 6,
+ dimensions: 232,
+ image: 192,
+ imageRes: 1024,
+ faSize: 80,
+ textSize: 14,
+ margins: 18
+ }
}
private readonly layout = inject(LayoutService)
diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scss
index eb08366e..be82d36f 100755
--- a/frontend/src/styles/components/_app.scss
+++ b/frontend/src/styles/components/_app.scss
@@ -32,6 +32,8 @@
);
--btn-chip-bg: #203255;
--btn-chip-active-bg: white;
+ --btn-chip-fg: white;
+ --btn-chip-hover-fg: white;
border-width: .5px !important;
}
.btn.btn-secondary {
diff --git a/frontend/src/styles/components/_badges.scss b/frontend/src/styles/components/_badges.scss
index a507914c..1acc29e3 100644
--- a/frontend/src/styles/components/_badges.scss
+++ b/frontend/src/styles/components/_badges.scss
@@ -91,7 +91,7 @@
}
fa-icon {
- font-size: $font-size-2xs;
+ font-size: $font-size-xs;
}
}
diff --git a/frontend/src/styles/components/_buttons.scss b/frontend/src/styles/components/_buttons.scss
index 5617445d..f740b263 100644
--- a/frontend/src/styles/components/_buttons.scss
+++ b/frontend/src/styles/components/_buttons.scss
@@ -121,7 +121,7 @@
}
.btn-xs {
- @include button-size($btn-padding-y-xs, $btn-padding-x-xs, $font-size-xs, $btn-border-radius-sm);
+ @include button-size($btn-padding-y-xs, $btn-padding-x-xs, $font-size-2xs, $btn-border-radius-sm);
}
.btn-xxs {
diff --git a/frontend/src/styles/components/_notifications.scss b/frontend/src/styles/components/_notifications.scss
index 3d39eef9..d475dd8a 100644
--- a/frontend/src/styles/components/_notifications.scss
+++ b/frontend/src/styles/components/_notifications.scss
@@ -67,6 +67,6 @@ $toast-dark-variants: (
}
.toast-top-right {
- top: 8px !important;
+ top: 5px !important;
right: calc($sidebar-apps-icons-width + 5px) !important;
}
\ No newline at end of file
diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss
index de80ce9c..984b80fa 100644
--- a/frontend/src/styles/variables.scss
+++ b/frontend/src/styles/variables.scss
@@ -137,7 +137,7 @@ $btn-border-radius-sm: .375rem;
// Badges
$badge-font-size: 89%;
$badge-font-weight: 500 !default;
-$badge-padding-x: .65rem !default;
+$badge-padding-x: .5rem !default;
$badge-padding-y: .35rem !default;
//$badge-padding-y: .25rem !default;
// Pagination