Skip to content

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

chore(frontend): improve sizing

johaven53e45fa41000
diff --git a/frontend/angular.json b/frontend/angular.json
index 313ff818..6eea2d7b 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -52,7 +52,7 @@
},
{
"type": "anyComponentStyle",
- "maximumWarning": "5kb",
+ "maximumWarning": "8kb",
"maximumError": "10kb"
}
],
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 4ad7694d..e9744cdf 100644
--- a/frontend/src/app/applications/admin/components/admin-groups.component.html
+++ b/frontend/src/app/applications/admin/components/admin-groups.component.html
@@ -1,14 +1,14 @@
<!--Start Top Menu-->
<div class="app-top-menu">
<button (click)="refresh()"
- class="d-none d-sm-block btn btn-sm btn-default me-1"
+ class="d-none d-sm-block btn btn-default me-1"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
type="button">
<fa-icon [icon]="icons.faRotate" [animation]="loading ? 'spin' : null"></fa-icon>
</button>
- <div class="btn-group btn-group-sm me-1" dropdown>
- <button class="btn btn-sm btn-default dropdown-toggle"
+ <div class="btn-group me-1" dropdown>
+ <button class="btn btn-default dropdown-toggle"
dropdownToggle
[tooltip]="'New' | translate:locale.language"
container="body"
@@ -30,7 +30,7 @@
</ul>
</div>
<button (click)="openDialog(false, true)"
- class="d-none d-sm-block btn btn-sm btn-default me-1"
+ class="d-none d-sm-block btn btn-default me-1"
[disabled]="!selected"
[tooltip]="(selected?.isUser ? 'Remove from group' : 'Delete group') | translate:locale.language"
container="body"
@@ -39,7 +39,7 @@
</button>
<button (click)="openDialog()"
[disabled]="!selected"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="(selected?.isGroup ? 'Edit group' : 'Edit user') | translate:locale.language"
container="body"
type="button">
@@ -50,14 +50,14 @@
[ngModel]="personalGroupsView"
(ngModelChange)="onPersonalGroupsView($event)"
type="button"
- class="btn btn-sm btn-custom me-1">
+ class="btn btn-custom me-1">
<div class="d-flex align-items-center">
<fa-icon [icon]="personalGroupsView ? icons.faToggleOn : icons.faToggleOff" class="me-2"></fa-icon>
<span l10nTranslate>Personal groups</span>
</div>
</button>
<!--Start Filter Button-->
- <div class="btn-group btn-group-sm">
+ <div class="btn-group">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
@@ -116,7 +116,7 @@
<fa-icon class="m-0" [icon]="icons.faKey"></fa-icon>
}
</span>
- <span class="no-pointer-events text-muted fs-3xs" draggable="false">{{ m.description }}</span>
+ <span class="no-pointer-events text-muted fs-xs" draggable="false">{{ m.description }}</span>
</div>
</div>
}
diff --git a/frontend/src/app/applications/admin/components/admin-groups.component.ts b/frontend/src/app/applications/admin/components/admin-groups.component.ts
index e03899af..abfc1054 100644
--- a/frontend/src/app/applications/admin/components/admin-groups.component.ts
+++ b/frontend/src/app/applications/admin/components/admin-groups.component.ts
@@ -232,7 +232,7 @@ export class AdminGroupsComponent {
}
})
} else {
- const modalRef: BsModalRef<AdminGroupDialogComponent> = this.layout.openDialog(AdminGroupDialogComponent, 'md', {
+ const modalRef: BsModalRef<AdminGroupDialogComponent> = this.layout.openDialog(AdminGroupDialogComponent, 'lg', {
initialState: { parentGroup: this.currentGroup } as AdminGroupDialogComponent
})
modalRef.content.groupChange.pipe(take(1)).subscribe((r: ['add' | 'update', AdminGroupModel]) => {
@@ -293,7 +293,7 @@ export class AdminGroupsComponent {
} else {
this.adminService.getGroup(this.selected.id).subscribe({
next: (group: AdminGroupModel) => {
- const modalRef: BsModalRef<AdminGroupDialogComponent> = this.layout.openDialog(AdminGroupDialogComponent, 'md', {
+ const modalRef: BsModalRef<AdminGroupDialogComponent> = this.layout.openDialog(AdminGroupDialogComponent, 'lg', {
initialState: { group: group, parentGroup: this.currentGroup } as AdminGroupDialogComponent
})
modalRef.content.groupChange.pipe(take(1)).subscribe((r: ['add' | 'update', AdminGroupModel]) => {
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 2d4b44e2..8267c926 100644
--- a/frontend/src/app/applications/admin/components/admin-users.component.html
+++ b/frontend/src/app/applications/admin/components/admin-users.component.html
@@ -1,14 +1,14 @@
<!--Start Top Menu-->
<div class="app-top-menu">
<button (click)="loadUsersOrGuests()"
- class="d-none d-sm-block btn btn-sm btn-default me-1"
+ class="d-none d-sm-block btn btn-default me-1"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
type="button">
<fa-icon [icon]="icons.faRotate" [animation]="loading ? 'spin' : null"></fa-icon>
</button>
<button (click)="openDialog(true)"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="(guestsView ? 'New guest' : 'New user') | translate:locale.language"
container="body"
type="button">
@@ -16,7 +16,7 @@
</button>
<button (click)="openDialog()"
[disabled]="!selected"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="(guestsView ? 'Edit guest' : 'Edit user') | translate:locale.language"
container="body"
type="button">
@@ -24,7 +24,7 @@
</button>
<button (click)="impersonateIdentity()"
[disabled]="!selected"
- class="d-none d-sm-block btn btn-sm btn-default me-1"
+ class="d-none d-sm-block btn btn-default me-1"
[tooltip]="'Impersonate identity' | translate:locale.language"
container="body"
type="button">
@@ -36,13 +36,13 @@
[ngModel]="guestsView"
(ngModelChange)="onGuestsView($event)"
type="button"
- class="btn btn-sm btn-custom me-1">
+ class="btn btn-custom me-1">
<div class="d-flex align-items-center">
<fa-icon [icon]="guestsView ? icons.faToggleOn : icons.faToggleOff" class="me-2"></fa-icon>
<span l10nTranslate>Guests</span>
</div>
</button>
- <div class="btn-group btn-group-sm">
+ <div class="btn-group">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
@@ -98,7 +98,7 @@
<fa-icon class="m-0" [icon]="icons.faKey"></fa-icon>
}
</span>
- <span class="no-pointer-events text-muted fs-3xs" draggable="false">{{ u.email }}</span>
+ <span class="no-pointer-events text-muted fs-xs" draggable="false">{{ u.email }}</span>
</div>
</div>
}
@@ -106,7 +106,7 @@
<div class="d-flex flex-column">
<span class="no-pointer-events" draggable="false">{{ u.fullName }}</span>
@if (u.isAdmin) {
- <span class="no-pointer-events text-muted fs-3xs" draggable="false" l10nTranslate>{{ u.userRoleText }}</span>
+ <span class="no-pointer-events text-muted" draggable="false" l10nTranslate>{{ u.userRoleText }}</span>
}
</div>
}
@@ -144,7 +144,7 @@
(focus)="u.currentAccessHover = true"
(mouseleave)="u.currentAccessHover = false">
@if (u.currentAccessHover) {
- <span class="d-flex flex-column fs-4xs">
+ <span class="d-flex flex-column fs-xs">
<span>{{ u.currentAccess | amDateFormat }}</span>
<span>{{ u.lastAccess | amDateFormat }}</span>
</span>
diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-group-add-users-dialog.component.html b/frontend/src/app/applications/admin/components/dialogs/admin-group-add-users-dialog.component.html
index 086b68bd..e14b4346 100644
--- a/frontend/src/app/applications/admin/components/dialogs/admin-group-add-users-dialog.component.html
+++ b/frontend/src/app/applications/admin/components/dialogs/admin-group-add-users-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faUserPlus" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faUserPlus"></fa-icon>
<span>{{ parentGroup.name }}</span>
</h4>
<h4 class="modal-title ms-auto">
@@ -17,9 +17,9 @@
</app-user-search>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="submitted || !newMembers.length" class="btn btn-sm btn-primary"
+ [disabled]="submitted || !newMembers.length" class="btn btn-primary"
type="button"
l10nTranslate>
Confirm
diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-group-delete-dialog.component.html b/frontend/src/app/applications/admin/components/dialogs/admin-group-delete-dialog.component.html
index 49c0a3ab..ddffe5c8 100644
--- a/frontend/src/app/applications/admin/components/dialogs/admin-group-delete-dialog.component.html
+++ b/frontend/src/app/applications/admin/components/dialogs/admin-group-delete-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="member.isUser ? icons.faUserMinus : icons.faMinus" class="me-2"></fa-icon>
+ <fa-icon [icon]="member.isUser ? icons.faUserMinus : icons.faMinus"></fa-icon>
<span>{{ member.name }}</span>
</h4>
<h4 class="modal-title ms-auto">
@@ -17,12 +17,12 @@
<fa-icon [icon]="icons.GROUPS" class="{{member.isPersonalGroup ? 'circle-purple-icon' : 'circle-primary-icon'}}"></fa-icon>
}
</div>
- <span class="fw-semibold me-1">{{ member.name | capitalize }}</span>
+ <span class="text-bold me-1">{{ member.name | capitalize }}</span>
<span l10nTranslate>will be removed</span>
@if (member.isUser) {
<div class="d-flex align-items-center">
<span class="mx-1" l10nTranslate>from the group</span>
- <span class="fw-semibold me-1">{{ parentGroup.name | capitalize }}</span>
+ <span class="text-bold me-1">{{ parentGroup.name | capitalize }}</span>
</div>
}
</div>
@@ -31,9 +31,9 @@
}
</div>
<div class="modal-footer">
- <button (click)="onClose()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onClose()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="submitted" class="btn btn-sm btn-danger"
+ [disabled]="submitted" class="btn btn-danger"
type="button"
l10nTranslate>
Remove
diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.html b/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.html
index 8d666d03..5bb068f9 100644
--- a/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.html
+++ b/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.html
@@ -1,10 +1,10 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
@if (group) {
- <fa-icon [icon]="icons.faPen" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faPen"></fa-icon>
<span>{{ group.name }}</span>
} @else {
- <fa-icon [icon]="icons.faPlus" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faPlus"></fa-icon>
<span l10nTranslate>New group</span>
}
</h4>
@@ -35,7 +35,7 @@
[autoSelect]="false"
formControlName="name"
[class.is-invalid]="groupForm.controls.name.invalid"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -43,7 +43,7 @@
<label class="form-label" for="description" l10nTranslate>Description</label>
<input id="description"
formControlName="description"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -56,13 +56,13 @@
<label class="form-label" for="visibility" l10nTranslate>Visibility</label>
<select id="visibility"
formControlName="visibility"
- class="form-control form-select form-select-sm">
+ class="form-control form-select">
@for (v of allVisibilities | keyvalue: originalOrderKeyValue; track v.value) {
<option [ngValue]="v.value" l10nTranslate>{{ v.key }}</option>
}
</select>
</div>
- <div class="fst-italic fs-2xs">
+ <div class="fst-italic fs-sm">
@switch (groupForm.value.visibility) {
@case (allVisibilities.Visible) {
<span l10nTranslate>All users can see this group.</span>
@@ -96,17 +96,17 @@
@if (group) {
<div class="card dialog-tab-card w-100">
<div class="card-body">
- <div class="row g-3 fs-2xs">
+ <div class="row g-3">
<div class="col-12 col-md-6">
<div class="d-flex flex-column">
<label class="form-label" for="created" l10nTranslate>Creation date</label>
- <div id="created">{{ group.createdAt | amDateFormat }}</div>
+ <div class="fs-sm" id="created">{{ group.createdAt | amDateFormat }}</div>
</div>
</div>
<div class="col-12 col-md-6">
<div class="d-flex flex-column text-md-end">
<label class="form-label" for="modified" l10nTranslate>Modification date</label>
- <div id="modified">{{ group.modifiedAt | amDateFormat }}</div>
+ <div class="fs-sm" id="modified">{{ group.modifiedAt | amDateFormat }}</div>
</div>
</div>
</div>
@@ -134,9 +134,9 @@
</tabset>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="submitted || groupForm.invalid" class="btn btn-sm btn-primary"
+ [disabled]="submitted || groupForm.invalid" class="btn btn-primary"
type="button"
l10nTranslate>
Confirm
diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-group-edit-user-dialog.component.html b/frontend/src/app/applications/admin/components/dialogs/admin-group-edit-user-dialog.component.html
index b16eb821..d8fb205a 100644
--- a/frontend/src/app/applications/admin/components/dialogs/admin-group-edit-user-dialog.component.html
+++ b/frontend/src/app/applications/admin/components/dialogs/admin-group-edit-user-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faUserPen" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faUserPen"></fa-icon>
<span>{{ user.name }}</span>
</h4>
<h4 class="modal-title ms-auto">
@@ -27,9 +27,9 @@
<small l10nTranslate>As a manager, the user will be able to manage group members but not group properties.</small>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="submitted" class="btn btn-sm btn-primary"
+ [disabled]="submitted" class="btn btn-primary"
type="button"
l10nTranslate>
Confirm
diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-user-delete-dialog.component.html b/frontend/src/app/applications/admin/components/dialogs/admin-user-delete-dialog.component.html
index 3019d946..edc22bab 100644
--- a/frontend/src/app/applications/admin/components/dialogs/admin-user-delete-dialog.component.html
+++ b/frontend/src/app/applications/admin/components/dialogs/admin-user-delete-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faUserMinus" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faUserMinus"></fa-icon>
<span>{{ user.fullName }}</span>
</h4>
@if (user) {
@@ -29,14 +29,14 @@
</div>
<div class="modal-footer">
<button (click)="onClose()"
- class="btn btn-sm btn-secondary ms-auto"
+ class="btn btn-secondary ms-auto"
data-dismiss="modal"
type="button"
l10nTranslate>
Cancel
</button>
<button (click)="onSubmit()"
- [disabled]="submitted" class="btn btn-sm btn-danger"
+ [disabled]="submitted" class="btn btn-danger"
type="button"
l10nTranslate>
Confirm
diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html b/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html
index cc4aa2c9..4f6b46db 100644
--- a/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html
+++ b/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html
@@ -1,10 +1,10 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
@if (user) {
- <fa-icon [icon]="icons.faUserPen" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faUserPen"></fa-icon>
<span>{{ user.fullName }}</span>
} @else {
- <fa-icon [icon]="icons.faUserPlus" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faUserPlus"></fa-icon>
<span l10nTranslate>New user</span>
}
@if (loading) {
@@ -39,7 +39,7 @@
[autoSelect]="false"
formControlName="login"
[class.is-invalid]="userForm.controls['login'].invalid"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -48,7 +48,7 @@
<input id="email"
formControlName="email"
[class.is-invalid]="userForm.controls['email'].invalid"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="email">
</div>
@@ -57,7 +57,7 @@
<input id="firstName"
formControlName="firstName"
[class.is-invalid]="userForm.controls['firstName'].invalid"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -65,7 +65,7 @@
<label class="form-label" for="lastName" l10nTranslate>Last name</label>
<input id="lastName"
formControlName="lastName"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -123,7 +123,7 @@
<label class="form-label" for="language" l10nTranslate>Language</label>
<select id="language"
formControlName="language"
- class="form-control form-select form-select-sm">
+ class="form-control form-select">
@for (l of languages; track $index) {
<option [ngValue]="l">{{ i18nLanguageText[l] }}</option>
}
@@ -134,7 +134,7 @@
<label class="form-label" for="notification" l10nTranslate>Notification</label>
<select id="notification"
formControlName="notification"
- class="form-control form-select form-select-sm">
+ class="form-control form-select">
@for (n of allNotifications; track $index) {
<option [ngValue]="allNotifications.indexOf(n)" l10nTranslate>{{ n }}</option>
}
@@ -160,17 +160,17 @@
@if (user) {
<div class="card dialog-tab-card w-100">
<div class="card-body">
- <div class="row g-3 fs-2xs">
+ <div class="row g-3">
<div class="col-12 col-md-5">
<div class="d-flex flex-column">
<label class="form-label" for="created" l10nTranslate>Creation date</label>
- <div id="created">{{ user.createdAt | amDateFormat }}</div>
+ <div class="fs-sm" id="created">{{ user.createdAt | amDateFormat }}</div>
</div>
</div>
<div class="col-12 col-md-7">
<div class="d-flex flex-column text-md-end">
<label class="form-label" for="access" l10nTranslate>Last accesses</label>
- <div id="access">
+ <div class="fs-sm" id="access">
@if (user.lastAccess) {
<div class="d-flex flex-column mb-2">
<span>{{ user.currentAccess | amDateFormat }}</span>
@@ -252,7 +252,7 @@
<fa-icon [icon]="icons.GROUPS" class="circle-primary-icon me-2"></fa-icon>
<span>{{ g.name }}</span>
</div>
- <div class="d-flex fs-2xs ms-auto">{{ g.permissions | split | join:true }}</div>
+ <div class="d-flex fs-xs ms-auto">{{ g.permissions | split | join:true }}</div>
</div>
}
}
@@ -288,13 +288,13 @@
@if (user?.id) {
<button (click)="confirmDeletion = true"
[disabled]="confirmDeletion"
- class="btn btn-sm btn-danger" type="button" l10nTranslate>
+ class="btn btn-danger" type="button" l10nTranslate>
Remove
</button>
}
- <button (click)="onCancel()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onCancel()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="userForm.invalid || submitted" class="btn btn-sm {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
+ [disabled]="userForm.invalid || submitted" class="btn {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
type="button"
l10nTranslate>
{{ confirmDeletion ? 'Confirm deletion' : 'Confirm' }}
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 200d423f..e5d9f7ce 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
@@ -1,5 +1,5 @@
<div class="sidebar-component-title">
- <div class="input-group mb-0">
+ <div class="input-group input-group-sm mb-0">
<input #CommentCreate
(keyup.enter)="postComment()"
[disabled]="!file()"
@@ -17,17 +17,17 @@
</div>
</div>
@if (comments.length) {
- <div appAutoResize class="fs-2xs p-2">
+ <div class="fs-sm p-2" appAutoResize>
@for (comment of comments; track comment.id) {
<div class="mb-1 app-small-card app-comment rounded">
<div class="d-flex px-2 pt-2 pb-1">
- <app-user-avatar [user]="comment.author" [width]="24" [height]="24"></app-user-avatar>
- <div class="align-self-center ms-1">
+ <app-user-avatar class="me-1" [user]="comment.author" [width]="24" [height]="24"></app-user-avatar>
+ <div class="align-self-center">
<b>{{ comment.author.isAuthor ? ('Me' | translate:locale.language) : comment.author.fullName }}</b>
</div>
- <div class="ms-auto align-self-center" style="font-size: 14px">
+ <div class="ms-auto align-self-center">
@if (comment.author.isAuthor || comment.isFileOwner) {
- <i (click)="onEditComment(comment)" class="cursor-pointer">
+ <i (click)="onEditComment(comment)" role="button" class="fs-md">
<fa-icon [icon]="icons.faEdit"></fa-icon>
</i>
}
@@ -35,25 +35,29 @@
</div>
<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>
+ <textarea #CommentUpdate
+ [ngModel]="comment.content"
+ [disabled]="!comment.author.isAuthor && comment.isFileOwner"
+ class="form-control mt-1 mb-2" required>
+ </textarea>
<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 flex-fill"
+ class="btn btn-xs btn-primary flex-fill"
role="button"
type="button"
l10nTranslate>
Update
</button>
<button (click)="onEditComment(comment)"
- class="btn btn-xxs btn-default flex-fill"
+ class="btn btn-xs btn-default flex-fill"
role="button"
type="button"
l10nTranslate>
Cancel
</button>
<button (click)="removeComment(comment)"
- class="btn btn-xxs btn-danger flex-fill"
+ class="btn btn-xs btn-danger flex-fill"
role="button"
type="button"
l10nTranslate>
@@ -65,7 +69,7 @@
<span (mouseleave)="comment.isHover = false"
(mouseover)="comment.isHover = true"
(focus)="comment.isHover = true"
- class="text-muted no-select pt-1 fs-3xs">
+ class="text-muted no-select pt-1 fs-2xs">
@if (comment.isHover) {
<span>{{ comment.dateToShow | amDateFormat }}</span>
} @else {
@@ -81,4 +85,3 @@
}
</div>
}
-
diff --git a/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.html b/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.html
index 3c16ea14..e20db783 100644
--- a/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.html
+++ b/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.html
@@ -14,7 +14,7 @@
@for (c of comments(); track c.id; let i = $index) {
<button type="button" class="recent-item-card" [style.animation-delay.ms]="i * 22" (click)="goToFile(c)">
<span class="recent-item-card__media">
- <app-user-avatar [user]="c.author" [container]="'body'" [width]="28" [height]="28"></app-user-avatar>
+ <app-user-avatar [user]="c.author" [container]="'body'" [width]="29" [height]="29"></app-user-avatar>
</span>
<span class="recent-item-card__content">
<span class="recent-item-card__title">{{ c.content }}</span>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-compression-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-compression-dialog.component.html
index 31e4d008..87d5a0f0 100755
--- a/frontend/src/app/applications/files/components/dialogs/files-compression-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-compression-dialog.component.html
@@ -6,13 +6,15 @@
} @else {
<span l10nTranslate>Compress and Download</span>
}
- <span class="fs-xs ms-1">({{ archiveProps.files.length }} {{ (archiveProps.files.length > 1 ? 'items' : 'item') | translate:locale.language }})</span>
</h4>
- <button (click)="layout.closeDialog()" aria-label="Close" class="btn-close btn-close-white" type="button"></button>
+ <h4 class="modal-title ms-auto">
+ <span class="fs-sm">{{ archiveProps.files.length }} {{ (archiveProps.files.length > 1 ? 'items' : 'item') | translate:locale.language }}</span>
+ </h4>
+ <button (click)="layout.closeDialog()" aria-label="Close" class="btn-close btn-close-white ms-2" type="button"></button>
</div>
<div class="modal-body">
- <div class="input-group input-group-sm">
- <input [(ngModel)]="archiveProps.name" appAutofocus class="form-control form-control-sm fs-xs" [placeholder]="'Archive name' | translate:locale.language" type="text">
+ <div class="input-group">
+ <input [(ngModel)]="archiveProps.name" appAutofocus class="form-control" [placeholder]="'Archive name' | translate:locale.language" type="text">
<div class="input-group-text">
<span style="min-width: 40px">.{{ archiveProps.extension }}</span>
</div>
@@ -22,7 +24,7 @@
<input [(ngModel)]="compression"
(ngModelChange)="setCompression($event)"
type="checkbox">
- <span class="fs-xs me-1" l10nTranslate>Enable compression</span>
+ <span class="me-1" l10nTranslate>Enable compression</span>
<small l10nTranslate>(this may take longer)</small>
</label>
</div>
@@ -30,12 +32,12 @@
<div class="form-check mb-0 mt-1 ps-0">
<label class="form-check-label ps-1">
<input [(ngModel)]="archiveProps.compressInDirectory" type="checkbox">
- <span class="fs-xs" l10nTranslate>Save in the current directory</span>
+ <span l10nTranslate>Save in the current directory</span>
</label>
</div>
}
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
- <button (click)="onSubmit()" [disabled]="!archiveProps.name || submitted" class="btn btn-sm btn-primary" l10nTranslate type="button">Confirm</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onSubmit()" [disabled]="!archiveProps.name || submitted" class="btn btn-primary" l10nTranslate type="button">Confirm</button>
</div>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-lock-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-lock-dialog.component.html
index dfdbfdac..e1a2702b 100755
--- a/frontend/src/app/applications/files/components/dialogs/files-lock-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-lock-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header">
<h4 class="modal-title">
- <fa-icon [icon]="hasExclusiveLock ? icons.faLock : icons.faUnlock" class="me-1"></fa-icon>
+ <fa-icon [icon]="hasExclusiveLock ? icons.faLock : icons.faUnlock"></fa-icon>
<span>{{ file.name }}</span>
</h4>
<button (click)="layout.closeDialog()" aria-label="Close" class="btn-close btn-close-white" type="button"></button>
@@ -22,15 +22,15 @@
}
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary" data-dismiss="modal" type="button" l10nTranslate>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" type="button" l10nTranslate>
{{ hasExclusiveLock ? 'Cancel' : 'Close' }}
</button>
@if (hasExclusiveLock) {
@if (isLockOwner || isFileOwner) {
- <button (click)="onUnlock()" [disabled]="submitted" class="btn btn-sm btn-primary" type="button" l10nTranslate>Unlock</button>
+ <button (click)="onUnlock()" [disabled]="submitted" class="btn btn-primary" type="button" l10nTranslate>Unlock</button>
}
@if (!isLockOwner) {
- <button (click)="onSendUnLockRequest()" [disabled]="submitted" class="btn btn-sm btn-success" type="button" l10nTranslate>Send an unlock request</button>
+ <button (click)="onSendUnLockRequest()" [disabled]="submitted" class="btn btn-success" type="button" l10nTranslate>Send an unlock request</button>
}
}
</div>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-new-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-new-dialog.component.html
index d983d9a9..ab96f62f 100755
--- a/frontend/src/app/applications/files/components/dialogs/files-new-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-new-dialog.component.html
@@ -11,13 +11,13 @@
<fa-icon [icon]="icons.faFileAlt"></fa-icon>
}
}
- <span class="ms-1" l10nTranslate>{{ fileProp.title }}</span>
+ <span l10nTranslate>{{ fileProp.title }}</span>
</h4>
<button (click)="layout.closeDialog()" aria-label="Close" class="btn-close btn-close-white" type="button"></button>
</div>
<div class="modal-body">
@if (inputType === 'file') {
- <div class="btn-group btn-group-sm mb-3" dropdown>
+ <div class="btn-group mb-3" dropdown>
<button aria-controls="dropdown-animated" class="btn btn-primary dropdown-toggle" dropdownToggle id="button-animated" type="button">
<span l10nTranslate>{{ selectedDocType }}</span>
<fa-icon [icon]="icons.faCaretDown" class="ms-3"></fa-icon>
@@ -30,7 +30,7 @@
</div>
}
@if (inputType === 'download') {
- <div class="input-group input-group-sm my-2">
+ <div class="input-group my-2">
<span class="input-group-text">
<fa-icon [icon]="icons.faGlobe"></fa-icon>
</span>
@@ -38,12 +38,12 @@
(keydown.control.v)="pasteUrl()"
(keydown.meta.v)="pasteUrl()"
[placeholder]="downloadProp.placeholder|translate:locale.language"
- class="form-control fs-xs"
+ class="form-control"
type="text"
appAutofocus>
</div>
}
- <div class="input-group input-group-sm my-2">
+ <div class="input-group my-2">
<span class="input-group-text">
@if (inputType === 'directory') {
<fa-icon [icon]="icons.faFolderClosed"></fa-icon>
@@ -54,19 +54,19 @@
<input #InputText
[(ngModel)]="fileProp.name"
[placeholder]="fileProp.placeholder|translate:locale.language"
- class="form-control fs-xs"
+ class="form-control"
type="text"
appAutofocus>
</div>
</div>
<div class="modal-footer">
@if (error) {
- <span class="me-auto fs-xs text-danger" l10nTranslate>{{ error }}</span>
+ <span class="me-auto fs-sm text-danger" l10nTranslate>{{ error }}</span>
}
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
[disabled]="!fileProp.name || inputType === 'download' && !downloadProp.url || submitted"
- class="btn btn-sm btn-primary"
+ class="btn btn-primary"
type="button"
l10nTranslate>Confirm
</button>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-overwrite-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-overwrite-dialog.component.html
index 1ecc1612..49b8136a 100755
--- a/frontend/src/app/applications/files/components/dialogs/files-overwrite-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-overwrite-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header">
- <h4 class="modal-title" l10nTranslate>
- <fa-icon [icon]="icons.faFileShield" class="me-1"></fa-icon>
+ <h4 class="modal-title">
+ <fa-icon [icon]="icons.faFileShield"></fa-icon>
@if (renamedTo) {
<span l10nTranslate>Replace Existing File</span>
} @else {
@@ -13,7 +13,7 @@
@if (renamedTo) {
<div [innerHTML]="'RenameFileToExisting' | translate:locale.language:{ old: files[0].name, new: renamedTo }"></div>
} @else {
- <div class="fw-semibold mb-3" l10nTranslate>Do you want to replace the existing file(s)?</div>
+ <div class="text-bold mb-3" l10nTranslate>Do you want to replace the existing file(s)?</div>
@for (f of files; track $index) {
<div class="d-flex align-items-center mb-1" draggable="true">
<img [src]="f.mimeUrl" alt="" height="24" width="24" (error)="f.fallBackMimeUrl()">
@@ -25,6 +25,6 @@
}
</div>
<div class="modal-footer">
- <button (click)="onAction(false)" class="btn btn-sm btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
- <button (click)="onAction(true)" [disabled]="submitted" class="btn btn-sm btn-danger" type="button" l10nTranslate>Confirm</button>
+ <button (click)="onAction(false)" class="btn btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onAction(true)" [disabled]="submitted" class="btn btn-danger" type="button" l10nTranslate>Confirm</button>
</div>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-trash-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-trash-dialog.component.html
index 3bed365d..d6498eb9 100755
--- a/frontend/src/app/applications/files/components/dialogs/files-trash-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-trash-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header">
- <h4 class="modal-title" l10nTranslate>
- <fa-icon [icon]="icons.faTrashCan" class="me-1"></fa-icon>
+ <h4 class="modal-title">
+ <fa-icon [icon]="icons.faTrashCan"></fa-icon>
<span l10nTranslate>Trash</span>
@if (submitted) {
<fa-icon [icon]="icons.faSpinner" animation="spin" class="ms-2"></fa-icon>
@@ -25,6 +25,6 @@
</div>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
- <button (click)="onSubmit()" [disabled]="submitted" class="btn btn-sm btn-danger" type="button" l10nTranslate>Confirm</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onSubmit()" [disabled]="submitted" class="btn btn-danger" type="button" l10nTranslate>Confirm</button>
</div>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-trash-empty-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-trash-empty-dialog.component.html
index 407ea469..0b797faf 100755
--- a/frontend/src/app/applications/files/components/dialogs/files-trash-empty-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-trash-empty-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header">
- <h4 class="modal-title" l10nTranslate>
- <fa-icon [icon]="icons.faTrashCan" class="me-1"></fa-icon>
+ <h4 class="modal-title">
+ <fa-icon [icon]="icons.faTrashCan"></fa-icon>
<span l10nTranslate>Trash</span>
@if (submitted) {
<fa-icon [icon]="icons.faSpinner" animation="spin" class="ms-2"></fa-icon>
@@ -13,6 +13,6 @@
<small l10nTranslate>All items will be permanently deleted</small>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
- <button (click)="onSubmit()" [disabled]="submitted" class="btn btn-sm btn-danger" type="button" l10nTranslate>Confirm</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onSubmit()" [disabled]="submitted" class="btn btn-danger" type="button" l10nTranslate>Confirm</button>
</div>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-tree-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-tree-dialog.component.html
index 1ed11a13..add22b36 100644
--- a/frontend/src/app/applications/files/components/dialogs/files-tree-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-tree-dialog.component.html
@@ -27,8 +27,8 @@
@if (errorSelection) {
<span class="me-auto fs-sm text-danger text-truncate">{{ errorSelection }}</span>
}
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
- <button (click)="onSubmit()" [disabled]="!selection" class="btn btn-sm btn-primary" type="button" l10nTranslate>Confirm</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onSubmit()" [disabled]="!selection" class="btn btn-primary" type="button" l10nTranslate>Confirm</button>
</div>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html
index 5da9370d..e95c72ff 100644
--- a/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html
@@ -1,7 +1,7 @@
<div class="modal-header">
<h4 class="modal-title">
<fa-icon [icon]="isReadonly() ? icons.faEye : icons.faPen"></fa-icon>
- <span class="ms-2">{{ currentFile.name }}</span>
+ <span>{{ currentFile.name }}</span>
</h4>
<button (click)="onMinimize()" aria-label="Minimize" class="btn-minimize btn-minimize-white" type="button"></button>
<button (click)="onClose()" aria-label="Close" class="btn-close btn-close-white ms-3" type="button"></button>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.html
index ed243a27..ad966a0b 100755
--- a/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faFile" class="me-1"></fa-icon>
+ <fa-icon [icon]="icons.faFile"></fa-icon>
<span>{{ file.name }}</span>
</h4>
<button
@@ -27,8 +27,8 @@
<fa-icon [icon]="icons.faFileLines"></fa-icon>
</div>
<div class="flex-grow-1">
- <h5 class="mb-1">Collabora</h5>
- <div class="text-muted small" l10nTranslate>
+ <h3 class="text-bold mb-1">Collabora</h3>
+ <div class="text-muted fs-2xs" l10nTranslate>
Open-source office suite built on LibreOffice.
</div>
</div>
@@ -48,8 +48,8 @@
<fa-icon [icon]="icons.faFileWord"></fa-icon>
</div>
<div class="flex-grow-1">
- <h5 class="mb-1">OnlyOffice</h5>
- <div class="text-muted small" l10nTranslate>
+ <h3 class="text-bold mb-1">OnlyOffice</h3>
+ <div class="text-muted fs-2xs" l10nTranslate>
Open-source office suite for Microsoft Office.
</div>
</div>
@@ -65,7 +65,7 @@
id="rememberEditor"
[(ngModel)]="rememberChoice"
/>
- <label class="form-check-label" for="rememberEditor" l10nTranslate>
+ <label class="form-check-label fs-sm" for="rememberEditor" l10nTranslate>
Remember my choice for next time
</label>
</div>
diff --git a/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.scss b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.scss
index 1abf531d..ffa98b8e 100644
--- a/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.scss
+++ b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.scss
@@ -79,10 +79,10 @@
border-radius: 16px;
display: grid;
place-items: center;
- font-size: 22px;
+ font-size: calc(var(--font-size-base) * 1.4666667);
}
.editor-badge.collabora {
background-color: #e7c3ee;
color: #9a4bb4;
-}
\ No newline at end of file
+}
diff --git a/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.html b/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.html
index c3704970..a6a8e02d 100644
--- a/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.html
+++ b/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.html
@@ -6,19 +6,19 @@
placement="left">
</fa-icon>
<span l10nTranslate>Clipboard</span>
- <button (click)="clearAll()" class="btn btn-xs btn-default">
+ <button (click)="clearAll()" class="btn btn-default">
<fa-icon [icon]="icons.faTrashCan"></fa-icon>
</button>
</div>
@if (files.length) {
<div class="px-2 pt-2 pb-2 fs-xs">
<div class="d-flex justify-content-between mt-2">
- <select [(ngModel)]="selectedAction" class="form-select form-select-sm my-auto">
+ <select [(ngModel)]="selectedAction" class="form-select my-auto">
@for (item of operations| keyvalue: originalOrderKeyValue; track item.key) {
<option [ngValue]="item.key" l10nTranslate>{{ item.value.text }}</option>
}
</select>
- <button (click)="doAction()" class="btn btn-xxs btn-primary ms-1" type="button" l10nTranslate>Confirm</button>
+ <button (click)="doAction()" class="btn btn-xs btn-primary ms-1" type="button" l10nTranslate>Confirm</button>
</div>
</div>
<hr class="mx-0 mt-2 mb-0">
@@ -27,12 +27,12 @@
<div class="sidebar-item-container">
<div class="sidebar-item-content" [tooltip]="f.path">
<img [src]="f.mimeUrl" alt="" class="me-1" height="28" width="auto" (error)="f.fallBackMimeUrl()">
- <div class="text-truncate fs-2xs">{{ f.name }}</div>
- <button (click)="remove(f)" class="btn btn-xxs btn-danger ms-auto">
+ <div class="text-truncate fs-sm">{{ f.name }}</div>
+ <button (click)="remove(f)" class="btn btn-xs btn-danger ms-auto">
<fa-icon [icon]="icons.faTimes"></fa-icon>
</button>
</div>
</div>
}
</div>
-}
\ No newline at end of file
+}
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 08698134..4ef6526d 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
@@ -1,8 +1,8 @@
@if (files().length) {
@if (multiple()) {
- <div class="px-2 pt-2 pb-0 fs-2xs">
+ <div class="fs-sm">
<div class="d-flex justify-content-center mt-2">
- <button (click)="addToClipboard()" class="btn btn-xs btn-primary me-1" type="button" l10nTranslate>
+ <button (click)="addToClipboard()" class="btn btn-sm btn-primary me-1" type="button" l10nTranslate>
<fa-icon [icon]="icons.faClipboardCheck"></fa-icon>
Send to Clipboard
</button>
@@ -10,7 +10,7 @@
</div>
<hr class="mx-0 mt-2 mb-0">
}
- <div appAutoResize class="fs-2xs" [resizeOffset]=resizeOffset()>
+ <div appAutoResize class="fs-sm" [resizeOffset]=resizeOffset()>
@if (multiple()) {
<div class="flex-column p-2 w-100">
@for (f of files(); track f.id) {
@@ -40,32 +40,30 @@
</div>
</div>
<hr class="my-1" />
- <div class="p-2">
+ <div class="fs-sm p-2">
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Name</div>
- <div class="word-break-all fs-2xs">{{ f.name }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Name</div>
+ <div class="word-break-all">{{ f.name }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Size</div>
- <div class="fs-2xs">
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Size</div>
@let size = (getSizeLazy(f) | async);
@if (size === null) {
<fa-icon [icon]="icons.faSpinner" animation="spin-pulse"></fa-icon>
} @else {
{{ size }}
}
- </div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Created</div>
- <div class="fs-2xs">{{ f.ctime | amDateFormat }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Created</div>
+ <div>{{ f.ctime | amDateFormat }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Modified</div>
- <div class="fs-2xs">{{ f.mtime | amDateFormat }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Modified</div>
+ <div>{{ f.mtime | amDateFormat }}</div>
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Lock</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Lock</div>
@if (f.lock) {
@if (f.lock.isExclusive) {
<span class="badge bg-maroon" l10nTranslate>
@@ -83,8 +81,8 @@
}
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Shared</div>
- <div class="d-flex col-sm-7">
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Shared</div>
+ <div class="d-flex col-7 col-sm-7">
@if (f.shares.length || f.links.length) {
<span class="badge bg-primary">
<fa-icon [icon]="icons.SHARES"></fa-icon>
@@ -96,7 +94,7 @@
</div>
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Anchored</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Anchored</div>
@if (f.spaces.length) {
<span class="badge bg-primary">
<fa-icon [icon]="icons.SPACES"></fa-icon>
@@ -106,13 +104,13 @@
}
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Synced</div>
+ <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'}}">
{{ (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-semibold" l10nTranslate>Comments</div>
+ <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">
{{ (f.hasComments ? 'yes' : 'no') | translate:locale.language }}
</span>
@@ -123,12 +121,12 @@
<div class="p-2">
@if (f.root.owner) {
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Owner</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Owner</div>
<app-user-avatar [user]="f.root.owner" [height]="26" [width]="26" tooltipPlacement="bottom"></app-user-avatar>
</div>
}
<div class="d-flex align-items-center">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Permissions</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Permissions</div>
@if (f.root.permissions) {
<app-badge-permissions [permissions]="f.root.hPerms"></app-badge-permissions>
} @else {
@@ -139,7 +137,7 @@
}
@if (f.lock || f.spaces.length || f.shares.length || f.links.length || f.syncs.length) {
<hr class="mt-1 mb-2" />
- <div class="d-flex flex-wrap align-items-center p-2 fs-xs">
+ <div class="d-flex flex-wrap align-items-center p-2 fs-sm">
@if (f.lock) {
<div (click)="openLockDialog(f)"
class="badge white-space-normal bg-maroon cursor-pointer mb-2">
@@ -178,6 +176,3 @@
</div>
}
-
-
-
diff --git a/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts b/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts
index 1698db66..ff3dd8f6 100755
--- a/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts
+++ b/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts
@@ -10,7 +10,7 @@ import { BadgePermissionsComponent } from '../../../../common/components/badge-p
import { AutoResizeDirective } from '../../../../common/directives/auto-resize.directive'
import { TimeDateFormatPipe } from '../../../../common/pipes/time-date-format.pipe'
import { convertBytesToText } from '../../../../common/utils/functions'
-import { defaultCardImageSize } from '../../../../layout/layout.constants'
+import { defaultCardImageSize, defaultResizeOffset } from '../../../../layout/layout.constants'
import { TAB_MENU } from '../../../../layout/layout.interfaces'
import { LayoutService } from '../../../../layout/layout.service'
import { SPACES_ICON, SPACES_PATH } from '../../../spaces/spaces.constants'
@@ -44,7 +44,7 @@ export class FilesSelectionComponent {
files: InputSignal<FileModel[]> = input.required<FileModel[]>()
protected readonly locale = inject<L10nLocale>(L10N_LOCALE)
protected multiple: Signal<boolean> = computed(() => this.files().length > 1)
- protected resizeOffset: Signal<number> = computed(() => (this.multiple() ? 120 : 80))
+ protected resizeOffset: Signal<number> = computed(() => defaultResizeOffset + (this.multiple() ? 40 : 0))
protected readonly cardImageSize = defaultCardImageSize
protected readonly icons = {
SPACES: SPACES_ICON.SPACES,
diff --git a/frontend/src/app/applications/files/components/sidebar/files-tasks.component.html b/frontend/src/app/applications/files/components/sidebar/files-tasks.component.html
index 231402fd..e078bf56 100644
--- a/frontend/src/app/applications/files/components/sidebar/files-tasks.component.html
+++ b/frontend/src/app/applications/files/components/sidebar/files-tasks.component.html
@@ -17,7 +17,7 @@
}
</div>
@if (nbTotalTasks) {
- <button (click)="removeTasks()" class="btn btn-xs btn-default">
+ <button (click)="removeTasks()" class="btn btn-default">
<fa-icon [icon]="icons.faTrashAlt"></fa-icon>
</button>
} @else {
@@ -28,8 +28,8 @@
<div appAutoResize>
@for (task of tasks; track task.id) {
<div class="task-list">
- <div (click)="goToFile(task)" [tooltip]="task.result | translate:locale.language" class="px-2 py-1 text-truncate" placement="bottom">
- <span [class.text-gray-dark]="task.status < 2" [class.text-danger]="task.status >= 2">
+ <div (click)="goToFile(task)" [tooltip]="task.result | translate:locale.language" class="text-truncate" placement="bottom">
+ <span [class.text-danger]="task.status >= 2">
<fa-icon [icon]="iconsStatus[task.status]" [animation]="task.status === 0 ? 'spin-pulse' : null"></fa-icon>
<b><fa-icon [icon]="iconsOperation[task.type]" class="me-1"></fa-icon></b>
<span>{{ task.name }}</span>
@@ -37,7 +37,7 @@
<span>&nbsp;:&nbsp;{{ task.result | translate:locale.language }}</span>
}
</span>
- <div class="fs-3xs">
+ <div class="mt-1 fs-sm">
<progressbar [max]="100"
[value]="task.status > 0 ? 100 : task.props.progress || 100"
[type]="task.status < 1 ? 'warning' : task.status === 2 ? 'danger' : null"
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 ced7f849..2a532951 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
@@ -1,19 +1,19 @@
@if (sideBarHeader) {
<div class="sidebar-component-title">
- <button (click)="onRefresh()" class="btn btn-xs btn-default">
+ <button (click)="onRefresh()" class="btn btn-default">
<fa-icon [icon]="icons.faArrowRotateRight"></fa-icon>
</button>
@if (errorMsg) {
- <span class="text-danger fs-3xs p-1" l10nTranslate>{{ errorMsg }}</span>
+ <span class="text-danger fs-sm p-1" l10nTranslate>{{ errorMsg }}</span>
} @else {
<span l10nTranslate>Navigation Tree</span>
}
</div>
}
@if (copyMoveOn) {
- <div class="bg-white px-2 pt-2 pb-0 fs-2xs">
+ <div class="bg-white px-2 pt-2 pb-0 fs-sm">
<div class="text-start text-truncate">
- <span class="fs-2xs fw-semibold me-2" l10nTranslate><span l10nTranslate>Source</span>:</span>
+ <span class="fs-sm text-bold me-2" l10nTranslate><span l10nTranslate>Source</span>:</span>
@switch (store.filesSelection().length) {
@case (1) {
<span>
@@ -22,7 +22,7 @@
}
@case (0) {
<span>
- <fa-icon [icon]="icons.faQuestion" class="fw-semibold me-1"></fa-icon>
+ <fa-icon [icon]="icons.faQuestion" class="text-bold me-1"></fa-icon>
</span>
}
@default {
@@ -33,13 +33,13 @@
}
</div>
<div class="text-start text-truncate mt-1">
- <span class="fs-2xs fw-semibold me-2" l10nTranslate><span l10nTranslate>Destination</span>:</span>
+ <span class="fs-sm text-bold me-2" l10nTranslate><span l10nTranslate>Destination</span>:</span>
<span>{{ selection?.data.name || '' }}</span>
</div>
<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"
+ class="btn btn-xs btn-warning flex-fill"
type="button"
l10nTranslate>
<fa-icon [icon]="icons.faArrowsAlt"></fa-icon>
@@ -47,14 +47,14 @@
</button>
<button (click)="actionCopy()"
[disabled]="!selection || !store.filesSelection().length || !dstAllowed"
- class="btn btn-xxs btn-primary flex-fill"
+ class="btn btn-xs btn-primary flex-fill"
type="button"
l10nTranslate>
<fa-icon [icon]="icons.faClone"></fa-icon>
Copy
</button>
<button (click)="actionCancel()"
- class="btn btn-xxs btn-secondary flex-fill"
+ class="btn btn-xs btn-secondary flex-fill"
type="button"
l10nTranslate>
<fa-icon [icon]="icons.faTimes"></fa-icon>
@@ -84,7 +84,7 @@
</ng-template>
<ng-template #loadingTemplate>
<span>
- <fa-icon [icon]="icons.faSpinner" animation="spin" class="fw-semibold"></fa-icon>
+ <fa-icon [icon]="icons.faSpinner" animation="spin" class="text-bold"></fa-icon>
</span>
</ng-template>
</tree-root>
diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-image.component.html b/frontend/src/app/applications/files/components/viewers/files-viewer-image.component.html
index 455f6f30..131a6e08 100644
--- a/frontend/src/app/applications/files/components/viewers/files-viewer-image.component.html
+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-image.component.html
@@ -5,7 +5,7 @@
[tooltip]="'Previous' | translate:locale.language"
[adaptivePosition]="true"
container="body"
- class="btn btn-sm btn-custom me-1"
+ class="btn btn-custom me-1"
type="button">
<fa-icon [icon]="icons.faAngleLeft"></fa-icon>
</button>
@@ -13,7 +13,7 @@
(click)="nextImage()"
[tooltip]="'Next' | translate:locale.language"
container="body"
- class="btn btn-sm btn-custom me-1"
+ class="btn btn-custom me-1"
type="button">
<fa-icon [icon]="icons.faAngleRight"></fa-icon>
</button>
@@ -22,7 +22,7 @@
(click)="startSlideshow()"
[tooltip]="'Start Slideshow' | translate:locale.language"
container="body"
- class="btn btn-sm btn-custom me-1"
+ class="btn btn-custom me-1"
type="button">
<fa-icon [icon]="icons.faPlay"></fa-icon>
</button>
@@ -31,7 +31,7 @@
(click)="stopSlideshow()"
[tooltip]="'Stop slideshow' | translate:locale.language"
container="body"
- class="btn btn-sm btn-custom me-1"
+ class="btn btn-custom me-1"
type="button">
<fa-icon [icon]="icons.faStop"></fa-icon>
</button>
@@ -40,7 +40,7 @@
(click)="fullscreen()"
[tooltip]="'Fullscreen' | translate:locale.language"
container="body"
- class="btn btn-sm btn-custom me-1"
+ class="btn btn-custom me-1"
type="button">
<fa-icon [icon]="icons.faExpand"></fa-icon>
</button>
@@ -51,7 +51,7 @@
[(ngModel)]="isInfoboxOpen"
[tooltip]="'Info' | translate:locale.language"
container="body"
- class="d-none d-sm-block btn btn-sm btn-custom me-1"
+ class="d-none d-sm-block btn btn-custom me-1"
type="button">
<fa-icon [icon]="icons.faInfo"></fa-icon>
</button>
@@ -63,15 +63,15 @@
alt="" />
<div class="info-box p-2 m-2 d-flex flex-column app-small-card rounded opacity-75" [class.d-none]="!isInfoboxOpen()">
<div class="d-flex mb-1">
- <div class="d-flex col-sm fw-semibold">{{ 'Type' | translate:locale.language }}</div>
+ <div class="d-flex col-sm text-bold">{{ 'Type' | translate:locale.language }}</div>
<div>{{ file().mime }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm fw-semibold">{{ 'Dimensions' | translate:locale.language }}</div>
+ <div class="d-flex col-sm text-bold">{{ 'Dimensions' | translate:locale.language }}</div>
<div>{{ imageResolution() }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm fw-semibold">{{ 'Size' | translate:locale.language }}</div>
+ <div class="d-flex col-sm text-bold">{{ 'Size' | translate:locale.language }}</div>
<div>{{ file().hSize }}</div>
</div>
</div>
diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.html b/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.html
index a791fe5a..1c2d485f 100644
--- a/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.html
+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.html
@@ -4,7 +4,7 @@
(click)="toggleReadonly()"
[tooltip]="(isReadonly() || !isWriteable() ? 'Read-only' : 'Read-write') | translate:locale.language"
[adaptivePosition]="true"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
type="button"
[disabled]="!isSupported() || !isWriteable()">
<fa-icon [icon]="isReadonly() ? icons.faLock : icons.faLockOpen"></fa-icon>
@@ -13,7 +13,7 @@
(click)="save()"
[tooltip]="(isReadonly() || !isWriteable() || !isModified() ? undefined : 'Save') | translate:locale.language"
[isDisabled]="isReadonly() || !isWriteable() || !isModified()"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
type="button"
[disabled]="isReadonly() || !isWriteable() || !isModified()">
@if (isSaving()) {
@@ -26,7 +26,7 @@
(click)="onUndo()"
[disabled]="!canUndo()"
[tooltip]="'Undo' | translate:locale.language"
- class="d-none d-sm-block btn btn-sm btn-custom me-1"
+ class="d-none d-sm-block btn btn-custom me-1"
type="button">
<fa-icon [icon]="icons.faReply"></fa-icon>
</button>
@@ -34,7 +34,7 @@
(click)="onRedo()"
[disabled]="!canRedo()"
[tooltip]="'Redo' | translate:locale.language"
- class="d-none d-sm-block btn btn-sm btn-custom me-1"
+ class="d-none d-sm-block btn btn-custom me-1"
type="button">
<fa-icon [icon]="icons.faShare"></fa-icon>
</button>
@@ -43,7 +43,7 @@
[ngModel]="lineWrapping()"
(ngModelChange)="lineWrapping.set($event)"
[tooltip]="'Line Wrap' | translate:locale.language"
- class="d-none d-sm-block btn btn-sm btn-custom me-1"
+ class="btn btn-custom me-1"
type="button">
<fa-icon [icon]="icons.faArrowsLeftRightToLine"></fa-icon>
</button>
@@ -52,23 +52,23 @@
[ngModel]="isSearchPanelOpen()"
(ngModelChange)="toggleSearch()"
[tooltip]="'Search' | translate:locale.language"
- class="d-none d-sm-block btn btn-sm btn-custom"
+ class="d-none d-sm-block btn btn-custom"
type="button">
<fa-icon [icon]="icons.faMagnifyingGlass"></fa-icon>
</button>
@if (warnOnUnsavedChanges()) {
<button (click)="save(true)"
- class="btn btn-sm btn-primary me-2 ms-auto"
+ class="btn btn-primary me-2 ms-auto"
type="button"
l10nTranslate>Save And Exit
</button>
<button (click)="onClose()"
- class="btn btn-sm btn-danger me-2"
+ class="btn btn-danger me-2"
data-dismiss="modal" type="button"
l10nTranslate>Close Without Saving
</button>
<button (click)="warnOnUnsavedChanges.set(false)"
- class="d-none d-sm-block btn btn-sm btn-default"
+ class="d-none d-sm-block btn btn-default"
data-dismiss="modal" type="button"
l10nTranslate>Cancel
</button>
diff --git a/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.scss b/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.scss
index 92ba6a73..91b5f75e 100644
--- a/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.scss
+++ b/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.scss
@@ -5,7 +5,7 @@
}
.recent-item-card__media img {
- width: 1.1rem;
- height: 1.1rem;
+ width: 1.15rem;
+ height: 1.15rem;
object-fit: contain;
}
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 1e2d3a59..d1c27274 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
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.links" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.links"></fa-icon>
<span>{{ linkForm.value.name || linkForm.value.shareName }}</span>
</h4>
<h4 class="modal-title ms-auto">
@@ -22,7 +22,7 @@
<fa-icon [icon]="icons.links" class="circle-primary-icon me-2"></fa-icon>
<div class="d-flex flex-column text-truncate">
<span class="text-truncate">{{ linkForm.value.name || linkForm.value.shareName }}</span>
- <span class="fs-3xs text-truncate">{{ linkForm.value.email }}</span>
+ <span class="fs-sm text-truncate">{{ linkForm.value.email }}</span>
</div>
</div>
@if (share) {
@@ -48,7 +48,7 @@
}
}
<button (click)="copyToClipboard()"
- class="btn btn-sm {{linkWasCopied ? 'bg-info' : 'btn-default'}}"
+ class="btn btn-sm {{linkWasCopied ? 'btn-primary' : 'btn-default'}}"
[tooltip]="'Copy link' | translate:locale.language"
container="body"
type="button">
@@ -64,7 +64,7 @@
<div class="col-12 col-lg-6 d-flex flex-column gap-3">
<div class="card dialog-tab-card">
<div class="card-body d-flex flex-column">
- <div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Link identity</div>
+ <div class="text-muted text-uppercase fs-sm text-bold mb-2" l10nTranslate>Link identity</div>
<div class="d-flex align-items-center cursor-pointer border-bottom py-2"
(mouseover)="linkIsHovered = true"
@@ -105,7 +105,7 @@
</div>
<div class="card dialog-tab-card">
<div class="card-body d-flex flex-column">
- <div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Access rules</div>
+ <div class="text-muted text-uppercase fs-sm text-bold mb-2" l10nTranslate>Access rules</div>
<div class="d-flex align-items-center border-bottom py-2">
<span class="form-label mb-0" l10nTranslate>Current access count</span>
@@ -126,7 +126,7 @@
formControlName="limitAccess"
min="1"
type="number"
- class="form-control form-control-sm"
+ class="form-control"
[placeholder]="'Unlimited' | translate:locale.language">
</div>
</div>
@@ -139,7 +139,7 @@
formControlName="expiresAt"
placement="left"
type="text"
- class="form-control form-control-sm"
+ class="form-control"
[class.text-danger]="linkIsExpired"
[placeholder]="'Never expires' | translate:locale.language"
[bsConfig]="{
@@ -155,7 +155,7 @@
</div>
<div class="card dialog-tab-card">
<div class="card-body d-flex flex-column">
- <div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Security</div>
+ <div class="text-muted text-uppercase fs-sm text-bold mb-2" l10nTranslate>Security</div>
<div class="card dialog-check-card dialog-check-card--interactive"
[class.dialog-check-card--active]="linkForm.value.requireAuth"
(click)="toggleRequireAuth()">
@@ -198,14 +198,14 @@
@if (share) {
<div class="card dialog-tab-card">
<div class="card-body d-flex flex-column">
- <div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Share details</div>
+ <div class="text-muted text-uppercase fs-sm text-bold mb-2" l10nTranslate>Share details</div>
<div class="row g-2 align-items-center mb-2">
<label class="form-label col-5 mb-0" for="shareName" l10nTranslate>Share name</label>
<div class="col-7">
<input id="shareName"
formControlName="shareName"
type="text"
- class="form-control form-control-sm"
+ class="form-control"
[class.is-invalid]="linkForm.controls.shareName.invalid"
[placeholder]="'Share name' | translate:locale.language">
</div>
@@ -216,7 +216,7 @@
<input id="shareDescription"
formControlName="shareDescription"
type="text"
- class="form-control form-control-sm">
+ class="form-control">
</div>
</div>
</div>
@@ -224,14 +224,14 @@
}
<div class="card dialog-tab-card flex-grow-1">
<div class="card-body d-flex flex-column">
- <div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Guest profile</div>
+ <div class="text-muted text-uppercase fs-sm text-bold mb-2" l10nTranslate>Guest profile</div>
<div class="row g-2 align-items-center mb-2">
<label class="form-label col-5 mb-0" for="guestName" l10nTranslate>Guest name</label>
<div class="col-7">
<input id="guestName"
formControlName="name"
type="text"
- class="form-control form-control-sm"
+ class="form-control"
[placeholder]="'Guest name' | translate:locale.language">
</div>
</div>
@@ -243,7 +243,7 @@
formControlName="email"
[class.is-invalid]="linkForm.controls.email.invalid"
type="email"
- class="form-control form-control-sm"
+ class="form-control"
[placeholder]="'Guest email' | translate:locale.language">
</div>
</div>
@@ -252,7 +252,7 @@
<div class="col-7">
<select id="guestLanguage"
formControlName="language"
- class="form-control form-select form-select-sm">
+ class="form-control form-select">
@for (l of languages; track $index) {
<option [ngValue]="l">{{ i18nLanguageText[l] }}</option>
}
@@ -269,14 +269,14 @@
@if (share?.id) {
<button (click)="confirmDeletion = true"
[disabled]="confirmDeletion"
- class="btn btn-sm btn-danger" type="button" l10nTranslate>
+ class="btn btn-danger" type="button" l10nTranslate>
Remove
</button>
}
- <button (click)="onCancel()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onCancel()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
[disabled]="linkForm.invalid || linkForm.controls.requireAuth.value && password.length < passwordMinLength || submitted"
- class="btn btn-sm {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
+ class="btn {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
type="button"
l10nTranslate>
{{ confirmDeletion ? 'Confirm deletion' : 'Confirm' }}
diff --git a/frontend/src/app/applications/links/components/links.component.html b/frontend/src/app/applications/links/components/links.component.html
index bcf34516..437167b3 100644
--- a/frontend/src/app/applications/links/components/links.component.html
+++ b/frontend/src/app/applications/links/components/links.component.html
@@ -1,14 +1,14 @@
<!--Start Top Menu-->
<div class="app-top-menu">
<button (click)="loadShareLinks()"
- class="d-none d-sm-block btn btn-sm btn-default me-1"
+ class="d-none d-sm-block btn btn-default me-1"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
type="button">
<fa-icon [icon]="icons.faArrowRotateRight" [animation]="loading ? 'spin' : null"></fa-icon>
</button>
<button (click)="openLinkDialog()"
- [disabled]="!selected" class="btn btn-sm btn-default me-1"
+ [disabled]="!selected" class="btn btn-default me-1"
[tooltip]="'Edit link' | translate:locale.language"
container="body"
type="button">
@@ -16,7 +16,7 @@
</button>
<button (click)="copyToClipboard()"
[disabled]="!selected"
- class="btn btn-sm me-1 {{linkWasCopied ? 'btn-info' : 'btn-default'}}"
+ class="btn me-1 {{linkWasCopied ? 'btn-primary' : 'btn-default'}}"
[tooltip]="'Copy link' | translate:locale.language"
container="body"
type="button">
@@ -24,7 +24,7 @@
</button>
<button (click)="goTo()"
[disabled]="!selected"
- class="btn btn-sm btn-default"
+ class="btn btn-default"
[tooltip]="'Go to' | translate:locale.language"
container="body"
type="button">
@@ -32,7 +32,7 @@
</button>
<div class="ms-auto">
<!--Start Filter Button-->
- <div class="btn-group btn-group-sm me-1">
+ <div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
@@ -149,7 +149,7 @@
<img [src]="s.mimeUrl" alt="" draggable="false" height="30" width="30" (error)="s.fallBackMimeUrl()">
<div class="d-flex flex-column text-truncate">
<span class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
- <span class="no-pointer-events text-muted fs-3xs" draggable="false">{{ s.description }}</span>
+ <span class="no-pointer-events text-muted fs-xs" draggable="false">{{ s.description }}</span>
</div>
</div>
}
diff --git a/frontend/src/app/applications/links/components/public/public-link.component.html b/frontend/src/app/applications/links/components/public/public-link.component.html
index b0716849..10930548 100644
--- a/frontend/src/app/applications/links/components/public/public-link.component.html
+++ b/frontend/src/app/applications/links/components/public/public-link.component.html
@@ -11,7 +11,7 @@
@if (file?.mimeUrl) {
<img [src]="file.mimeUrl" alt="" height="96" class="no-select-pointer" (error)="fallBackMimeUrl()">
} @else {
- <fa-icon [icon]="icons.SPACES" class="circle-primary-icon" [fixedWidth]="false" style="width: 96px; height: 96px; font-size: 48px"></fa-icon>
+ <fa-icon [icon]="icons.SPACES" class="circle-primary-icon" [fixedWidth]="false" style="width: 96px; height: 96px; font-size: calc(var(--font-size-md) * 3)"></fa-icon>
}
</div>
<span class="error-code">{{ link.share?.name || link.space?.name }}</span>
@@ -48,4 +48,4 @@
</span>
</div>
</div>
-</div>
\ No newline at end of file
+</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 7972b4f5..7c266df4 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
@@ -1,5 +1,5 @@
@if (link()) {
- <div appAutoResize class="fs-2xs" [resizeOffset]=resizeOffset>
+ <div appAutoResize class="fs-sm" [resizeOffset]=resizeOffset>
<div class="card px-1 pt-1">
<div class="card-body align-self-center p-0 my-1">
<img [src]="link().mimeUrl" alt="" draggable="false" [style.height.px]="cardImageSize" (error)="link().fallBackMimeUrl()">
@@ -8,16 +8,16 @@
<hr class="my-1" />
<div class="p-2">
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Name</div>
- <div class="word-break-all fs-2xs">{{ link().name }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Name</div>
+ <div class="word-break-all fs-sm">{{ link().name }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Created</div>
- <div class="fs-2xs">{{ link().link.createdAt | amDateFormat }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Created</div>
+ <div class="fs-sm">{{ link().link.createdAt | amDateFormat }}</div>
</div>
<div class="d-flex mb-1" (mouseover)="accessHover = true" (mouseleave)="accessHover = false" (focus)="accessHover = true">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Accessed</div>
- <div class="fs-2xs">
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Accessed</div>
+ <div class="fs-sm">
@if (accessHover) {
{{ link().link.currentIp }}
} @else {
@@ -26,8 +26,8 @@
</div>
</div>
<div class="d-flex mb-1" (mouseover)="lastAccessHover = true" (mouseleave)="lastAccessHover = false" (focus)="accessHover = true">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Last access</div>
- <div class="fs-2xs">
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Last access</div>
+ <div class="fs-sm">
@if (lastAccessHover) {
{{ link().link.lastIp }}
} @else {
@@ -36,13 +36,13 @@
</div>
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Authentication</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Authentication</div>
<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-semibold" l10nTranslate>Expired</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Expired</div>
@if (link().link.expiresAt) {
<span class="badge bg-{{link().hTimeExpirationAgo >= 1 ? 'warning': 'danger'}}">
{{ link().hTimeExpirationAgo >= 1 ? link().hTimeExpirationAgo + '&nbsp;' + ('days' | translate:locale.language) : 'expired' | translate:locale.language }}
@@ -52,15 +52,15 @@
}
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Active</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Active</div>
<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-semibold" l10nTranslate>Access</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Access</div>
@if (link().link.limitAccess !== 0) {
- <span class="badge {{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 {
@@ -71,11 +71,11 @@
<hr class="my-1" />
<div class="p-2">
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Shared from</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Shared from</div>
<app-share-repository [share]="link()" [showIcon]="false"></app-share-repository>
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Permissions</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Permissions</div>
@if (link().link.permissions) {
<app-badge-permissions [permissions]="link().hPerms"></app-badge-permissions>
} @else {
diff --git a/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html b/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html
index f81bd9f9..5ba2d0a5 100644
--- a/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html
+++ b/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html
@@ -1,33 +1,32 @@
-<div class="sidebar-component-title justify-content-between">
- <div style="width: 35px"></div>
- <span>
- <span l10nTranslate>Notifications</span>
+<div class="sidebar-component-title justify-content-between position-relative">
+ <div class="d-flex align-items-center justify-content-start" style="min-width: 35px">
@if (store.notifications().length) {
- <span class="ps-1">({{ store.notifications().length }})</span>
+ <div class="badge bg-warning">{{ store.notifications().length }}</div>
}
- </span>
- @if (store.notifications().length) {
- <button (click)="removeAll()" class="btn btn-xs btn-default">
- <fa-icon [icon]="icons.faTrashAlt"></fa-icon>
- </button>
- } @else {
- <div style="width: 35px"></div>
- }
+ </div>
+ <div class="position-absolute start-50 translate-middle-x" l10nTranslate>Notifications</div>
+ <div class="d-flex align-items-center justify-content-end" style="min-width: 35px">
+ @if (store.notifications().length) {
+ <button (click)="removeAll()" class="btn btn-sm btn-default">
+ <fa-icon [icon]="icons.faTrashAlt"></fa-icon>
+ </button>
+ }
+ </div>
</div>
-<div class="fs-2xs p-2" appAutoResize>
+<div class="fs-sm p-2" appAutoResize>
@for (n of store.notifications(); track n.id) {
<div class="mb-1 app-small-card rounded no-select" [class.bg-soft-warning]="n.soonRead" #notificationsHtml>
<div class="d-flex px-2 pt-2 pb-1">
- <app-user-avatar [user]="n.fromUser" [width]="24" [height]="24" [unknownUserAsInfo]="n.fromUser.id === -1"></app-user-avatar>
- <div class="align-self-center ms-1">
+ <app-user-avatar class="me-1" [user]="n.fromUser" [width]="24" [height]="24" [unknownUserAsInfo]="n.fromUser.id === -1"></app-user-avatar>
+ <div class="align-self-center">
@if (n.fromUser.id === -1) {
<b l10nTranslate>{{ n.fromUser.fullName }}</b>
} @else {
<b>{{ n.fromUser.fullName }}</b>
}
</div>
- <div class="ms-auto align-self-center" style="font-size: 14px">
- <i (click)="remove(n)" role="button">
+ <div class="ms-auto align-self-center">
+ <i (click)="remove(n)" role="button" class="fs-sm">
<fa-icon [icon]="icons.faTimes"></fa-icon>
</i>
</div>
@@ -35,7 +34,7 @@
<div class="pb-2 px-2">
<div><span l10nTranslate>{{ n.content.event }}</span>:&nbsp;<b class="cursor-pointer btn-link" (click)="goto(n)">{{ n.content.element }}</b>
</div>
- <div class="d-flex fs-3xs pt-1" [class.text-muted]="!n.soonRead">
+ <div class="d-flex fs-xs pt-1" [class.text-muted]="!n.soonRead">
<div>{{ n.createdAt | amTimeAgo }}</div>
<div class="ms-auto">
@if (n.appIcon) {
@@ -50,4 +49,3 @@
</div>
}
</div>
-
diff --git a/frontend/src/app/applications/recents/components/recents.component.html b/frontend/src/app/applications/recents/components/recents.component.html
index 90205cc6..1baf5338 100644
--- a/frontend/src/app/applications/recents/components/recents.component.html
+++ b/frontend/src/app/applications/recents/components/recents.component.html
@@ -1,4 +1,4 @@
-<div appAutoResize class="fs-xs recents-dashboard" [useMaxHeight]="false" [resizeOffset]="40">
+<div appAutoResize class="recents-dashboard" [useMaxHeight]="false" [resizeOffset]="40">
<div class="row recents-grid g-2">
<div class="col-md-6">
<app-files-recents-widget></app-files-recents-widget>
diff --git a/frontend/src/app/applications/recents/components/recents.component.scss b/frontend/src/app/applications/recents/components/recents.component.scss
index 88056840..1b104fe5 100644
--- a/frontend/src/app/applications/recents/components/recents.component.scss
+++ b/frontend/src/app/applications/recents/components/recents.component.scss
@@ -1,5 +1,5 @@
.recents-dashboard {
- padding: 0.05rem 0.2rem 0.25rem;
+ padding: 0.16rem 0.3rem 0.3rem;
}
.recents-grid {
@@ -9,6 +9,6 @@
@media (max-width: 1199.98px) {
.recents-dashboard {
- padding-inline: 0.1rem;
+ padding-inline: 0.16rem;
}
}
diff --git a/frontend/src/app/applications/search/components/search.component.html b/frontend/src/app/applications/search/components/search.component.html
index 452fd939..d930cc54 100644
--- a/frontend/src/app/applications/search/components/search.component.html
+++ b/frontend/src/app/applications/search/components/search.component.html
@@ -1,7 +1,7 @@
<div class="app-top-menu">
<div class="col-12 col-md-6 col-lg-4">
<div class="input-group">
- <button (click)="doSearch()" [disabled]="searchContent().length < minCharsToSearch" class="btn btn-sm btn-default" role="button" type="button">
+ <button (click)="doSearch()" [disabled]="searchContent().length < minCharsToSearch" class="btn btn-default" role="button" type="button">
<fa-icon [icon]="loading ? icons.faSpinner : icons.SEARCH_ICON" [animation]="loading ? 'spin' : null"></fa-icon>
</button>
<input [value]="searchContent()"
@@ -9,7 +9,7 @@
[placeholder]="(this.store.currentSearch().fullText ? 'Search for content' : 'Search for files')|translate:locale.language"
(keyup.enter)="doSearch()"
(keyup.escape)="clearSearch()"
- class="search-input flex-fill form-control form-control-sm"
+ class="search-input flex-fill form-control"
name="search"
type="text"
appAutofocus
@@ -24,7 +24,7 @@
[tooltip]="'Search for content'|translate:locale.language"
container="body"
placement="bottom"
- class="btn btn-sm btn-custom"
+ class="btn btn-custom"
role="button"
type="button"
btnCheckbox>
@@ -35,7 +35,7 @@
</div>
<button (click)="goTo(null, selectedId)"
[disabled]="selectedId === null"
- class="search-go-to-btn d-none d-md-block btn btn-sm btn-default"
+ class="search-go-to-btn d-none d-md-block btn btn-default"
[tooltip]="'Go to' | translate:locale.language"
container="body"
type="button">
diff --git a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html
index 9e365a29..f8dec5c2 100644
--- a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html
+++ b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.SHARED" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
@if (share.id) {
<span>{{ share.name }}</span>
} @else {
@@ -39,7 +39,7 @@
type="text"
[(ngModel)]="share.name"
appAutofocus
- class="form-control form-control-sm {{ !share.name ? 'is-invalid' : '' }}"
+ class="form-control {{ !share.name ? 'is-invalid' : '' }}"
required>
</div>
<div class="mb-3 px-0">
@@ -50,7 +50,7 @@
id="description"
type="text"
[(ngModel)]="share.description"
- class="form-control form-control-sm">
+ class="form-control">
</div>
</div>
</div>
@@ -140,7 +140,7 @@
@if (share?.id) {
<div class="card dialog-tab-card mt-2">
<div class="card-body">
- <div class="d-flex fs-2xs align-items-end flex-fill justify-content-between gap-3 flex-wrap">
+ <div class="d-flex align-items-end flex-fill justify-content-between gap-3 flex-wrap">
@if (share.disabledAt && !share.enabled) {
<div class="d-flex flex-column text-danger px-0">
<label class="form-label" for="disabled" l10nTranslate>Deactivation date</label>
@@ -149,11 +149,11 @@
}
<div class="d-flex flex-column px-0">
<label class="form-label" for="created" l10nTranslate>Creation date</label>
- <div id="created">{{ share.createdAt | amDateFormat }}</div>
+ <div class="fs-sm" id="created">{{ share.createdAt | amDateFormat }}</div>
</div>
<div class="d-flex flex-column px-0">
<label class="form-label" for="modified" l10nTranslate>Modification date</label>
- <div id="modified">{{ share.modifiedAt | amDateFormat }}</div>
+ <div class="fs-sm" id="modified">{{ share.modifiedAt | amDateFormat }}</div>
</div>
</div>
</div>
@@ -205,19 +205,19 @@
@if (share.id) {
<button (click)="confirmDeletion = true"
[disabled]="confirmDeletion"
- class="btn btn-sm btn-danger" type="button" l10nTranslate>
+ class="btn btn-danger" type="button" l10nTranslate>
Remove
</button>
} @else if (allowFilesOptions) {
<button (click)="openSelectRootDialog()"
- class="btn btn-sm btn-success" type="button" l10nTranslate>
+ class="btn btn-success" type="button" l10nTranslate>
<fa-icon [icon]="icons.faPlus"></fa-icon>
<fa-icon [icon]="icons.SHARES"></fa-icon>
File
</button>
@if (user.isAdmin) {
<button (click)="openAdminRootDialog()"
- class="btn btn-sm btn-warning" type="button" l10nTranslate>
+ class="btn btn-warning" type="button" l10nTranslate>
<fa-icon [icon]="icons.faUserShield"></fa-icon>
External location
</button>
@@ -226,15 +226,15 @@
}
@if (tabView === 'links') {
<button (click)="openCreateLinkDialog()"
- class="btn btn-sm btn-success" type="button" l10nTranslate>
+ class="btn btn-success" type="button" l10nTranslate>
<fa-icon [icon]="icons.faPlus"></fa-icon>
<fa-icon [icon]="icons.LINKS"></fa-icon>
Link
</button>
}
- <button (click)="onCancel()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onCancel()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="cantSubmit()" class="btn btn-sm {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
+ [disabled]="cantSubmit()" class="btn {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
type="button"
l10nTranslate>
{{ confirmDeletion ? 'Confirm deletion' : 'Confirm' }}
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 9c4dbe80..28e0b6de 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
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.SHARED" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
<span>{{ share?.name || space?.name }}</span>
</h4>
<h4 class="modal-title ms-auto">
@@ -23,7 +23,7 @@
<span class="ms-1 align-middle">{{ s.name }}</span>
</div>
<div class="d-flex align-items-center">
- <span class="fs-3xs me-2">{{ s.owner.fullName }}</span>
+ <span class="fs-2xs me-2">{{ s.owner.fullName }}</span>
<app-user-avatar [user]="s.owner" tooltipPlacement="top" container="body" [height]="26" [width]="26"></app-user-avatar>
</div>
</div>
@@ -39,6 +39,6 @@
</ul>
</div>
<div class="modal-footer">
- <button (click)="openChildShare()" [disabled]="!selected" class="btn btn-sm btn-primary" l10nTranslate type="button">Edit</button>
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary" data-dismiss="modal" l10nTranslate type="button">Close</button>
+ <button (click)="openChildShare()" [disabled]="!selected" class="btn btn-primary" l10nTranslate type="button">Edit</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" l10nTranslate type="button">Close</button>
</div>
\ No newline at end of file
diff --git a/frontend/src/app/applications/shares/components/shared.component.html b/frontend/src/app/applications/shares/components/shared.component.html
index 0af072a4..20e44b40 100644
--- a/frontend/src/app/applications/shares/components/shared.component.html
+++ b/frontend/src/app/applications/shares/components/shared.component.html
@@ -1,14 +1,14 @@
<!--Start Top Menu-->
<div class="app-top-menu">
<button (click)="loadShares()"
- class="d-none d-sm-block btn btn-sm btn-default me-1"
+ class="d-none d-sm-block btn btn-default me-1"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
type="button">
<fa-icon [icon]="icons.faArrowRotateRight" [animation]="loading ? 'spin' : null"></fa-icon>
</button>
<button (click)="openShareDialog(true)"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'New share' | translate:locale.language"
container="body"
type="button">
@@ -16,7 +16,7 @@
</button>
<button (click)="openShareDialog()"
[disabled]="!selected"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Edit share' | translate:locale.language"
container="body"
type="button">
@@ -24,7 +24,7 @@
</button>
<button (click)="openChildShareDialog()"
[disabled]="!selected?.counts.shares"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Edit children shares' | translate:locale.language"
container="body"
type="button">
@@ -32,7 +32,7 @@
</button>
<button (click)="goTo()"
[disabled]="!selected"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Go to' | translate:locale.language"
container="body"
type="button">
@@ -40,7 +40,7 @@
</button>
<div class="ms-auto">
<!--Start Filter Button-->
- <div class="btn-group btn-group-sm me-1">
+ <div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
@@ -161,7 +161,7 @@
<img [src]="s.mimeUrl" alt="" draggable="false" height="30" width="30" (error)="s.fallBackMimeUrl()">
<div class="d-flex flex-column text-truncate">
<span class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
- <span class="no-pointer-events text-muted fs-3xs" draggable="false">{{ s.description }}</span>
+ <span class="no-pointer-events text-muted fs-xs" draggable="false">{{ s.description }}</span>
</div>
</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 0ce327fd..edda49ea 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
@@ -1,5 +1,5 @@
@if (share()) {
- <div appAutoResize class="fs-2xs" [resizeOffset]=resizeOffset>
+ <div appAutoResize class="fs-sm" [resizeOffset]=resizeOffset>
<div class="card px-1 pt-1">
<div class="card-body align-self-center p-0 my-1">
<img [src]="share().mimeUrl" alt="" draggable="false" [style.height.px]="cardImageSize" (error)="share().fallBackMimeUrl()">
@@ -8,19 +8,19 @@
<hr class="my-1" />
<div class="p-2">
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Name</div>
- <div class="word-break-all fs-2xs">{{ share().name }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Name</div>
+ <div class="word-break-all fs-sm">{{ share().name }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Created</div>
- <div class="fs-2xs">{{ share().createdAt | amDateFormat }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Created</div>
+ <div class="fs-sm">{{ share().createdAt | amDateFormat }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Modified</div>
- <div class="fs-2xs">{{ share().modifiedAt | amDateFormat }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Modified</div>
+ <div class="fs-sm">{{ share().modifiedAt | amDateFormat }}</div>
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Members</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Members</div>
@if (share().counts.users || share().counts.groups) {
<app-badge-members [members]="share().counts"></app-badge-members>
} @else {
@@ -28,7 +28,7 @@
}
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Child shares</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Child shares</div>
@if (share().counts.shares) {
<span (click)="childShareDialog(share())" class="badge bg-purple cursor-pointer me-1">
<fa-icon [icon]="iconShared"></fa-icon>
@@ -39,7 +39,7 @@
}
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Comments</div>
+ <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">
{{ (share().hasComments ? 'yes' : 'no') | translate:locale.language }}
</span>
@@ -48,7 +48,7 @@
<hr class="my-1" />
<div class="p-2">
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Shared from</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Shared from</div>
<app-share-repository [share]="share()" [showIcon]="false"></app-share-repository>
</div>
</div>
diff --git a/frontend/src/app/applications/spaces/components/dialogs/space-anchor-file-dialog.component.html b/frontend/src/app/applications/spaces/components/dialogs/space-anchor-file-dialog.component.html
index dc053ed2..c9ea7920 100644
--- a/frontend/src/app/applications/spaces/components/dialogs/space-anchor-file-dialog.component.html
+++ b/frontend/src/app/applications/spaces/components/dialogs/space-anchor-file-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faAnchor" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faAnchor"></fa-icon>
<span l10nTranslate>Anchor files to a space</span>
</h4>
@if (loading) {
@@ -25,8 +25,8 @@
</div>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
- <button (click)="onSubmit()" [disabled]="submitted || !selectedSpace || !space.roots.length" class="btn btn-sm btn-primary" type="button" l10nTranslate>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onSubmit()" [disabled]="submitted || !selectedSpace || !space.roots.length" class="btn btn-primary" type="button" l10nTranslate>
Confirm
</button>
</div>
\ No newline at end of file
diff --git a/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html b/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html
index 873d74ef..94ef5a3c 100644
--- a/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html
+++ b/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.SPACES" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.SPACES"></fa-icon>
@if (space.id) {
<span>{{ space.name }}</span>
} @else {
@@ -39,7 +39,7 @@
type="text"
[(ngModel)]="space.name"
appAutofocus
- class="form-control form-control-sm {{ !space.name ? 'is-invalid' : '' }}"
+ class="form-control {{ !space.name ? 'is-invalid' : '' }}"
required>
</div>
<div class="mb-3 px-0">
@@ -50,7 +50,7 @@
id="description"
type="text"
[(ngModel)]="space.description"
- class="form-control form-control-sm">
+ class="form-control">
</div>
</div>
</div>
@@ -128,7 +128,7 @@
@if (space.id) {
<div class="card dialog-tab-card">
<div class="card-body">
- <div class="d-flex fs-2xs align-items-end flex-fill justify-content-between gap-2 flex-wrap">
+ <div class="d-flex align-items-end flex-fill justify-content-between gap-2 flex-wrap">
@if (space.disabledAt && !space.enabled) {
<div class="d-flex flex-column text-danger">
<label class="form-label" for="disabled" l10nTranslate>Deactivation date</label>
@@ -137,11 +137,11 @@
}
<div class="d-flex flex-column">
<label class="form-label" for="created" l10nTranslate>Creation date</label>
- <div id="created">{{ space.createdAt | amDateFormat }}</div>
+ <div class="fs-sm" id="created">{{ space.createdAt | amDateFormat }}</div>
</div>
<div class="d-flex flex-column">
<label class="form-label" for="modified" l10nTranslate>Modification date</label>
- <div id="modified">{{ space.modifiedAt | amDateFormat }}</div>
+ <div class="fs-sm" id="modified">{{ space.modifiedAt | amDateFormat }}</div>
</div>
</div>
</div>
@@ -205,14 +205,14 @@
@if (user.isAdmin) {
<button (click)="confirmDeletion = true"
[disabled]="confirmDeletion"
- class="btn btn-sm btn-danger" type="button" l10nTranslate>
+ class="btn btn-danger" type="button" l10nTranslate>
Remove
</button>
}
@if (!space.enabled) {
<div class="text-danger white-space-truncate fs-sm {{user.isAdmin ? 'mx-auto' : 'me-auto'}}">
<span l10nTranslate>Space and data will be deleted in</span>
- <span class="fw-semibold">
+ <span class="text-bold">
@if (space.disabledAt) {
<span>&nbsp;{{ space.disabledAt | amAdd: SPACE_MAX_DISABLED_DAYS : 'days'| amTimeAgo:true }}</span>
} @else {
@@ -224,7 +224,7 @@
}
@if (tabView === 'links') {
<button (click)="openCreateLinkDialog()"
- class="btn btn-sm btn-success" type="button" l10nTranslate>
+ class="btn btn-success" type="button" l10nTranslate>
<fa-icon [icon]="icons.faPlus"></fa-icon>
<fa-icon [icon]="icons.LINKS"></fa-icon>
Link
@@ -232,23 +232,23 @@
}
@if (tabView === 'roots') {
<button (click)="openSelectRootDialog()"
- class="btn btn-sm btn-success" type="button" l10nTranslate>
+ class="btn btn-success" type="button" l10nTranslate>
<fa-icon [icon]="icons.faPlus"></fa-icon>
<fa-icon [icon]="icons.faAnchor"></fa-icon>
File
</button>
@if (user.isAdmin) {
<button (click)="openAdminRootDialog()"
- class="btn btn-sm btn-warning" type="button" l10nTranslate>
+ class="btn btn-warning" type="button" l10nTranslate>
<fa-icon [icon]="icons.faPlus"></fa-icon>
<fa-icon [icon]="icons.faUserShield"></fa-icon>
External location
</button>
}
}
- <button (click)="onCancel()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onCancel()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="cantSubmit()" class="btn btn-sm {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
+ [disabled]="cantSubmit()" class="btn {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
type="button"
l10nTranslate>
{{ confirmDeletion ? 'Confirm permanent deletion of data' : 'Confirm' }}
diff --git a/frontend/src/app/applications/spaces/components/dialogs/space-root-path-dialog.component.html b/frontend/src/app/applications/spaces/components/dialogs/space-root-path-dialog.component.html
index 1da795df..18d18254 100644
--- a/frontend/src/app/applications/spaces/components/dialogs/space-root-path-dialog.component.html
+++ b/frontend/src/app/applications/spaces/components/dialogs/space-root-path-dialog.component.html
@@ -1,13 +1,13 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faFolderClosed" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faFolderClosed"></fa-icon>
<span l10nTranslate>Add an external location</span>
</h4>
<button (click)="layout.closeDialog()" aria-label="Close" class="btn-close btn-close-white" type="button"></button>
</div>
<div class="modal-body form-validation">
@if (withRootName) {
- <input class="form-control form-control-sm my-2"
+ <input class="form-control my-2"
appAutofocus
[ngModel]="newSpaceRoot.name"
(ngModelChange)="checkInput($event, true)"
@@ -16,7 +16,7 @@
type="text"
required>
}
- <input class="form-control form-control-sm my-4"
+ <input class="form-control my-4"
appAutofocus
[autoFocus]="!withRootName"
[ngModel]="newSpaceRoot.externalPath"
@@ -31,8 +31,8 @@
<span class="me-auto fs-sm text-danger text-truncate" l10nTranslate>{{ error }}</span>
}
@if (rootIsValid) {
- <button (click)="onSubmit()" class="btn btn-sm btn-primary" type="button" l10nTranslate>Confirm</button>
+ <button (click)="onSubmit()" class="btn btn-primary" type="button" l10nTranslate>Confirm</button>
} @else {
- <button (click)="onValidRoot()" class="btn btn-sm btn-success" type="button" l10nTranslate>Check the location</button>
+ <button (click)="onValidRoot()" class="btn btn-success" type="button" l10nTranslate>Check the location</button>
}
</div>
\ No newline at end of file
diff --git a/frontend/src/app/applications/spaces/components/dialogs/space-user-anchors-dialog.component.html b/frontend/src/app/applications/spaces/components/dialogs/space-user-anchors-dialog.component.html
index 511a0e60..d045c08d 100644
--- a/frontend/src/app/applications/spaces/components/dialogs/space-user-anchors-dialog.component.html
+++ b/frontend/src/app/applications/spaces/components/dialogs/space-user-anchors-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.SPACES" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.SPACES"></fa-icon>
<span>{{ space.name }}</span>
</h4>
@if (loading) {
@@ -19,13 +19,13 @@
</div>
<div class="modal-footer">
<button (click)="openSelectRootDialog()"
- class="btn btn-sm btn-success" type="button" l10nTranslate>
+ class="btn btn-success" type="button" l10nTranslate>
<fa-icon [icon]="icons.faPlus"></fa-icon>
<fa-icon [icon]="icons.faAnchor"></fa-icon>
File
</button>
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
- <button (click)="onSubmit()" [disabled]="submitted" class="btn btn-sm btn-primary" type="button" l10nTranslate>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onSubmit()" [disabled]="submitted" class="btn btn-primary" type="button" l10nTranslate>
Confirm
</button>
</div>
\ No newline at end of file
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 1bf963d5..6ac9a464 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
@@ -1,10 +1,10 @@
@if (space()) {
- <div appAutoResize class="fs-2xs" [resizeOffset]=resizeOffset>
+ <div appAutoResize class="fs-sm" [resizeOffset]=resizeOffset>
<div class="card px-1 pt-1">
<div class="card-body align-self-center p-0 my-1">
<fa-icon
class="circle-primary-icon"
- style="font-size: 48px"
+ style="font-size: calc(var(--font-size-md) * 3)"
[icon]="icons.SPACES"
[fixedWidth]="false"
[style.width.px]="cardImageSize"
@@ -15,20 +15,20 @@
<hr class="my-1" />
<div class="p-2">
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Name</div>
- <div class="word-break-all fs-2xs">{{ space().name }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Name</div>
+ <div class="word-break-all fs-sm">{{ space().name }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Created</div>
- <div class="fs-2xs">{{ space().createdAt | amDateFormat }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Created</div>
+ <div class="fs-sm">{{ space().createdAt | amDateFormat }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Modified</div>
- <div class="fs-2xs">{{ space().modifiedAt | amDateFormat }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Modified</div>
+ <div class="fs-sm">{{ space().modifiedAt | amDateFormat }}</div>
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Members</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Members</div>
@if (space().counts.users || space().counts.groups) {
<app-badge-members [members]="space().counts"></app-badge-members>
} @else {
@@ -36,7 +36,7 @@
}
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Anchored</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Anchored</div>
@if (space().counts.roots) {
<span (click)="openSpaceRootsDialog()" class="badge bg-primary cursor-pointer me-1">
<fa-icon [icon]="icons.ANCHORED"></fa-icon>
@@ -48,7 +48,7 @@
</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-semibold" l10nTranslate>Child shares</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Child shares</div>
@if (space().counts.shares) {
<span (click)="openChildShareDialog(space())" class="badge bg-purple cursor-pointer me-1">
<fa-icon [icon]="icons.SHARED"></fa-icon>
@@ -63,13 +63,13 @@
<hr class="my-1" />
<div class="p-2">
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Managers</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Managers</div>
@for (m of space().managers; track m.id) {
<app-user-avatar [user]="m" [isMember]="true" [height]="26" [width]="26" tooltipPlacement="bottom"></app-user-avatar>
}
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Permissions</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Permissions</div>
@if (space().permissions) {
<app-badge-permissions [permissions]="space().hPerms"></app-badge-permissions>
} @else {
@@ -82,4 +82,3 @@
-
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 9ff47ff7..7a487ac8 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
@@ -1,10 +1,10 @@
@if (trash()) {
- <div appAutoResize class="fs-2xs" [resizeOffset]=resizeOffset>
+ <div appAutoResize class="fs-sm" [resizeOffset]=resizeOffset>
<div class="card px-1 pt-1">
<div class="card-body align-self-center p-0 my-1">
<fa-icon
class="circle-primary-icon"
- style="font-size: 48px"
+ style="font-size: calc(var(--font-size-md) * 3)"
[icon]="iconTrash"
[fixedWidth]="false"
[style.width.px]="cardImageSize"
@@ -15,19 +15,19 @@
<hr class="my-1" />
<div class="p-2">
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Name</div>
- <div class="d-flex col-sm-7 word-break-all fs-2xs">{{ (trash().isPersonal ? (trash().name | translate:locale.language) : trash().name) }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Name</div>
+ <div class="d-flex col-7 col-sm-7 word-break-all fs-sm">{{ (trash().isPersonal ? (trash().name | translate:locale.language) : trash().name) }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Created</div>
- <div class="d-flex col-sm-7 fs-2xs">{{ trash().ctime | amDateFormat }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Created</div>
+ <div class="d-flex col-7 col-sm-7 fs-sm">{{ trash().ctime | amDateFormat }}</div>
</div>
<div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Modified</div>
- <div class="d-flex col-sm-7 fs-2xs">{{ trash().mtime | amDateFormat }}</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Modified</div>
+ <div class="d-flex col-7 col-sm-7 fs-sm">{{ trash().mtime | amDateFormat }}</div>
</div>
<div class="d-flex align-items-center mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-semibold" l10nTranslate>Elements</div>
+ <div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Elements</div>
@if (trash().nb) {
<span class="badge bg-danger">{{ trash().nb }}</span>
} @else {
@@ -40,4 +40,3 @@
-
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 0b65eceb..910781a5 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -1,7 +1,7 @@
<!--Start Top Menu-->
<div class="app-top-menu">
<button (click)="loadFiles()"
- class="d-none d-sm-block btn btn-sm btn-default me-1"
+ class="d-none d-sm-block btn btn-default me-1"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
type="button">
@@ -9,9 +9,9 @@
</button>
<!--Start New Button-->
@if (!isTrashRepo && !inSharesList) {
- <div (onShown)="initUpload()" class="btn-group btn-group-sm me-1" dropdown>
+ <div (onShown)="initUpload()" class="btn-group me-1" dropdown>
<button dropdownToggle
- class="btn btn-sm btn-default dropdown-toggle"
+ class="btn btn-default dropdown-toggle"
[tooltip]="'New' | translate:locale.language"
container="body"
type="button">
@@ -49,7 +49,7 @@
<!--End New Button-->
<button (click)="downloadFiles()"
[disabled]="!hasSelection || hasDisabledItemsInSelection"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Download' | translate:locale.language"
container="body"
type="button">
@@ -57,9 +57,9 @@
</button>
<!--Start Share Button-->
@if (!isTrashRepo && canShare.outside || inSharesList) {
- <div class="btn-group btn-group-sm me-1" [isDisabled]="!hasSelection || inSharesList && !selection[0].canBeReShared" dropdown>
+ <div class="d-none d-sm-block btn-group me-1" [isDisabled]="!hasSelection || inSharesList && !selection[0].canBeReShared" dropdown>
<button dropdownToggle
- class="btn btn-sm btn-default dropdown-toggle"
+ class="btn btn-default dropdown-toggle"
[tooltip]="'Share' | translate:locale.language"
container="body"
type="button">
@@ -90,7 +90,7 @@
@if (isTrashRepo) {
<button (click)="openTrashDialog(true)"
[disabled]="!hasSelection"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Remove' | translate:locale.language"
container="body"
type="button">
@@ -99,7 +99,7 @@
@if (inRootSpace) {
<button (click)="openEmptyTrashDialog()"
[disabled]="!stats.elements"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Empty' | translate:locale.language"
container="body"
type="button">
@@ -108,8 +108,8 @@
}
}
<!--Start Actions Button-->
- <div [isDisabled]="!hasSelection" class="btn-group btn-group-sm me-1" dropdown>
- <button class="btn btn-sm btn-default dropdown-toggle" dropdownToggle type="button">
+ <div [isDisabled]="!hasSelection" class="btn-group me-1" dropdown>
+ <button class="btn btn-default dropdown-toggle" dropdownToggle type="button">
<fa-icon [icon]="icons.faEllipsis"></fa-icon>
</button>
<ul *dropdownMenu class="dropdown-menu" role="menu">
@@ -191,7 +191,7 @@
<!--End Actions Button-->
<div class="ms-auto">
<!--Start Filter Button-->
- <div class="btn-group btn-group-sm me-1">
+ <div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
@@ -228,10 +228,19 @@
class="card">
<div [attr.rowIndex]="$index" class="card-body">
@if (f.isImage) {
- <img (error)="f.isImage = false" [style.max-height.px]="galleryMode.image" alt="" class="img-fluid"
- draggable="true" src="{{f.thumbnailUrl}}?size={{galleryMode.imageRes}}">
+ <img src="{{f.thumbnailUrl}}?size={{galleryMode.imageRes}}"
+ [style.max-height.px]="galleryMode.image"
+ alt=""
+ class="img-fluid"
+ draggable="true"
+ (error)="f.isImage = false">
} @else {
- <img [src]="f.mimeUrl" [height]="galleryMode.image" [width]="galleryMode.image" alt="" draggable="true" (error)="f.fallBackMimeUrl()">
+ <img [src]="f.mimeUrl"
+ [height]="galleryMode.image"
+ [width]="galleryMode.image"
+ alt=""
+ draggable="true"
+ (error)="f.fallBackMimeUrl()">
}
<span class="label-bottom-right">
@let maxBadges = galleryMode.maxBadges || 0;
@@ -380,7 +389,12 @@
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center" draggable="true">
- <img [src]="f.mimeUrl" alt="" draggable="false" height="30" width="30" (error)="f.fallBackMimeUrl()">
+ <img [src]="f.mimeUrl"
+ alt=""
+ draggable="false"
+ height="30"
+ width="30"
+ (error)="f.fallBackMimeUrl()">
@if (f.isRenamed) {
<input appInputEdit
(renamingInProgress)="setRenamingInProgress($event)"
@@ -392,7 +406,7 @@
<div class="d-flex flex-column text-truncate">
<span class="no-pointer-events text-file-name-preserve" draggable="false">{{ f.name }}</span>
@if (inSharesList && f.root?.description) {
- <span class="no-pointer-events text-muted fs-3xs" draggable="false">{{ f.root.description }}</span>
+ <span class="no-pointer-events text-muted fs-xs" draggable="false">{{ f.root.description }}</span>
}
</div>
}
@@ -489,19 +503,19 @@
<!--Start Common Messages-->
<ng-template #CommonMessages>
@if (forbiddenResource) {
- <div class="fs-sm text-center text-danger fw-semibold no-select p-4">
+ <div class="fs-sm text-center text-danger text-bold no-select p-4">
<span l10nTranslate>Forbidden resource</span>
</div>
} @else if (locationNotFound) {
- <div class="fs-sm text-center text-danger fw-semibold no-select p-4">
+ <div class="fs-sm text-center text-danger text-bold no-select p-4">
<span l10nTranslate>Location not found</span>
</div>
} @else if (serverConnectionError) {
- <div class="fs-sm text-center text-danger fw-semibold no-select p-4">
+ <div class="fs-sm text-center text-danger text-bold no-select p-4">
<span l10nTranslate>{{ serverConnectionErrorMessage }}</span>
</div>
} @else if (!isTrashRepo && !loading && !stats.elements) {
- <div class="fs-sm text-center text-muted fw-semibold no-select p-4">
+ <div class="fs-sm text-center text-muted text-bold no-select p-4">
<span l10nTranslate>Drag and drop your files here</span>
</div>
}
@@ -557,9 +571,6 @@
<ng-template (execute)="addToClipboard()" contextMenuItem>
<span l10nTranslate><fa-icon [icon]="icons.faClipboardList"></fa-icon>Clipboard</span>
</ng-template>
- <ng-template (execute)="layout.showRSideBarTab(TAB_MENU.SELECTION)" contextMenuItem>
- <span l10nTranslate><fa-icon [icon]="icons.faCircleInfo"></fa-icon>Info</span>
- </ng-template>
@if (!inSharesList) {
<ng-template [divider]="true" contextMenuItem></ng-template>
<ng-template (execute)="openTrashDialog(isTrashRepo)" contextMenuItem>
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.html b/frontend/src/app/applications/spaces/components/spaces.component.html
index b60b4dc1..53e51585 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces.component.html
@@ -1,7 +1,7 @@
<!--Start Top Menu-->
<div class="app-top-menu">
<button (click)="loadSpaces()"
- class="btn btn-sm btn-default me-1"
+ class="d-none d-sm-block btn btn-default me-1"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
type="button">
@@ -9,7 +9,7 @@
</button>
@if (canCreateSpace) {
<button (click)="openSpaceDialog(true)"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'New space' | translate:locale.language"
container="body"
type="button">
@@ -18,7 +18,7 @@
}
<button (click)="openSpaceDialog()"
[disabled]="!canEditSpace"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Edit space' | translate:locale.language"
container="body"
type="button">
@@ -26,7 +26,7 @@
</button>
<button (click)="openChildShareDialog()"
[disabled]="!canEditSpace || !selected?.counts.shares"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Edit children shares' | translate:locale.language"
container="body"
type="button">
@@ -34,7 +34,7 @@
</button>
<button (click)="openSpaceRootsDialog()"
[disabled]="!canManageRoots"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Manage my anchored files' | translate:locale.language"
container="body"
type="button">
@@ -42,7 +42,7 @@
</button>
<div class="ms-auto">
<!--Start Filter Button-->
- <div class="btn-group btn-group-sm me-1">
+ <div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
@@ -169,7 +169,7 @@
<fa-icon [icon]="icons.SPACES" class="circle-primary-icon" [fixedWidth]="false"></fa-icon>
<div class="d-flex flex-column text-truncate">
<span class="no-pointer-events text-file-name-preserve" draggable="false">{{ s.name }}</span>
- <span class="no-pointer-events text-muted fs-3xs" draggable="false">{{ s.description }}</span>
+ <span class="no-pointer-events text-muted fs-xs" draggable="false">{{ s.description }}</span>
</div>
</div>
}
diff --git a/frontend/src/app/applications/spaces/components/trash.component.html b/frontend/src/app/applications/spaces/components/trash.component.html
index b59f9e2a..11cbc1f5 100644
--- a/frontend/src/app/applications/spaces/components/trash.component.html
+++ b/frontend/src/app/applications/spaces/components/trash.component.html
@@ -1,7 +1,7 @@
<!--Start Top Menu-->
<div class="app-top-menu">
<button (click)="loadTrashBins()"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
type="button">
@@ -9,7 +9,7 @@
</button>
<div class="ms-auto">
<!--Start Filter Button-->
- <div class="btn-group btn-group-sm me-1">
+ <div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
diff --git a/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html b/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html
index 3b00f400..8073463d 100644
--- a/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html
+++ b/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html
@@ -1,6 +1,6 @@
@for (r of space.roots; track r.alias) {
<div class="bg-theme mb-1 px-3 py-2" style="border-radius: 4px">
- <div class="d-flex align-items-center text-truncate no-select fs-xs" style="max-height: 34px">
+ <div class="d-flex align-items-center text-truncate no-select fs-sm" style="max-height: 38px">
<div class="d-flex align-items-center text-truncate me-auto">
@if (showUsers) {
<app-user-avatar [user]="r.owner" tooltipPlacement="bottom"></app-user-avatar>
@@ -11,8 +11,8 @@
[class.cursor-pointer]="!!r.file.path"
[tooltip]="r.file.path"
draggable="false"
- height="30"
- width="30"
+ height="35"
+ width="35"
alt="">
<div class="d-flex flex-column text-truncate ms-2">
@if (r.isRenamed) {
@@ -21,7 +21,7 @@
<div class="text-truncate">
<span>{{ r.name }}</span>
</div>
- <div class="d-none d-lg-block fs-3xs text-truncate text-muted">
+ <div class="d-none d-lg-block fs-xs text-truncate text-muted">
@if (user.isAdmin && r.externalPath) {
<span>{{ r.externalPath }}</span>
} @else {
@@ -32,7 +32,7 @@
</div>
</div>
@if (showInfo) {
- <div class="d-flex flex-column fs-3xs text-muted d-none d-lg-block ms-3">
+ <div class="d-flex flex-column fs-2xs text-muted d-none d-lg-block ms-3">
<div class="d-flex justify-content-end">{{ r.alias }}</div>
<div class="d-flex justify-content-end">{{ r.createdAt | amTimeAgo }}</div>
</div>
diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-client-delete.dialog.component.html b/frontend/src/app/applications/sync/components/dialogs/sync-client-delete.dialog.component.html
index 69c728d8..38d43f19 100755
--- a/frontend/src/app/applications/sync/components/dialogs/sync-client-delete.dialog.component.html
+++ b/frontend/src/app/applications/sync/components/dialogs/sync-client-delete.dialog.component.html
@@ -1,7 +1,7 @@
<div class="modal-header">
<h4 class="modal-title" translate>
<fa-icon [icon]="icons.faTrashCan"></fa-icon>
- <span class="ms-2" l10nTranslate>Client</span>
+ <span l10nTranslate>Client</span>
@if (submitted) {
<fa-icon [icon]="icons.faSpinner" animation="spin" class="ms-2"></fa-icon>
}
@@ -13,6 +13,6 @@
<div class="small mt-2" translate>The client will no longer have permission to access your account and will no longer be able to synchronize.</div>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary" data-dismiss="modal" l10nTranslate type="button">Cancel</button>
- <button (click)="onSubmit()" [disabled]="submitted" class="btn btn-sm btn-danger" l10nTranslate type="button">Confirm</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" l10nTranslate type="button">Cancel</button>
+ <button (click)="onSubmit()" [disabled]="submitted" class="btn btn-danger" l10nTranslate type="button">Confirm</button>
</div>
diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.html b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.html
index b2ce8ff1..9434305e 100644
--- a/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.html
+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.html
@@ -1,7 +1,7 @@
<div class="modal-header">
<h4 class="modal-title">
<fa-icon [icon]="icons.faRotate"></fa-icon>
- <span class="ms-2">{{ syncPath.settings.name }}</span>
+ <span>{{ syncPath.settings.name }}</span>
</h4>
<button (click)="onMinimize()" aria-label="Minimize" class="btn-minimize btn-minimize-white" type="button"></button>
<button (click)="onClose()" aria-label="Close" class="btn-close btn-close-white ms-3" type="button"></button>
@@ -10,7 +10,7 @@
<div class="sync-report-layout">
<div class="card dialog-tab-card sync-report-toolbar">
<div class="sync-report-top-menu">
- <button (click)="manageReport(!running)" class="btn btn-sm btn-default ms-1" type="button">
+ <button (click)="manageReport(!running)" class="btn btn-default ms-1" type="button">
<div class="d-flex align-items-center">
<fa-icon [icon]="running ? icons.faStop : icons.faFlask"></fa-icon>
<span class="ms-1" l10nTranslate>Simulate</span>
@@ -30,7 +30,7 @@
<button [(ngModel)]="this.showFiltered"
[tooltip]="'Show filtered files'|translate:locale.language"
placement="top"
- class="btn btn-sm btn-custom me-2"
+ class="btn btn-custom me-2"
role="button"
type="button"
btnCheckbox>
@@ -39,8 +39,8 @@
</button>
}
<div [tooltip]="'Go to' | translate:locale.language">
- <div [isDisabled]="!transferSelected" class="btn-group btn-group-sm me-2" dropdown>
- <button class="btn btn-sm btn-default dropdown-toggle" dropdownToggle type="button">
+ <div [isDisabled]="!transferSelected" class="btn-group me-2" dropdown>
+ <button class="btn btn-default dropdown-toggle" dropdownToggle type="button">
<fa-icon [icon]="icons.faMapMarkerAlt"></fa-icon>
</button>
<ul *dropdownMenu class="dropdown-menu" role="menu">
@@ -111,19 +111,19 @@
class="{{th.value.class}}">
@switch (th.key) {
@case ('action') {
- <span class="d-flex align-items-center" style="font-size: 14px">
+ <span class="d-flex align-items-center" style="font-size: var(--font-size-sm)">
<fa-icon [icon]="s.sideIcon" class="{{s.sideIconClass}}"></fa-icon>
<fa-icon [icon]="s.actionIcon" class="circle-gray-icon-sm" size="sm"></fa-icon>
- <span class="fs-4xs" l10nTranslate>{{ s.actionText }}</span>
+ <span class="fs-sm" l10nTranslate>{{ s.actionText }}</span>
</span>
}
@case ('file') {
- <div class="d-flex align-items-center fs-2xs">
+ <div class="d-flex align-items-center fs-sm">
<img [src]="s.mimeUrl" (error)="s.fallBackMimeUrl()" class="me-2" alt="" width="24">
- <span class="d-flex flex-column fs-2xs">
+ <span class="d-flex flex-column fs-sm">
@if (s.fileDst) {
<span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}}">{{ s.fileDst }}</span>
- <span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} fs-3xs"><b l10nTranslate>Source</b>:&nbsp;{{ s.file }}</span>
+ <span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} fs-sm"><b l10nTranslate>Source</b>:&nbsp;{{ s.file }}</span>
} @else {
<span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}}">{{ s.file }}</span>
}
diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.scss b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.scss
index 5643a473..48098ee4 100644
--- a/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.scss
+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.scss
@@ -30,7 +30,7 @@
.sync-report-empty {
padding: 4px 10px;
- font-size: 0.75rem;
+ font-size: var(--font-size-base);
font-weight: 500;
}
@@ -40,4 +40,4 @@
.sync-report-table-scroll {
min-height: 11rem;
-}
\ No newline at end of file
+}
diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.html b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.html
index 53567a61..71c0b693 100644
--- a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.html
+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.html
@@ -1,7 +1,7 @@
<div class="modal-header">
<h4 class="modal-title">
<fa-icon [icon]="icons.faRotate"></fa-icon>
- <span class="ms-2">{{ syncPath.settings.name }}</span>
+ <span>{{ syncPath.settings.name }}</span>
</h4>
<button (click)="layout.closeDialog()" aria-label="Close" class="btn-close btn-close-white" type="button"></button>
</div>
@@ -28,7 +28,7 @@
<div class="card-body p-3">
<div class="sync-filters-field mb-2">
<label class="form-label mb-1" for="sync-filter-type" l10nTranslate>Filter type</label>
- <select id="sync-filter-type" [(ngModel)]="currentFilterType" class="form-select form-select-sm">
+ <select id="sync-filter-type" [(ngModel)]="currentFilterType" class="form-select">
@if (store.isElectronApp()) {
<option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.FILE">Select a file</option>
<option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.FOLDER">Select a folder</option>
@@ -48,16 +48,16 @@
[(ngModel)]="currentFilter"
[disabled]="currentFilterType === SYNC_PATH_FILTER_TYPE.FILE || currentFilterType === SYNC_PATH_FILTER_TYPE.FOLDER"
[placeholder]="filterTypePlaceholder[currentFilterType] | translate:locale.language"
- class="form-control form-select-sm"
+ class="form-control"
type="text">
<div class="sync-filters-actions">
@if (currentFilterType === SYNC_PATH_FILTER_TYPE.FILE) {
- <button (click)="onSelect()" class="btn btn-xs btn-default" l10nTranslate type="button">Browse</button>
+ <button (click)="onSelect()" class="btn btn-default" l10nTranslate type="button">Browse</button>
}
@if (currentFilterType === SYNC_PATH_FILTER_TYPE.FOLDER) {
- <button (click)="onSelect(ELECTRON_DIALOG.DIRECTORY)" class="btn btn-xs btn-default" l10nTranslate type="button">Browse</button>
+ <button (click)="onSelect(ELECTRON_DIALOG.DIRECTORY)" class="btn btn-default" l10nTranslate type="button">Browse</button>
}
- <button (click)="addFilter()" [disabled]="!currentFilter" class="btn btn-xs btn-success" l10nTranslate type="button">Add</button>
+ <button (click)="addFilter()" [disabled]="!currentFilter" class="btn btn-success" l10nTranslate type="button">Add</button>
</div>
</div>
</div>
@@ -71,9 +71,9 @@
<div class="sync-filter-item">
<input [ngModel]="f"
(ngModelChange)="syncPath.settings.filters[i] = $event"
- class="form-control form-control-sm"
+ class="form-control"
type="text">
- <button (click)="onRemoveFilter(i)" class="btn btn-xs btn-danger" data-dismiss="modal" type="button">
+ <button (click)="onRemoveFilter(i)" class="btn btn-danger" data-dismiss="modal" type="button">
<fa-icon [icon]="icons.faTimes"></fa-icon>
</button>
</div>
@@ -90,16 +90,16 @@
<div class="modal-footer">
<button (click)="confirmDeletion = true"
[disabled]="confirmDeletion"
- class="btn btn-sm btn-danger me-2" data-dismiss="modal" type="button" l10nTranslate>
+ class="btn btn-danger me-2" data-dismiss="modal" type="button" l10nTranslate>
Remove
</button>
@if (store.isElectronApp()) {
- <button (click)="onFlush()" class="btn btn-sm btn-warning" data-dismiss="modal" type="button" l10nTranslate>Reset</button>
+ <button (click)="onFlush()" class="btn btn-warning" data-dismiss="modal" type="button" l10nTranslate>Reset</button>
}
- <button (click)="onCancel()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onCancel()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
[disabled]="!syncPath.settings.name"
- class="btn btn-sm {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}" type="submit" l10nTranslate>
+ class="btn {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}" type="submit" l10nTranslate>
{{ confirmDeletion ? 'Confirm deletion' : 'Confirm' }}
</button>
</div>
diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.scss b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.scss
index a30b9ee5..d1e682e3 100644
--- a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.scss
+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.scss
@@ -32,7 +32,7 @@
}
.sync-filter-empty {
- font-size: 0.74rem;
+ font-size: var(--font-size-base);
padding: 0.3rem 0.4rem;
}
}
diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.ts b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.ts
index 120d086d..390cbb6e 100755
--- a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.ts
+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.ts
@@ -27,7 +27,7 @@ import { SyncPathSettingsComponent } from '../shared/sync-path-settings.componen
TabHeadingDirective
],
templateUrl: 'sync-path-settings.dialog.component.html',
- styleUrl: './sync-path-settings.dialog.component.scss'
+ styleUrl: 'sync-path-settings.dialog.component.scss'
})
export class SyncPathSettingsDialogComponent implements OnInit {
@Input({ required: true }) syncPathSelected: SyncPathModel
diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-transfers-delete.dialog.component.html b/frontend/src/app/applications/sync/components/dialogs/sync-transfers-delete.dialog.component.html
index f14bbc60..de8693ea 100644
--- a/frontend/src/app/applications/sync/components/dialogs/sync-transfers-delete.dialog.component.html
+++ b/frontend/src/app/applications/sync/components/dialogs/sync-transfers-delete.dialog.component.html
@@ -1,7 +1,7 @@
<div class="modal-header">
- <h4 class="modal-title" translate>
+ <h4 class="modal-title">
<fa-icon [icon]="icons.faTrashCan"></fa-icon>
- <span class="ms-2" l10nTranslate>Clear events</span>
+ <span l10nTranslate>Clear events</span>
</h4>
<button (click)="layout.closeDialog()" aria-label="Close" class="btn-close btn-close-white" type="button"></button>
</div>
@@ -15,7 +15,7 @@
<span l10nTranslate>will be cleared</span>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
- <button (click)="doClear()" class="btn btn-sm btn-danger" type="submit" l10nTranslate>Confirm</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="doClear()" class="btn btn-danger" type="submit" l10nTranslate>Confirm</button>
</div>
diff --git a/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.html b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.html
index c9f779a6..80465156 100644
--- a/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.html
+++ b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.html
@@ -34,7 +34,7 @@
<input
id="sync-path-name"
[(ngModel)]="syncPath.settings.name"
- class="form-control form-select-sm {{syncPath.settings.name ? '' : 'is-invalid'}}"
+ class="form-control {{syncPath.settings.name ? '' : 'is-invalid'}}"
type="text">
</div>
</div>
@@ -54,7 +54,7 @@
}
</label>
<div class="sync-settings-control">
- <select id="sync-path-mode" [(ngModel)]="syncPath.settings.mode" class="form-select form-select-sm">
+ <select id="sync-path-mode" [(ngModel)]="syncPath.settings.mode" class="form-select">
<option [disabled]="!syncPath.isWriteable" [ngValue]="SYNC_PATH_MODE.UPLOAD" l10nTranslate>upload only</option>
<option [ngValue]="SYNC_PATH_MODE.DOWNLOAD" l10nTranslate>download only</option>
<option [disabled]="!syncPath.isWriteable" [ngValue]="SYNC_PATH_MODE.BOTH" l10nTranslate>both</option>
@@ -72,7 +72,7 @@
id="sync-path-conflict"
[(ngModel)]="syncPath.settings.conflictMode"
[disabled]="syncPath.settings.mode !== 'both'"
- class="form-select form-select-sm">
+ class="form-select">
<option [ngValue]="SYNC_PATH_CONFLICT_MODE.LOCAL" l10nTranslate>the client’s files take precedence</option>
<option [ngValue]="SYNC_PATH_CONFLICT_MODE.REMOTE" l10nTranslate>the server’s files take precedence</option>
<option [ngValue]="SYNC_PATH_CONFLICT_MODE.RECENT" l10nTranslate>the most recent files will be kept</option>
@@ -86,7 +86,7 @@
<span class="ms-2" l10nTranslate>Mode</span>
</label>
<div class="sync-settings-control">
- <select id="sync-path-diff" [(ngModel)]="syncPath.settings.diffMode" class="form-select form-select-sm">
+ <select id="sync-path-diff" [(ngModel)]="syncPath.settings.diffMode" class="form-select">
<option [ngValue]="SYNC_PATH_DIFF_MODE.FAST" l10nTranslate>{{ SYNC_PATH_DIFF_MODE.FAST }}</option>
<option [ngValue]="SYNC_PATH_DIFF_MODE.SECURE" l10nTranslate>{{ SYNC_PATH_DIFF_MODE.SECURE }}</option>
</select>
@@ -103,10 +103,10 @@
id="sync-path-scheduler-value"
[(ngModel)]="syncPath.settings.scheduler.value"
[disabled]="syncPath.settings.scheduler.unit === SYNC_PATH_SCHEDULER_UNIT.DISABLED"
- class="form-control form-select-sm pe-1"
+ class="form-control pe-1"
min="1"
type="number">
- <select [(ngModel)]="syncPath.settings.scheduler.unit" class="form-select form-select-sm">
+ <select [(ngModel)]="syncPath.settings.scheduler.unit" class="form-select">
<option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.DISABLED" l10nTranslate>disabled</option>
<option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.MINUTE" l10nTranslate>scheduler_unit_minute</option>
<option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.HOUR" l10nTranslate>scheduler_unit_hour</option>
@@ -121,7 +121,7 @@
<span class="ms-2" l10nTranslate>Status</span>
</label>
<div class="sync-settings-control">
- <select id="sync-path-status" [(ngModel)]="syncPath.settings.enabled" class="form-select form-select-sm" [class.text-danger]="!syncPath.settings.enabled">
+ <select id="sync-path-status" [(ngModel)]="syncPath.settings.enabled" class="form-select" [class.text-danger]="!syncPath.settings.enabled">
<option [ngValue]="true" l10nTranslate>enabled</option>
<option [ngValue]="false" l10nTranslate>disabled</option>
</select>
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 ecaf0114..a301c2a6 100644
--- a/frontend/src/app/applications/sync/components/sync-clients.component.html
+++ b/frontend/src/app/applications/sync/components/sync-clients.component.html
@@ -2,7 +2,7 @@
<button (click)="loadClients()"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
- class="d-none d-sm-block btn btn-sm btn-default me-1"
+ class="d-none d-sm-block btn btn-default me-1"
type="button">
<fa-icon [icon]="icons.faArrowRotateRight"></fa-icon>
</button>
@@ -10,7 +10,7 @@
[disabled]="!selected"
[tooltip]="'Remove' | translate:locale.language"
container="body"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
type="button">
<fa-icon [icon]="icons.faTrashCan"></fa-icon>
</button>
@@ -42,7 +42,7 @@
}
</div>
</div>
- <div class="sync-client-meta-line {{client.expiration.reached ? 'fw-semibold text-danger' : client.expiration.approaching ? 'fw-semibold text-warning' : ''}}">
+ <div class="sync-client-meta-line {{client.expiration.reached ? 'text-bold text-danger' : client.expiration.approaching ? 'text-bold text-warning' : ''}}">
<fa-icon [icon]="icons.faKey"></fa-icon>
<span l10nTranslate>{{ client.expiration.reached ? 'The access has expired' : 'The access expires' }}</span>&nbsp;{{ client.expiration.value | amTimeAgo }}
</div>
@@ -58,9 +58,15 @@
<fa-icon [icon]="icons.faAt"></fa-icon>
<span class="text-truncate">{{ client.currentIp }}&nbsp;-&nbsp;{{ client.lastIp }}</span>
</div>
- <div class="sync-client-meta-line">
- <fa-icon [icon]="icons.faClock"></fa-icon>
- <span class="text-truncate">{{ client.currentAccess | amDateFormat:'L HH:mm:ss' }}&nbsp;-&nbsp;{{ client.lastAccess | amDateFormat:'L HH:mm:ss' }}</span>
+ <div class="d-flex flex-column align-items-start sync-client-meta-line">
+ <div class="sync-client-meta-line">
+ <fa-icon [icon]="icons.faClock"></fa-icon>
+ <span class="text-truncate">{{ client.currentAccess | amDateFormat:'L HH:mm:ss' }}</span>
+ </div>
+ <div class="sync-client-meta-line text-muted">
+ <fa-icon [icon]="icons.faClock"></fa-icon>
+ <span class="text-truncate">{{ client.lastAccess | amDateFormat:'L HH:mm:ss' }}</span>
+ </div>
</div>
</div>
<div class="sync-client-paths">
@@ -79,10 +85,10 @@
<div class="sync-path-main d-flex align-items-center text-truncate me-auto">
<img [src]="path.mimeUrl" alt="" class="sync-path-image" draggable="false">
<div class="d-flex flex-column text-truncate ms-2">
- <span class="fs-2xs text-truncate user-select-none fw-semibold">{{ path.settings.name }}</span>
+ <span class="fs-base text-truncate user-select-none text-bold">{{ path.settings.name }}</span>
<div class="d-flex align-items-center text-{{path.iconClass}}">
<fa-icon [icon]="path.icon" class="me-1"></fa-icon>
- <span class="fs-3xs text-truncate user-select-none">{{ path.showedPath }}</span>
+ <span class="fs-sm text-truncate user-select-none">{{ path.showedPath }}</span>
</div>
</div>
</div>
@@ -104,13 +110,13 @@
<div class="sync-path-actions">
<button (click)="$event.stopPropagation(); gotoPath(path, client)"
[tooltip]="'Go to' | translate:locale.language"
- class="btn btn-sm btn-default"
+ class="btn btn-default"
type="button">
<fa-icon [icon]="icons.faMapMarkerAlt"></fa-icon>
</button>
<button (click)="$event.stopPropagation(); onEditPath(path, client)"
[tooltip]="'Edit' | translate:locale.language"
- class="btn btn-sm btn-default"
+ class="btn btn-default"
type="button">
<fa-icon [icon]="icons.faPen"></fa-icon>
</button>
diff --git a/frontend/src/app/applications/sync/components/sync-clients.component.scss b/frontend/src/app/applications/sync/components/sync-clients.component.scss
index d522d9fb..1bc5a836 100644
--- a/frontend/src/app/applications/sync/components/sync-clients.component.scss
+++ b/frontend/src/app/applications/sync/components/sync-clients.component.scss
@@ -17,7 +17,7 @@ $sync-path-rail-padding: 0.45rem;
--sync-path-actions-separator: transparent;
--sync-path-hover-bg: transparent;
- font-size: 0.78rem;
+ font-size: calc(var(--font-size-base) * 0.832);
display: flex;
flex-direction: column;
gap: 0.75rem;
@@ -62,13 +62,13 @@ $sync-path-rail-padding: 0.45rem;
}
.sync-client-title {
- font-size: 0.98rem;
+ font-size: calc(var(--font-size-base) * 1.0453333);
font-weight: 600;
line-height: 1.2;
}
.sync-client-subtitle {
- font-size: 0.63rem;
+ font-size: var(--font-size-sm);
text-transform: uppercase;
letter-spacing: 0.08em;
}
@@ -82,13 +82,13 @@ $sync-path-rail-padding: 0.45rem;
display: flex;
align-items: center;
min-width: 0;
- font-size: 0.75rem;
+ font-size: var(--font-size-sm);
> fa-icon:first-child:not(.osIcon) {
width: $sync-clients-icon-col-width;
min-width: $sync-clients-icon-col-width;
flex: 0 0 $sync-clients-icon-col-width;
- font-size: 0.96rem;
+ font-size: calc(var(--font-size-base) * 1.024);
margin-right: $sync-clients-icon-col-gap;
text-align: center;
}
@@ -99,7 +99,7 @@ $sync-path-rail-padding: 0.45rem;
}
.osIcon {
- font-size: 1.08rem;
+ font-size: calc(var(--font-size-base) * 1.152);
margin-right: $sync-clients-icon-col-gap;
width: $sync-clients-icon-col-width;
min-width: $sync-clients-icon-col-width;
@@ -121,7 +121,7 @@ $sync-path-rail-padding: 0.45rem;
justify-content: space-between;
text-transform: uppercase;
letter-spacing: 0.08em;
- font-size: 0.64rem;
+ font-size: var(--font-size-sm);
font-weight: 600;
padding: 0 0.15rem;
}
@@ -129,7 +129,7 @@ $sync-path-rail-padding: 0.45rem;
.sync-client-paths-count {
min-width: 1.2rem;
line-height: 1.15;
- font-size: 0.66rem;
+ font-size: var(--font-size-sm);
font-weight: 600;
color: var(--sync-client-paths-count-fg);
background: var(--sync-client-paths-count-bg);
@@ -146,8 +146,8 @@ $sync-path-rail-padding: 0.45rem;
}
.sync-path-image {
- height: 30px;
- width: 30px;
+ height: 40px;
+ width: 40px;
object-fit: contain;
flex-shrink: 0;
}
@@ -170,7 +170,6 @@ $sync-path-rail-padding: 0.45rem;
padding-right: $sync-path-rail-padding;
height: 100%;
flex-shrink: 0;
- font-size: 0.7125rem;
}
.sync-path-side {
@@ -194,7 +193,7 @@ $sync-path-rail-padding: 0.45rem;
.sync-client-path-empty {
padding: 0.7rem 0.35rem;
text-align: center;
- font-size: 0.72rem;
+ font-size: var(--font-size-sm);
border-radius: 0.65rem;
border: 1px dashed var(--sync-client-path-empty-border);
background: var(--sync-client-path-empty-bg);
@@ -226,7 +225,7 @@ $sync-path-rail-padding: 0.45rem;
}
.sync-client-title {
- font-size: 0.9rem;
+ font-size: calc(var(--font-size-base) * 0.96);
}
.sync-path-row {
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 fdbc122f..74bdbe9e 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.html
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.html
@@ -2,27 +2,27 @@
<button (click)="onRefresh()"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
- class="d-none d-sm-block btn btn-sm btn-default me-1" type="button">
+ class="d-none d-sm-block btn btn-default me-1" type="button">
<fa-icon [icon]="icons.faArrowRotateRight"></fa-icon>
</button>
<button (click)="addToSync()"
[tooltip]="'Add' | translate:locale.language"
container="body"
- class="btn btn-sm btn-default me-1" type="button">
+ class="btn btn-default me-1" type="button">
<fa-icon [icon]="icons.faPlus"></fa-icon>
</button>
<button (click)="openSettingsDialog()"
[disabled]="!syncPathSelected"
[tooltip]="'Edit' | translate:locale.language"
container="body"
- class="btn btn-sm btn-default me-1" type="button">
+ class="btn btn-default me-1" type="button">
<fa-icon [icon]="icons.faPencilAlt"></fa-icon>
</button>
<button (click)="openReportDialog()"
[disabled]="!syncPathSelected || !syncPathSelected.settings.enabled"
[tooltip]="'Simulate' | translate:locale.language"
container="body"
- class="btn btn-sm btn-default me-1" type="button">
+ class="btn btn-default me-1" type="button">
<fa-icon [icon]="icons.faFlask"></fa-icon>
</button>
<!--Start Sync Buttons-->
@@ -30,7 +30,7 @@
<button (click)="doSync(false)"
[tooltip]="'Stop synchronization' | translate:locale.language"
container="body"
- class="btn btn-sm btn-default me-1" type="button">
+ class="btn btn-default me-1" type="button">
<fa-icon [icon]="icons.faStop"></fa-icon>
</button>
} @else {
@@ -38,7 +38,7 @@
[disabled]="!syncPathSelected || !syncPathSelected.settings.enabled"
[tooltip]="'Synchronize' | translate:locale.language"
container="body"
- class="btn btn-sm btn-default me-1" type="button">
+ class="btn btn-default me-1" type="button">
<fa-icon [icon]="icons.faPlay"></fa-icon>
</button>
}
@@ -46,13 +46,13 @@
<button (click)="doAllSyncs(false)"
[tooltip]="'Stop synchronizations' | translate:locale.language"
container="body"
- class="btn btn-sm btn-default me-1" type="button">
+ class="btn btn-default me-1" type="button">
<fa-icon [icon]="icons.faStop"></fa-icon>
</button>
} @else {
<div [tooltip]="'Synchronize all' | translate:locale.language" container="body">
- <div class="btn-group btn-group-sm me-1" dropdown [isDisabled]="!store.clientSyncPaths().length">
- <button class="btn btn-sm btn-default dropdown-toggle" dropdownToggle type="button">
+ <div class="btn-group me-1" dropdown [isDisabled]="!store.clientSyncPaths().length">
+ <button class="btn btn-default dropdown-toggle" dropdownToggle type="button">
<fa-icon [icon]="icons.faForward"></fa-icon>
</button>
<ul *dropdownMenu class="dropdown-menu" role="menu">
@@ -77,8 +77,8 @@
</div>
}
<div [tooltip]="(('Scheduler' | translate:locale.language) + ': ' + (store.clientScheduler() | translate:locale.language))" container="body">
- <div class="btn-group btn-group-sm me-1" dropdown>
- <button class="btn btn-sm {{store.clientScheduler() === CLIENT_SCHEDULER_STATE.DISABLED ? 'btn-warning' : 'btn-success'}} dropdown-toggle" dropdownToggle type="button">
+ <div class="btn-group me-1" dropdown>
+ <button class="btn {{store.clientScheduler() === CLIENT_SCHEDULER_STATE.DISABLED ? 'btn-warning' : 'btn-success'}} dropdown-toggle" dropdownToggle type="button">
@if (store.clientScheduler() === CLIENT_SCHEDULER_STATE.DISABLED) {
<fa-icon [icon]="icons.faCalendarXmark"></fa-icon>
} @else {
@@ -117,8 +117,8 @@
</div>
<!--End Sync Buttons-->
<div [tooltip]="'Go to' | translate:locale.language" container="body">
- <div [isDisabled]="!syncPathSelected" class="btn-group btn-group-sm me-1" dropdown>
- <button class="btn btn-sm btn-default dropdown-toggle" dropdownToggle type="button">
+ <div [isDisabled]="!syncPathSelected" class="btn-group me-1" dropdown>
+ <button class="btn btn-default dropdown-toggle" dropdownToggle type="button">
<fa-icon [icon]="icons.faMapMarkerAlt"></fa-icon>
</button>
<ul *dropdownMenu class="dropdown-menu" role="menu">
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 aac072a1..e97f4d95 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.ts
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.ts
@@ -111,7 +111,7 @@ export class SyncPathsComponent implements OnInit, OnDestroy {
protected tableHeaders: Record<'name' | 'mode' | 'conflictMode' | 'diffMode' | 'scheduler' | 'filters' | 'lastSync', TableHeaderConfig> = {
name: {
label: 'Name',
- width: 30,
+ width: 25,
textCenter: false,
class: '',
show: true,
@@ -119,7 +119,7 @@ export class SyncPathsComponent implements OnInit, OnDestroy {
},
mode: {
label: 'Direction',
- width: 8,
+ width: 10,
textCenter: true,
class: '',
show: true,
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 f2d78e00..79e6283e 100644
--- a/frontend/src/app/applications/sync/components/sync-transfers.component.html
+++ b/frontend/src/app/applications/sync/components/sync-transfers.component.html
@@ -1,12 +1,12 @@
<div class="app-top-menu">
- <div class="btn-group btn-group-sm">
- <select (ngModelChange)="onSelectPath($event)" [ngModel]="syncPathSelected" class="form-select form-select-sm font-size-xs" style="min-width: 210px">
+ <div class="btn-group">
+ <select (ngModelChange)="onSelectPath($event)" [ngModel]="syncPathSelected" class="form-select" style="min-width: 210px">
<option [ngValue]="null" l10nTranslate>All syncs</option>
@for (p of store.clientSyncPaths(); track p.id) {
<option [ngValue]="p">{{ p.settings.name }}</option>
}
</select>
- <select (ngModelChange)="onSelectAction($event)" [ngModel]="action" class="form-select form-select-sm font-size-xs ms-1" style="min-width: 170px">
+ <select (ngModelChange)="onSelectAction($event)" [ngModel]="action" class="form-select ms-1" style="min-width: 170px">
<option [ngValue]="null" l10nTranslate>All events</option>
<option l10nTranslate value="NEW|MKFILE|MKDIR">Added</option>
<option l10nTranslate value="DIFF">Modified</option>
@@ -20,14 +20,14 @@
<button (click)="refresh()"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
type="button">
<fa-icon [icon]="icons.faRedo"></fa-icon>
</button>
<button (click)="openClearDialog()"
[tooltip]="'Clear events' | translate:locale.language"
placement="bottom"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
type="button">
<fa-icon [icon]="icons.faTrashCan"></fa-icon>
</button>
@@ -76,21 +76,21 @@
}
@case ('sync') {
<span class="d-flex align-items-center">
- <span class="fs-2xs ms-1">{{ t.syncPathName }}</span>
+ <span class="fs-sm ms-1">{{ t.syncPathName }}</span>
</span>
}
@case ('file') {
<div class="d-flex align-items-center">
<img [src]=t.mimeUrl (error)="t.fallBackMimeUrl()" alt="" class="me-2" width="24">
- <span class="d-flex flex-column fs-2xs">
+ <span class="d-flex flex-column fs-sm">
@if (t.fileDst) {
<span class="{{t.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}}">{{ t.fileDst }}</span>
- <span class="{{t.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} fs-3xs"><b l10nTranslate>Source</b>:&nbsp;{{ t.file }}</span>
+ <span class="{{t.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} fs-sm"><b l10nTranslate>Source</b>:&nbsp;{{ t.file }}</span>
} @else {
<span class="{{t.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}}">{{ t.file }}</span>
}
@if (!t.ok) {
- <span class="{{t.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} text-danger fs-3xs" l10nTranslate>{{ t.error }}</span>
+ <span class="{{t.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} text-danger fs-sm" l10nTranslate>{{ t.error }}</span>
}
</span>
</div>
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 8002c56b..11bfb967 100644
--- a/frontend/src/app/applications/sync/components/sync-transfers.component.ts
+++ b/frontend/src/app/applications/sync/components/sync-transfers.component.ts
@@ -53,7 +53,7 @@ export class SyncTransfersComponent {
protected tableHeaders: Record<'action' | 'sync' | 'file' | 'date', TableHeaderConfig> = {
action: {
label: 'Action',
- width: 8,
+ width: 12,
textCenter: false,
class: '',
show: true,
@@ -77,7 +77,7 @@ export class SyncTransfersComponent {
},
date: {
label: 'Date',
- width: 20,
+ width: 18,
textCenter: true,
class: '',
newly: 'newly',
diff --git a/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts b/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts
index de8de8f0..b2b41759 100644
--- a/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts
+++ b/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts
@@ -13,19 +13,19 @@ import { SyncPathModel } from '../../models/sync-path.model'
@if (small && syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
<fa-icon [icon]="SYNC_TRANSFER_BOTH_ICON"></fa-icon>
} @else {
- @if (syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD || syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
- <fa-icon
- [icon]="SYNC_TRANSFER_SIDE_ICON[SYNC_TRANSFER_SIDE.LOCAL]"
- class="{{ small ? '' : SYNC_TRANSFER_SIDE_CLASS[SYNC_TRANSFER_SIDE.LOCAL] }}"
- ></fa-icon>
- }
@if (syncPath.settings.mode === SYNC_PATH_MODE.UPLOAD || syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
<fa-icon
[icon]="SYNC_TRANSFER_SIDE_ICON[SYNC_TRANSFER_SIDE.REMOTE]"
- [class.ms-1]="syncPath.settings.mode === SYNC_PATH_MODE.BOTH"
+ [class.me-1]="syncPath.settings.mode === SYNC_PATH_MODE.BOTH"
class="{{ small ? '' : SYNC_TRANSFER_SIDE_CLASS[SYNC_TRANSFER_SIDE.REMOTE] }}"
></fa-icon>
}
+ @if (syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD || syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
+ <fa-icon
+ [icon]="SYNC_TRANSFER_SIDE_ICON[SYNC_TRANSFER_SIDE.LOCAL]"
+ class="{{ small ? '' : SYNC_TRANSFER_SIDE_CLASS[SYNC_TRANSFER_SIDE.LOCAL] }}"
+ ></fa-icon>
+ }
}
</span>
`
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.html b/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.html
index 3b27a58c..e5567022 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.html
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.html
@@ -1,5 +1,5 @@
<div class="wizard">
- <div class="d-flex flex-column text-center fs-sm">
+ <div class="d-flex flex-column text-center fs-md">
<div class="mb-2" l10nTranslate>This wizard will help you synchronize a directory on your computer with a Sync-in directory.</div>
<div>
<div l10nTranslate>To begin, select a folder on your computer.</div>
@@ -8,14 +8,14 @@
</div>
<div class="d-flex flex-column h-100">
@if (syncService.wizard.localPath) {
- <div class="d-flex flex-column my-auto fs-sm">
+ <div class="d-flex flex-column my-auto">
<fa-icon (click)="onReset()" [icon]="icons.faTimesCircle" size="2x" class="position-absolute align-self-center cursor-pointer" style="margin-left: 85px"></fa-icon>
<img [src]="syncService.wizard.localPath.mimeUrl" alt="" class="align-self-center mb-2" height="96">
- <div class="align-self-center mt-2 font-size-md word-break-all fw-500">{{ syncService.wizard.localPath.path }}</div>
+ <div class="align-self-center mt-2 fs-md word-break-all fw-500">{{ syncService.wizard.localPath.path }}</div>
@if (infoMsg) {
<div class="align-self-center text-warning mt-4">
<span l10nTranslate>{{ infoMsg }}</span>
- <span class="fw-semibold ms-1">:&nbsp;{{ syncService.wizard.localPath.origin }}</span>
+ <span class="text-bold ms-1">:&nbsp;{{ syncService.wizard.localPath.origin }}</span>
</div>
}
</div>
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.html b/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.html
index c87380da..190f0177 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.html
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.html
@@ -1,9 +1,9 @@
<div class="wizard">
<div class="my-2">
- <div class="d-flex align-items-center justify-content-center fs-sm" style="min-height: 40px">
+ <div class="d-flex align-items-center justify-content-center fs-md" style="min-height: 40px">
@if (selectedPath) {
@if (selectedPath.icon) {
- <fa-icon [icon]="selectedPath.icon" class="circle-{{selectedPath.iconClass}}-icon" style="width: 32px; height: 32px; font-size: 16px"></fa-icon>
+ <fa-icon [icon]="selectedPath.icon" class="circle-{{selectedPath.iconClass}}-icon" style="width: 32px; height: 32px; font-size: var(--font-size-md)"></fa-icon>
} @else {
<img [src]="selectedPath.mimeUrl" alt="" height="30">
}
@@ -15,7 +15,7 @@
<div class="app-top-menu px-0">
<button (click)="onBack()"
[disabled]="!currentPath"
- class="btn btn-sm btn-default"
+ class="btn btn-default"
type="button">
<fa-icon [icon]="icons.faArrowCircleLeft"></fa-icon>
</button>
@@ -29,7 +29,7 @@
<button (click)="addDirectory()"
[hidden]="!canCreateDir"
[disabled]="!newDirectoryName"
- class="btn btn-sm btn-default input-group-text"
+ class="btn btn-default input-group-text"
type="button">
<fa-icon [icon]="icons.faFolderPlus"></fa-icon>
</button>
@@ -37,7 +37,7 @@
[(ngModel)]="newDirectoryName"
[hidden]="!canCreateDir"
[ngModelOptions]="{standalone: true}"
- class="form-control form-control-sm me-1"
+ class="form-control me-1"
[placeholder]="'New folder' | translate:locale.language" type="text">
</div>
</form>
@@ -53,7 +53,7 @@
</tr>
</thead>
</table>
- <div [resizeOffset]="230" appAutoResize [useMaxHeight]="false" class="wizard-nav-content">
+ <div [resizeOffset]="250" appAutoResize [useMaxHeight]="false" class="wizard-nav-content">
<table class="app-table">
<tbody tabindex="-1">
@for (p of currentPaths(); track p.id) {
@@ -63,7 +63,7 @@
<td>
<div class="d-flex align-items-center">
@if (p.icon) {
- <fa-icon [icon]="p.icon" class="circle-{{p.iconClass}}-icon" style="width: 32px; height: 32px; font-size: 16px"></fa-icon>
+ <fa-icon [icon]="p.icon" class="circle-{{p.iconClass}}-icon" style="width: 32px; height: 32px; font-size: var(--font-size-md)"></fa-icon>
} @else {
<img [src]="p.mimeUrl" alt="" height="30">
}
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html
index 50ce9bbf..19186df6 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html
@@ -1,39 +1,46 @@
-<div class="wizard fs-sm">
- <div class="d-flex flex-row justify-content-center mb-3">
- <div class="d-flex flex-column align-items-end">
- <div class="d-flex flex-column align-items-end">
- <div class="fw-500 mb-1 me-1">
- <fa-icon [icon]="icons.CLIENT"></fa-icon>
- <span class="ms-2" l10nTranslate>Client</span>
- </div>
- <div class="cursor-pointer" placement="left" [tooltip]="syncService.wizard.localPath.path">
- <img [src]="syncService.wizard.localPath.mimeUrl" alt="" height="35">
+<div class="wizard fs-md">
+ <div class="wizard-settings-cards mb-3">
+ <div class="card dialog-tab-card wizard-settings-card">
+ <div class="card-header wizard-settings-card-header">
+ <fa-icon [icon]="icons.CLIENT"></fa-icon>
+ <span l10nTranslate>Client</span>
+ </div>
+ <div class="card-body wizard-settings-card-body">
+ <div class="wizard-settings-card-main cursor-pointer" placement="left" [tooltip]="syncService.wizard.localPath.path">
+ <div class="wizard-settings-card-icon">
+ <img [src]="syncService.wizard.localPath.mimeUrl" alt="">
+ </div>
+ <div class="wizard-settings-card-name text-truncate">{{ syncService.wizard.localPath.name }}</div>
</div>
- <div class="position-absolute text-truncate pe-2" style="top: 110px">{{ syncService.wizard.localPath.name }}</div>
+ <div class="wizard-settings-card-path text-truncate">{{ syncService.wizard.localPath.path }}</div>
</div>
</div>
- <div class="d-flex align-items-end mb-2 mx-5">
+ <div class="wizard-settings-direction d-none d-md-flex">
<app-sync-path-direction-icon [syncPath]="syncPath"></app-sync-path-direction-icon>
</div>
- <div class="d-flex flex-column align-items-start">
- <div class="d-flex flex-column align-items-start">
- <div class="fw-500 mb-1 ms-1">
- <fa-icon [icon]="icons.SERVER"></fa-icon>
- <span class="ms-2" l10nTranslate>Server</span>
- </div>
- <div class="cursor-pointer" placement="right" [tooltip]="translatedRemotePath">
- @if (syncService.wizard.remotePath.icon) {
- <fa-icon [icon]="syncService.wizard.remotePath.icon" class="circle-{{syncService.wizard.remotePath.iconClass}}-icon" style="width: 32px; height: 32px; font-size: 16px"></fa-icon>
- } @else {
- <img [src]="syncService.wizard.remotePath.mimeUrl" alt="" height="35">
- }
+ <div class="card dialog-tab-card wizard-settings-card">
+ <div class="card-header wizard-settings-card-header">
+ <fa-icon [icon]="icons.SERVER"></fa-icon>
+ <span l10nTranslate>Server</span>
+ </div>
+ <div class="card-body wizard-settings-card-body">
+ <div class="wizard-settings-card-main cursor-pointer" placement="right" [tooltip]="translatedRemotePath">
+ <div class="wizard-settings-card-icon">
+ @if (syncService.wizard.remotePath.icon) {
+ <fa-icon [icon]="syncService.wizard.remotePath.icon"
+ class="circle-{{syncService.wizard.remotePath.iconClass}}-icon wizard-settings-card-remote-icon"></fa-icon>
+ } @else {
+ <img [src]="syncService.wizard.remotePath.mimeUrl" alt="">
+ }
+ </div>
+ <div class="wizard-settings-card-name text-truncate">{{ syncService.wizard.remotePath.name }}</div>
</div>
- <div class="position-absolute text-truncate ps-2" style="top: 110px">{{ syncService.wizard.remotePath.name }}</div>
+ <div class="wizard-settings-card-path text-truncate">{{ translatedRemotePath }}</div>
</div>
</div>
</div>
<app-sync-path-settings class="my-auto" [syncPath]="syncPath"></app-sync-path-settings>
- <div class="fs-xs">
+ <div class="fs-md d-none d-md-block">
@if (error) {
<div class="text-center text-warning" l10nTranslate>{{ error }}</div>
} @else {
@@ -43,7 +50,7 @@
@if (syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
<span l10nTranslate>and from</span>
} @else {
- <span class="fw-semibold" l10nTranslate>to</span>
+ <span class="fw-bold" l10nTranslate>to</span>
}
<span class="mx-1" l10nTranslate>{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? 'the client folder' : 'the server folder' }}</span>
@if (syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
@@ -59,17 +66,17 @@
<span l10nTranslate>In case of conflict,</span>
<span>&nbsp;</span>
@if (syncPath.settings.conflictMode === SYNC_PATH_CONFLICT_MODE.RECENT) {
- <span class="fw-semibold" l10nTranslate>the most recent files will be kept</span>
+ <span class="fw-bold" l10nTranslate>the most recent files will be kept</span>
} @else {
<span l10nTranslate>the files in</span>
- <span class="fw-semibold mx-1">{{ syncPath.settings.conflictMode === SYNC_PATH_CONFLICT_MODE.LOCAL ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>
+ <span class="fw-bold mx-1">{{ syncPath.settings.conflictMode === SYNC_PATH_CONFLICT_MODE.LOCAL ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>
<span l10nTranslate>will be preferred</span>
}
</div>
} @else {
<div>
<span l10nTranslate>All files created or modified in</span>
- <span class="fw-semibold mx-1">{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>
+ <span class="fw-bold mx-1">{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>
<span l10nTranslate>will be ignored and deleted</span>
</div>
}
@@ -78,16 +85,14 @@
</div>
<div class="mt-auto">
<div class="d-flex align-items-start">
- <button (click)="onPrevious()" class="btn btn-sm btn-default me-auto" translate type="button">
+ <button (click)="onPrevious()" class="btn btn-default me-auto" translate type="button">
<fa-icon [icon]="icons.faArrowCircleLeft"></fa-icon>
Previous
</button>
- <button (click)="onSubmit()" [disabled]="!syncPath.settings.name" class="btn btn-sm btn-default ms-auto" translate type="button">
+ <button (click)="onSubmit()" [disabled]="!syncPath.settings.name" class="btn btn-default ms-auto" translate type="button">
<fa-icon [icon]="icons.faCheckCircle"></fa-icon>
Done
</button>
</div>
</div>
</div>
-
-
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.scss b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.scss
new file mode 100644
index 00000000..c3117d00
--- /dev/null
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.scss
@@ -0,0 +1,115 @@
+.wizard {
+ .wizard-settings-cards {
+ display: grid;
+ grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
+ align-items: stretch;
+ gap: 0.75rem;
+ }
+
+ .wizard-settings-card {
+ margin: 0;
+ border-radius: 0.8rem;
+ min-width: 0;
+ }
+
+ .wizard-settings-card-header {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.45rem;
+ padding: 0.6rem 0.8rem;
+ font-size: calc(var(--font-size-base) * 1.02);
+ font-weight: 600;
+ line-height: 1.2;
+ border-bottom: 0.5px solid darkgray;
+ background-color: transparent !important;
+
+ fa-icon {
+ width: 1.05rem;
+ text-align: center;
+ }
+ }
+
+ .wizard-settings-card-body {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ text-align: center;
+ gap: 0.3rem;
+ min-height: 100%;
+ }
+
+ .wizard-settings-card-main {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.5rem;
+ width: fit-content;
+ max-width: 100%;
+ min-width: 0;
+ }
+
+ .wizard-settings-card-icon {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex: 0 0 2rem;
+ width: 2rem;
+ height: 2rem;
+
+ img {
+ width: auto;
+ height: 1.85rem;
+ object-fit: contain;
+ }
+ }
+
+ .wizard-settings-card-remote-icon {
+ width: 2rem;
+ height: 2rem;
+ font-size: var(--font-size-md);
+ }
+
+ .wizard-settings-card-name {
+ min-width: 0;
+ max-width: 100%;
+ font-weight: 600;
+ line-height: 1.2;
+ text-align: center;
+ }
+
+ .wizard-settings-card-path {
+ width: 100%;
+ font-size: var(--font-size-2xs);
+ color: var(--bs-body-color-rgb);
+ text-align: center;
+ }
+
+ .wizard-settings-direction {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ min-width: 2.5rem;
+ padding-inline: 0.1rem;
+ }
+
+ @media (max-width: 767.98px) {
+ .wizard-settings-cards {
+ grid-template-columns: minmax(0, 1fr);
+ gap: 0.6rem;
+ }
+
+ .wizard-settings-card-header {
+ padding-inline: 0.7rem;
+ }
+
+ .wizard-settings-card-body {
+ padding: 0.6rem 0.7rem;
+ }
+
+ .wizard-settings-direction {
+ min-height: 2.2rem;
+ padding-inline: 0;
+ }
+ }
+}
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.ts b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.ts
index a389fd41..120ed6d5 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.ts
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.ts
@@ -15,7 +15,8 @@ import { SyncPathDirectionIconComponent } from '../utils/sync-path-direction-ico
@Component({
selector: 'app-sync-wizard-settings',
imports: [L10nTranslateDirective, FaIconComponent, TooltipDirective, SyncPathDirectionIconComponent, SyncPathSettingsComponent],
- templateUrl: './sync-wizard-settings.component.html'
+ templateUrl: './sync-wizard-settings.component.html',
+ styleUrl: './sync-wizard-settings.component.scss'
})
export class SyncWizardSettingsComponent {
protected readonly syncService = inject(SyncService)
diff --git a/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-enable-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-enable-dialog.component.html
index f28f09a3..5ba4161d 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-enable-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-enable-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center justify-content-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faLock" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faLock"></fa-icon>
<span l10nTranslate>Two-Factor Authentication</span>
</h4>
</div>
@@ -12,7 +12,7 @@
<div class="alert alert-warning text-center mb-0" l10nTranslate>
These recovery codes are for one-time use only and will only be displayed here once.
</div>
- <ul class="list-group text-align-center fs-2xs">
+ <ul class="list-group text-align-center fs-sm">
@for (code of recoveryCodes; track $index) {
<li class="list-group-item font-monospace">{{ code }}</li>
}
@@ -34,14 +34,17 @@
<img [src]="qrDataUrl" alt="QR Code" class="img-fluid border rounded p-2" style="max-width: 150px;">
</div>
+ <div class="text-center mb-2" l10nTranslate>Or enter this secret manually:</div>
<div class="card dialog-check-card">
- <div class="card-body py-2 px-3 d-flex align-items-center gap-2 flex-wrap">
- <div class="text-muted text-uppercase fs-4xs" l10nTranslate>Or enter this secret manually</div>
- <div class="font-monospace fs-xs text-truncate flex-grow-1 text-center text-primary">{{ secret }}</div>
- <button type="button" class="btn btn-sm btn-outline-primary" (click)="clipBoardSecret()">
- <fa-icon [icon]="icons.faCopy" class="me-1"></fa-icon>
- <span l10nTranslate>Copy</span>
- </button>
+ <div class="card-body py-2 px-3">
+ <div class="d-flex justify-content-center">
+ <a class="link-primary text-decoration-none font-monospace fs-sm cursor-pointer"
+ role="button"
+ (click)="clipBoardSecret()">
+ <fa-icon [icon]="icons.faCopy"></fa-icon>
+ {{ secret }}
+ </a>
+ </div>
</div>
</div>
</div>
@@ -50,11 +53,10 @@
<div class="card dialog-check-card">
<div class="card-body p-3">
<form (ngSubmit)="onSubmit()" [formGroup]="twoFaForm" class="d-flex flex-column gap-3 align-items-center">
- <div>
- <label class="form-label text-muted text-uppercase fs-3xs d-block text-center mb-2" for="password" l10nTranslate>Enter your password</label>
+ <div class="w-100" style="max-width: 360px;">
+ <label class="form-label text-muted text-uppercase fs-sm d-block text-center mb-2" for="password" l10nTranslate>Enter your password</label>
<app-input-password id="password"
- class="d-block mx-auto"
- style="max-width: 340px; width: 100%;"
+ class="d-block w-100"
[password]="twoFaForm.value.password"
(passwordChange)="twoFaForm.controls.password.setValue($event)"
[focus]="true"
@@ -63,14 +65,13 @@
</app-input-password>
</div>
- <div>
- <label class="form-label text-muted text-uppercase fs-3xs d-block text-center mb-2" for="totp" l10nTranslate>Valid with your TOTP code</label>
+ <div class="w-100" style="max-width: 360px;">
+ <label class="form-label text-muted text-uppercase fs-sm d-block text-center mb-2" for="totp" l10nTranslate>Valid with your TOTP code</label>
<input
id="totp"
type="text"
[maxlength]="twoFaCodelength"
- class="form-control text-center fs-4 font-monospace mx-auto"
- style="max-width: 340px; width: 100%;"
+ class="form-control text-center text-bold font-monospace w-100"
formControlName="totpCode"
placeholder="••••••"
inputmode="numeric"
@@ -84,8 +85,8 @@
}
<div class="d-flex gap-2 pt-1 w-100">
- <button type="button" (click)="onClose()" class="btn btn-sm btn-secondary flex-fill" l10nTranslate>Cancel</button>
- <button type="submit" [disabled]="twoFaForm.invalid || submitted" class="btn btn-sm btn-primary flex-fill" l10nTranslate>Confirm</button>
+ <button type="button" (click)="onClose()" class="btn btn-secondary flex-fill" l10nTranslate>Cancel</button>
+ <button type="submit" [disabled]="twoFaForm.invalid || submitted" class="btn btn-primary flex-fill" l10nTranslate>Confirm</button>
</div>
</form>
</div>
diff --git a/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-enable-dialog.component.ts b/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-enable-dialog.component.ts
index 54aa4ac9..392ac0df 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-enable-dialog.component.ts
+++ b/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-enable-dialog.component.ts
@@ -63,12 +63,12 @@ export class UserAuth2faEnableDialogComponent {
clipBoardSecret() {
this.clipBoardService.copyFromContent(this.secret)
- this.layout.sendNotification('success', 'Two-factor Authentication', 'Secret copied')
+ this.layout.sendNotification('success', 'Two-Factor Authentication', 'Secret copied')
}
clipBoardRecoveryCodes() {
this.clipBoardService.copyFromContent(this.recoveryCodes.join('\n'))
- this.layout.sendNotification('success', 'Two-factor Authentication', 'Recovery codes copied')
+ this.layout.sendNotification('success', 'Two-Factor Authentication', 'Recovery codes copied')
}
downloadRecoveryCodes() {
diff --git a/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-verify-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-verify-dialog.component.html
index eed3342b..03d82718 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-verify-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-auth-2fa-verify-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center justify-content-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faLock" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faLock"></fa-icon>
@if (withTwoFaEnabled) {
<span l10nTranslate>Two-Factor Authentication</span>
} @else {
@@ -10,40 +10,32 @@
</div>
<div class="modal-body modal-auth-verify-2fa">
<div class="card shadow-sm">
- <div class="card-body">
- <p [class.text-danger]="hasError" class="d-flex justify-content-center align-items-center mb-3" l10nTranslate>
- @if (hasError) {
- {{ hasError }}
- } @else if (withPassword) {
- Enter your password
- } @else {
- Valid with your TOTP code
- }
- </p>
- <form (ngSubmit)="onSubmit()" [formGroup]="twoFaForm">
+ <div class="card-body p-3">
+ <form (ngSubmit)="onSubmit()" [formGroup]="twoFaForm" class="d-flex flex-column gap-3 align-items-center">
@if (withPassword) {
- <div class="mb-4">
+ <div class="w-100" style="max-width: 360px;">
+ <label class="form-label text-muted text-uppercase fs-sm d-block text-center mb-2" for="password" l10nTranslate>Enter your password</label>
<app-input-password id="password"
+ class="d-block w-100"
[password]="twoFaForm.value.password"
(passwordChange)="updatePassword($event)"
[focus]="true"
[centered]="true"
- placeholder="••••••••">
+ placeholder="••••••">
</app-input-password>
</div>
}
@if (withTwoFaEnabled) {
- @if (withPassword) {
- <div class="text-align-center mb-3" l10nTranslate>Valid with your TOTP code</div>
- }
- <div class="mb-3">
+ <div class="w-100" style="max-width: 360px;">
+ <label class="form-label text-muted text-uppercase fs-sm d-block text-center mb-2" for="totp" l10nTranslate>Valid with your TOTP code</label>
<input
+ id="totp"
appAutofocus
[autoFocus]="!withPassword"
[autoSelect]="!withPassword"
type="text"
- [maxlength]=twoFaCodelength
- class="form-control text-center fs-4"
+ [maxlength]="twoFaCodelength"
+ class="form-control text-center text-bold font-monospace w-100"
formControlName="totpCode"
placeholder="••••••"
inputmode="numeric"
@@ -52,12 +44,16 @@
/>
</div>
}
+
+ @if (hasError) {
+ <div class="alert alert-danger py-2 mb-0 text-center" l10nTranslate>{{ hasError }}</div>
+ }
+
<div class="d-flex gap-2 pt-1 w-100">
- <button type="submit" [disabled]="twoFaForm.invalid || submitted" class="btn btn-primary flex-fill" l10nTranslate>Confirm</button>
<button type="button" (click)="onClose()" class="btn btn-secondary flex-fill" l10nTranslate>Cancel</button>
+ <button type="submit" [disabled]="twoFaForm.invalid || submitted" class="btn btn-primary flex-fill" l10nTranslate>Confirm</button>
</div>
</form>
</div>
</div>
</div>
-
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 5f7b1b47..87045a2a 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
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faKey" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faKey"></fa-icon>
<span l10nTranslate>Manage app passwords</span>
</h4>
<button (click)="onClose()" aria-label="Close" class="btn-close btn-close-white ms-auto" type="button"></button>
@@ -9,7 +9,7 @@
<div class="d-flex flex-column gap-3">
<div class="card dialog-tab-card">
<div class="card-body p-3">
- <div class="d-flex align-items-center text-muted text-uppercase fs-3xs fw-semibold mb-3">
+ <div class="d-flex align-items-center text-muted text-uppercase fs-sm text-bold mb-3">
<span l10nTranslate>Generate a new app password</span>
</div>
<form [formGroup]="appPasswordForm" (ngSubmit)="genAppPassword()">
@@ -22,14 +22,14 @@
name="name"
formControlName="name"
type="text"
- class="form-control form-control-sm"
+ class="form-control"
[class.is-invalid]="appPasswordForm.controls.name.invalid"
[placeholder]="'Password name' | translate: locale.language"
required>
</div>
<div class="col-12 col-md-4">
<label class="form-label" for="app" l10nTranslate>Application</label>
- <select id="app" class="form-select form-select-sm" formControlName="app">
+ <select id="app" class="form-select" formControlName="app">
@for (s of availableApps; track $index) {
<option [value]="s" l10nTranslate>{{ s | capitalize }}</option>
}
@@ -43,7 +43,7 @@
formControlName="expiration"
placement="bottom"
type="text"
- class="form-control form-control-sm"
+ class="form-control"
[placeholder]="'Never expires' | translate:locale.language"
[bsConfig]="{
dateInputFormat: 'YYYY-MM-DD',
@@ -68,7 +68,7 @@
<div class="col-12 col-md-3 d-flex align-items-end">
<button
[disabled]="appPasswordForm.invalid || submitted"
- class="btn btn-sm btn-primary ms-auto"
+ class="btn btn-primary ms-auto"
type="submit"
l10nTranslate>
Generate
@@ -81,7 +81,7 @@
@if (generatedPassword) {
<div class="card dialog-check-card border-success-subtle bg-success-subtle">
<div class="card-body p-3">
- <div class="d-flex align-items-center text-success-emphasis text-uppercase fs-3xs fw-semibold mb-2">
+ <div class="d-flex align-items-center text-success-emphasis text-uppercase fs-sm text-bold mb-2">
<fa-icon [icon]="icons.faKey" class="me-2"></fa-icon>
<span l10nTranslate>Password generated</span>
</div>
@@ -89,24 +89,24 @@
<div class="col-12 col-md-4">
<div class="card dialog-check-card h-100">
<div class="card-body py-2 px-3">
- <div class="text-muted text-uppercase fs-4xs mb-1" l10nTranslate>Password name</div>
- <div class="fs-xs">{{ generatedPassword.name }}</div>
+ <div class="text-muted text-uppercase fs-sm mb-1" l10nTranslate>Password name</div>
+ <div class="fs-sm">{{ generatedPassword.name }}</div>
</div>
</div>
</div>
<div class="col-12 col-md-4">
<div class="card dialog-check-card h-100">
<div class="card-body py-2 px-3">
- <div class="text-muted text-uppercase fs-4xs mb-1" l10nTranslate>Application</div>
- <div class="fs-xs">{{ generatedPassword.app | translate: locale.language }}</div>
+ <div class="text-muted text-uppercase fs-sm mb-1" l10nTranslate>Application</div>
+ <div class="fs-sm">{{ generatedPassword.app | translate: locale.language }}</div>
</div>
</div>
</div>
<div class="col-12 col-md-4">
<div class="card dialog-check-card h-100">
<div class="card-body py-2 px-3">
- <div class="text-muted text-uppercase fs-4xs mb-1" l10nTranslate>Expiration</div>
- <div class="fs-xs">
+ <div class="text-muted text-uppercase fs-sm mb-1" l10nTranslate>Expiration</div>
+ <div class="fs-sm">
@if (generatedPassword.expiration) {
{{ generatedPassword.expiration | amDateFormat:'L' }}
} @else {
@@ -120,9 +120,9 @@
<div class="card dialog-check-card">
<div class="card-body py-2 px-3">
<div class="d-flex align-items-center gap-2">
- <div class="text-muted text-uppercase fs-4xs flex-shrink-0" l10nTranslate>Generated password</div>
- <div class="font-monospace fs-xs text-center flex-grow-1 text-truncate px-2">{{ generatedPassword.password }}</div>
- <button class="btn btn-sm btn-outline-success flex-shrink-0"
+ <div class="text-muted text-uppercase fs-sm flex-shrink-0" l10nTranslate>Generated password</div>
+ <div class="font-monospace fs-sm text-center flex-grow-1 text-truncate px-2">{{ generatedPassword.password }}</div>
+ <button class="btn btn-outline-success flex-shrink-0"
(click)="clipBoardPassword()"
type="button">
<fa-icon [icon]="icons.faCopy" class="me-1"></fa-icon>
@@ -138,7 +138,7 @@
@if (appPasswords.length) {
<div class="card dialog-tab-card">
<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">
+ <div class="d-flex align-items-center text-muted text-uppercase fs-sm text-bold px-1 pt-1">
<span l10nTranslate>Existing passwords</span>
<span class="badge bg-secondary ms-auto">{{ appPasswords.length }}</span>
</div>
@@ -148,33 +148,33 @@
<div class="card-body p-2">
<div class="d-flex align-items-center justify-content-between gap-2 flex-wrap mb-2">
<div class="d-flex align-items-center gap-2">
+ <span class="text-bold fs-sm">{{ p.name }}</span>
<span class="badge bg-success">{{ p.app | translate: locale.language }}</span>
- <span class="fw-semibold fs-xs">{{ p.name }}</span>
</div>
- <button class="btn btn-sm btn-outline-danger" (click)="deleteAppPassword(p.name)" l10nTranslate>Delete</button>
+ <button class="btn btn-outline-danger" (click)="deleteAppPassword(p.name)" l10nTranslate>Delete</button>
</div>
- <div class="row g-2 fs-3xs">
+ <div class="row g-2 fs-sm">
<div class="col-12 col-md-4">
- <div class="text-muted text-uppercase fw-semibold" l10nTranslate>Access</div>
+ <div class="text-muted text-uppercase text-bold" l10nTranslate>Access</div>
<div>{{ p.currentAccess ? (p.currentAccess | amDateFormat) : '-' }}</div>
@if (p.lastAccess) {
<div>{{ p.lastAccess | amDateFormat }}</div>
}
</div>
<div class="col-12 col-md-3">
- <div class="text-muted text-uppercase fw-semibold">IP</div>
+ <div class="text-muted text-uppercase text-bold">IP</div>
<div>{{ p.currentIp || '-' }}</div>
@if (p.lastIp) {
<div>{{ p.lastIp }}</div>
}
</div>
<div class="col-12 col-md-2">
- <div class="text-muted text-uppercase fw-semibold" l10nTranslate>Expiration</div>
+ <div class="text-muted text-uppercase text-bold" l10nTranslate>Expiration</div>
<div>{{ p.expiration ? (p.expiration | amDateFormat:'L') : ('never' | translate: locale.language) }}</div>
</div>
<div class="col-12 col-md-3">
- <div class="text-muted text-uppercase fw-semibold" l10nTranslate>Created</div>
+ <div class="text-muted text-uppercase text-bold" l10nTranslate>Created</div>
<div>{{ p.createdAt | amDateFormat }}</div>
</div>
</div>
@@ -193,5 +193,5 @@
</div>
</div>
<div class="modal-footer">
- <button (click)="onClose()" class="btn btn-sm btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Close</button>
+ <button (click)="onClose()" class="btn btn-secondary" data-dismiss="modal" type="button" l10nTranslate>Close</button>
</div>
diff --git a/frontend/src/app/applications/users/components/dialogs/user-group-add-users-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-group-add-users-dialog.component.html
index 086b68bd..e14b4346 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-group-add-users-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-group-add-users-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faUserPlus" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faUserPlus"></fa-icon>
<span>{{ parentGroup.name }}</span>
</h4>
<h4 class="modal-title ms-auto">
@@ -17,9 +17,9 @@
</app-user-search>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="submitted || !newMembers.length" class="btn btn-sm btn-primary"
+ [disabled]="submitted || !newMembers.length" class="btn btn-primary"
type="button"
l10nTranslate>
Confirm
diff --git a/frontend/src/app/applications/users/components/dialogs/user-group-delete-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-group-delete-dialog.component.html
index 513d8c15..8685a4b5 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-group-delete-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-group-delete-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="member.isUser ? icons.faUserMinus : icons.faMinus" class="me-2"></fa-icon>
+ <fa-icon [icon]="member.isUser ? icons.faUserMinus : icons.faMinus"></fa-icon>
<span>{{ member.name }}</span>
</h4>
<h4 class="modal-title ms-auto">
@@ -17,12 +17,12 @@
<fa-icon [icon]="icons.GROUPS" class="{{member.isPersonalGroup ? 'circle-purple-icon' : 'circle-primary-icon'}}"></fa-icon>
}
</div>
- <span class="fw-semibold me-1">{{ member.name | capitalize }}</span>
+ <span class="text-bold me-1">{{ member.name | capitalize }}</span>
<span translate>will be removed</span>
@if (member.isUser) {
<div class="d-flex align-items-center">
<span class="mx-1" translate>from the group</span>
- <span class="fw-semibold me-1">{{ parentGroup.name | capitalize }}</span>
+ <span class="text-bold me-1">{{ parentGroup.name | capitalize }}</span>
</div>
}
</div>
@@ -31,9 +31,9 @@
}
</div>
<div class="modal-footer">
- <button (click)="onClose()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onClose()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="submitted" class="btn btn-sm btn-danger"
+ [disabled]="submitted" class="btn btn-danger"
type="button"
l10nTranslate>
Remove
diff --git a/frontend/src/app/applications/users/components/dialogs/user-group-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-group-dialog.component.html
index 31a9b6fb..b7f3f4b6 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-group-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-group-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.GROUPS" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.GROUPS"></fa-icon>
@if (group.id) {
<span>{{ group.name }}</span>
} @else {
@@ -34,7 +34,7 @@
[autoSelect]="false"
[(ngModel)]="group.name"
[class.is-invalid]="!group.name"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -43,7 +43,7 @@
<input id="description"
[(ngModel)]="group.description"
[disabled]="!isPersonalGroup"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -52,17 +52,17 @@
@if (group.id) {
<div class="card dialog-tab-card w-100 mt-3">
<div class="card-body">
- <div class="row g-3 fs-2xs">
+ <div class="row g-3">
<div class="col-12 col-md-6">
<div class="d-flex flex-column">
<label class="form-label" for="created" l10nTranslate>Creation date</label>
- <div id="created">{{ group.createdAt | amDateFormat }}</div>
+ <div class="fs-sm" id="created">{{ group.createdAt | amDateFormat }}</div>
</div>
</div>
<div class="col-12 col-md-6">
<div class="d-flex flex-column text-md-end">
<label class="form-label" for="modified" l10nTranslate>Modification date</label>
- <div id="modified">{{ group.modifiedAt | amDateFormat }}</div>
+ <div class="fs-sm" id="modified">{{ group.modifiedAt | amDateFormat }}</div>
</div>
</div>
</div>
@@ -73,10 +73,10 @@
</div>
</div>
<div class="modal-footer">
- <button (click)="onCancel()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onCancel()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
[disabled]="!this.group.name || submitted"
- class="btn btn-sm btn-primary"
+ class="btn btn-primary"
type="button"
l10nTranslate>
Confirm
diff --git a/frontend/src/app/applications/users/components/dialogs/user-guest-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-guest-dialog.component.html
index d739544a..2c866146 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-guest-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-guest-dialog.component.html
@@ -1,10 +1,10 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
@if (guest) {
- <fa-icon [icon]="icons.faPen" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faPen"></fa-icon>
<span>{{ guest.fullName }}</span>
} @else {
- <fa-icon [icon]="icons.faPlus" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faPlus"></fa-icon>
<span l10nTranslate>New guest</span>
}
@if (loading) {
@@ -39,7 +39,7 @@
[autoSelect]="false"
formControlName="login"
[class.is-invalid]="guestForm.controls['login'].invalid"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -48,7 +48,7 @@
<input id="email"
formControlName="email"
[class.is-invalid]="guestForm.controls['email'].invalid"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="email">
</div>
@@ -57,7 +57,7 @@
<input id="firstName"
formControlName="firstName"
[class.is-invalid]="guestForm.controls['firstName'].invalid"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -65,7 +65,7 @@
<label class="form-label" for="lastName" l10nTranslate>Last name</label>
<input id="lastName"
formControlName="lastName"
- class="form-control form-control-sm"
+ class="form-control"
autocomplete="off"
type="text">
</div>
@@ -105,7 +105,7 @@
<label class="form-label" for="language" l10nTranslate>Language</label>
<select id="language"
formControlName="language"
- class="form-control form-select form-select-sm">
+ class="form-control form-select">
@for (l of languages; track $index) {
<option [ngValue]="l">{{ i18nLanguageText[l] }}</option>
}
@@ -116,7 +116,7 @@
<label class="form-label" for="notification" l10nTranslate>Notification</label>
<select id="notification"
formControlName="notification"
- class="form-control form-select form-select-sm">
+ class="form-control form-select">
@for (n of allNotifications; track $index) {
<option [ngValue]="allNotifications.indexOf(n)" l10nTranslate>{{ n }}</option>
}
@@ -145,17 +145,17 @@
@if (guest) {
<div class="card dialog-tab-card w-100">
<div class="card-body">
- <div class="row g-3 fs-2xs">
- <div class="col-12 col-md-5">
+ <div class="row g-3">
+ <div class="col-12">
<div class="d-flex flex-column">
<label class="form-label" for="created" l10nTranslate>Creation date</label>
- <div id="created">{{ guest.createdAt | amDateFormat }}</div>
+ <div class="fs-sm" id="created">{{ guest.createdAt | amDateFormat }}</div>
</div>
</div>
- <div class="col-12 col-md-7">
- <div class="d-flex flex-column text-md-end">
+ <div class="col-12">
+ <div class="d-flex flex-column">
<label class="form-label" for="access" l10nTranslate>Last accesses</label>
- <div id="access">
+ <div class="fs-sm" id="access">
@if (guest.lastAccess) {
<div class="d-flex flex-column mb-2">
<span>{{ guest.currentAccess | amDateFormat }}</span>
@@ -166,7 +166,7 @@
<span>{{ guest.lastIp }}</span>
</div>
} @else {
- <span class="text-danger" l10nTranslate>never</span>
+ <span class="badge bg-danger" l10nTranslate>never</span>
}
</div>
</div>
@@ -205,13 +205,13 @@
@if (guest?.id) {
<button (click)="confirmDeletion = true"
[disabled]="confirmDeletion"
- class="btn btn-sm btn-danger" type="button" l10nTranslate>
+ class="btn btn-danger" type="button" l10nTranslate>
Remove
</button>
}
- <button (click)="onCancel()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onCancel()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="guestForm.invalid || submitted" class="btn btn-sm {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
+ [disabled]="guestForm.invalid || submitted" class="btn {{confirmDeletion ? 'btn-danger' : 'btn-primary'}}"
type="button"
l10nTranslate>
{{ confirmDeletion ? 'Confirm deletion' : 'Confirm' }}
diff --git a/frontend/src/app/applications/users/components/dialogs/user-personal-group-edit-user-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-personal-group-edit-user-dialog.component.html
index 1bb53336..defda5e5 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-personal-group-edit-user-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-personal-group-edit-user-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faUserPen" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faUserPen"></fa-icon>
<span>{{ user.name }}</span>
</h4>
<h4 class="modal-title ms-auto">
@@ -27,9 +27,9 @@
<small l10nTranslate>As a manager, the user will be able to manage the group and its members.</small>
</div>
<div class="modal-footer">
- <button (click)="layout.closeDialog()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="layout.closeDialog()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="submitted" class="btn btn-sm btn-primary"
+ [disabled]="submitted" class="btn btn-primary"
type="button"
l10nTranslate>
Confirm
diff --git a/frontend/src/app/applications/users/components/dialogs/user-personal-group-leave-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-personal-group-leave-dialog.component.html
index c722ff44..7bb135c3 100644
--- a/frontend/src/app/applications/users/components/dialogs/user-personal-group-leave-dialog.component.html
+++ b/frontend/src/app/applications/users/components/dialogs/user-personal-group-leave-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header align-items-center">
<h4 class="modal-title">
- <fa-icon [icon]="icons.faRightFromBracket" class="me-2"></fa-icon>
+ <fa-icon [icon]="icons.faRightFromBracket"></fa-icon>
<span l10nTranslate>Leave group</span>
</h4>
<button (click)="onClose()" aria-label="Close" class="btn-close btn-close-white ms-auto" type="button"></button>
@@ -10,14 +10,14 @@
<div class="d-flex align-items-center avatar me-2">
<fa-icon [icon]="icons.GROUPS" class="{{member.isPersonalGroup ? 'circle-purple-icon' : 'circle-primary-icon'}}"></fa-icon>
</div>
- <span class="fw-semibold me-1">{{ member.name }}</span>
+ <span class="text-bold me-1">{{ member.name }}</span>
<span l10nTranslate>will be left, you will no longer be a member of this group</span>
</div>
</div>
<div class="modal-footer">
- <button (click)="onClose()" class="btn btn-sm btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
+ <button (click)="onClose()" class="btn btn-secondary ms-auto" data-dismiss="modal" type="button" l10nTranslate>Cancel</button>
<button (click)="onSubmit()"
- [disabled]="submitted" class="btn btn-sm btn-primary"
+ [disabled]="submitted" class="btn btn-primary"
type="button"
l10nTranslate>
Confirm
diff --git a/frontend/src/app/applications/users/components/sidebar/user-onlines.component.html b/frontend/src/app/applications/users/components/sidebar/user-onlines.component.html
index 45da0d47..b3bc9aa5 100644
--- a/frontend/src/app/applications/users/components/sidebar/user-onlines.component.html
+++ b/frontend/src/app/applications/users/components/sidebar/user-onlines.component.html
@@ -8,8 +8,8 @@
<img [src]="user.avatarUrl" class="avatar-img" alt="">
<span class="avatar-{{allOnlineStatus[user?.onlineStatus]}}"></span>
<div class="d-flex flex-column ms-2">
- <span class="no-pointer-events fs-xs" draggable="false">{{ user.fullName }}</span>
- <span class="no-pointer-events text-muted fs-3xs" draggable="false">{{ user.email }}</span>
+ <span class="no-pointer-events fs-sm" draggable="false">{{ user.fullName }}</span>
+ <span class="no-pointer-events text-muted fs-xs" draggable="false">{{ user.email }}</span>
</div>
</div>
</div>
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.html
index 08f55c78..e526341a 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-sm btn-default" (click)="collapseRSideBar()" type="button" [routerLink]=USER_PATH.BASE>
+ <button class="btn btn-default" (click)="collapseRSideBar()" type="button" [routerLink]=USER_PATH.BASE>
<fa-icon [icon]="icons.faUserAlt"></fa-icon>
</button>
}
- <button class="btn btn-sm btn-default" (click)="toggleTheme()" type="button">
+ <button class="btn btn-default" (click)="toggleTheme()" type="button">
<fa-icon [icon]="icons.faCircleHalfStroke"></fa-icon>
</button>
@if (user?.isAdmin) {
- <button class="btn btn-sm btn-default" (click)="collapseRSideBar()" type="button" routerLink="/admin">
+ <button class="btn btn-default" (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-sm btn-default" type="button">
+ <button (click)="logOut()" class="btn btn-default" type="button">
<fa-icon [icon]="store.userImpersonate() ? icons.faUserSecret : icons.faPowerOff"></fa-icon>
</button>
}
@@ -35,11 +35,11 @@
<div l10nTranslate>Guest Link</div>
} @else {
<div>{{ user?.fullName }}</div>
- <div class="small">{{ user?.email }}</div>
+ <div class="fs-xs mt-1">{{ user?.email }}</div>
}
<select [ngModel]="user?.onlineStatus"
(ngModelChange)="setOnlineStatus($event)"
- class="form-select form-select-sm mt-3">
+ class="form-select form-select-sm mt-2">
@for (s of allOnlineStatus; track $index) {
<option [ngValue]="allOnlineStatus.indexOf(s)">{{ s | translate:locale.language | capitalize }}</option>
}
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 d6c6e1d8..27f8f789 100755
--- a/frontend/src/app/applications/users/components/user-account.component.html
+++ b/frontend/src/app/applications/users/components/user-account.component.html
@@ -6,7 +6,7 @@
<div class="card dialog-tab-card">
<div class="card-body">
<div class="user-header p-0">
- <div class="d-flex flex-column justify-content-center me-2">
+ <div class="d-flex flex-column justify-content-center">
<div class="avatar-xl">
<img [src]="userAvatar" class="avatar-img profile-user-img" alt="">
<span class="avatar-{{allOnlineStatus[user.onlineStatus]}}"></span>
@@ -15,14 +15,14 @@
<div class="user-details">
<div class="mb-1">{{ user.fullName }}</div>
- <div class="mb-2 fs-2xs text-nowrap">{{ user.email }}</div>
- <div class="text-muted fs-2xs">
+ <div class="mb-2 fs-sm text-nowrap">{{ user.email }}</div>
+ <div class="text-muted fs-sm">
{{ 'Member since' | translate:locale.language }} {{ user.createdAt | amTimeAgo:true }}
</div>
<select [(ngModel)]="user.onlineStatus"
(ngModelChange)="setOnlineStatus($event)"
- class="form-select form-select-sm my-auto mt-2">
+ class="form-select my-auto mt-2">
@for (n of allOnlineStatus; track $index) {
<option [ngValue]="allOnlineStatus.indexOf(n)">
{{ n | translate:locale.language | capitalize }}
@@ -99,14 +99,14 @@
<div class="card dialog-tab-card">
<div class="card-body">
- <div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Preferences</div>
+ <div class="text-muted text-uppercase fs-sm text-bold mb-2" l10nTranslate>Preferences</div>
@if (showEditorPreference) {
<div class="row g-2 align-items-center mb-2">
- <span class="col-12 col-sm-5" l10nTranslate>Document editor</span>
- <div class="col-12 col-sm-7">
+ <label for="" class="col-12 col-sm-6" l10nTranslate>Document editor</label>
+ <div class="col-12 col-sm-6">
<select
- class="form-select form-select-sm"
+ class="form-select"
[ngModel]="userEditorPreference"
(ngModelChange)="updateEditorPreference($event)">
<option [ngValue]="null" l10nTranslate>Ask Me</option>
@@ -116,7 +116,7 @@
</select>
</div>
</div>
- <div class="text-muted fs-2xs mb-3" l10nTranslate>
+ <div class="text-muted fs-sm mb-3" l10nTranslate>
Used when both editors support the file type.
</div>
}
@@ -142,7 +142,7 @@
role="button">
</div>
</div>
- <div class="text-muted fs-2xs mt-2 px-1" l10nTranslate>
+ <div class="text-muted fs-sm mt-2 px-1" l10nTranslate>
Enable content indexation for personal files.
</div>
</div>
@@ -157,15 +157,15 @@
<div class="col-12 col-lg-6 d-flex flex-column gap-3">
<div class="card dialog-tab-card">
<div class="card-body">
- <div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Configuration</div>
+ <div class="text-muted text-uppercase fs-sm text-bold mb-2" l10nTranslate>Configuration</div>
<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-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-default" type="button">
+ <button (click)="genAvatar()" class="btn btn-success" type="button" l10nTranslate>Generate</button>
+ <button class="btn-file-upload btn btn-default" type="button">
<span l10nTranslate>Import</span>
<input (change)="uploadAvatar($event)" accept="image/*" name="file" role="button" type="file" />
</button>
@@ -177,7 +177,7 @@
<div class="row g-2 align-items-center">
<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">
+ <select id="userLanguage" [(ngModel)]="language" class="form-select">
@for (l of languages; track $index) {
<option [ngValue]="l">{{ i18nLanguageText[l] }}</option>
}
@@ -191,7 +191,7 @@
<select id="userNotification"
[ngModel]="user.notification"
(ngModelChange)="updateNotification($event)"
- class="form-select form-select-sm">
+ class="form-select">
@for (n of allNotifications; track $index) {
<option [ngValue]="allNotifications.indexOf(n)" l10nTranslate>{{ n }}</option>
}
@@ -205,12 +205,19 @@
@if (user.isUser) {
<div class="card dialog-tab-card">
<div class="card-body">
- <div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Password</div>
+ <div class="d-flex align-items-center justify-content-between flex-wrap gap-2 mb-2">
+ <div class="text-muted text-uppercase text-nowrap fs-sm text-bold" l10nTranslate>Password</div>
+ @if (newPassword) {
+ <div class="ms-auto d-flex justify-content-end">
+ <app-password-strength-bar [passwordToCheck]="newPassword"></app-password-strength-bar>
+ </div>
+ }
+ </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-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>
+ <app-input-password [(password)]="oldPassword"></app-input-password>
</div>
</div>
@@ -221,24 +228,16 @@
[disabled]="!oldPassword?.length"
[isRequired]="!!oldPassword?.length"
[passwordMinLength]="passwordMinLength"
- [showGenerator]="true"
- placeholder="new password"></app-input-password>
+ [showGenerator]="true">
+ </app-input-password>
</div>
</div>
- @if (newPassword) {
- <div class="row g-2">
- <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-6 offset-md-6">
<button [disabled]="!newPassword || !oldPassword || newPassword.length < passwordMinLength"
(click)="submitPassword()"
- class="btn btn-xs btn-primary text-nowrap"
+ class="btn btn-primary text-nowrap"
type="button"
l10nTranslate>
Update
@@ -251,14 +250,14 @@
<div class="card dialog-tab-card flex-grow-1">
<div class="card-body">
- <div class="text-muted text-uppercase fs-3xs fw-semibold mb-2" l10nTranslate>Security</div>
+ <div class="text-muted text-uppercase fs-sm text-bold 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-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"
+ class="btn btn-primary"
type="button"
l10nTranslate>
{{ user.twoFaEnabled ? 'Reset' : 'Enable' }}
@@ -266,7 +265,7 @@
@if (user.twoFaEnabled) {
<button (click)="disable2Fa()"
[disabled]="!store.server().twoFaEnabled"
- class="btn btn-xs btn-danger"
+ class="btn btn-danger"
type="button"
l10nTranslate>
Disable
@@ -279,7 +278,7 @@
<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"
+ class="btn btn-primary"
type="button"
l10nTranslate>
@if (user.appPasswords > 0) {
diff --git a/frontend/src/app/applications/users/components/user-applications.component.html b/frontend/src/app/applications/users/components/user-applications.component.html
index c0b8b396..553e762e 100644
--- a/frontend/src/app/applications/users/components/user-applications.component.html
+++ b/frontend/src/app/applications/users/components/user-applications.component.html
@@ -1,11 +1,11 @@
<div class="app-top-menu px-4 user-applications-topbar">
@if (store.appStoreManifest()) {
- <div class="d-flex flex-fill align-items-center fs-xs flex-wrap gap-2">
+ <div class="d-flex flex-fill align-items-center flex-wrap gap-2">
<span class="d-none d-sm-block badge bg-default text-nowrap">
- <span l10nTranslate>Repository</span>:&nbsp;<span class="fw-semibold" l10nTranslate>{{ store.appStoreManifest().repository }}</span>
+ <span l10nTranslate>Repository</span>:&nbsp;<span class="text-bold" l10nTranslate>{{ store.appStoreManifest().repository }}</span>
</span>
<span class="badge bg-default mx-auto text-nowrap">
- <span l10nTranslate>Version</span>:&nbsp;<span class="fw-semibold">{{ store.appStoreManifest().version }}</span>
+ <span l10nTranslate>Version</span>:&nbsp;<span class="text-bold">{{ store.appStoreManifest().version }}</span>
</span>
<span class="badge bg-default text-nowrap">{{ store.appStoreManifest().date | amDateFormat:'L' }}</span>
</div>
@@ -22,52 +22,52 @@
<div class="app-download-card-icon dialog-check-card">
@switch (app) {
@case (APP_STORE_OS.WIN) {
- <fa-icon [icon]="icons.faWindows" size="2x" style="height: 32px"></fa-icon>
+ <fa-icon [icon]="icons.faWindows"></fa-icon>
}
@case (APP_STORE_OS.MAC) {
- <fa-icon [icon]="icons.faApple" size="2x" style="height: 32px"></fa-icon>
+ <fa-icon [icon]="icons.faApple"></fa-icon>
}
@case (APP_STORE_OS.LINUX) {
- <fa-icon [icon]="icons.faLinux" size="2x" style="height: 32px"></fa-icon>
+ <fa-icon [icon]="icons.faLinux"></fa-icon>
}
@case (APP_STORE_OS.NODE) {
- <fa-icon [icon]="icons.faTerminal" size="2x" style="height: 32px"></fa-icon>
+ <fa-icon [icon]="icons.faTerminal"></fa-icon>
}
}
</div>
@switch (app) {
@case (APP_STORE_OS.WIN) {
- <h5 class="app-download-card-title">Windows</h5>
+ <h1 class="app-download-card-title">Windows</h1>
}
@case (APP_STORE_OS.MAC) {
- <h5 class="app-download-card-title">Mac</h5>
+ <h1 class="app-download-card-title">Mac</h1>
}
@case (APP_STORE_OS.LINUX) {
- <h5 class="app-download-card-title">Linux</h5>
+ <h1 class="app-download-card-title">Linux</h1>
}
@case (APP_STORE_OS.NODE) {
- <h5 class="app-download-card-title">Command Line</h5>
+ <h1 class="app-download-card-title">Command Line</h1>
}
}
- <a (click)="download(app)" class="btn btn-sm btn-primary app-download-card-btn">
+ <a (click)="download(app)" class="btn btn-primary app-download-card-btn">
<fa-icon [icon]="icons.faDownload" class="me-2"></fa-icon>
<span l10nTranslate>Download</span>
</a>
<div class="app-download-card-details">
@if (app === APP_STORE_OS.NODE) {
- <div class="app-download-card-meta small text-muted">
+ <div class="app-download-card-meta text-muted">
<span l10nTranslate>System requirements</span>
<span>:&nbsp;Node.js 22+</span>
</div>
- <a role="button" (click)="download(app, true)" class="app-download-card-link small" l10nTranslate>
+ <a role="button" (click)="download(app, true)" class="app-download-card-link" l10nTranslate>
<span l10nTranslate>Download tar.gz version</span>&nbsp;
</a>
} @else {
- <div class="app-download-card-meta small text-muted">
+ <div class="app-download-card-meta text-muted">
<span l10nTranslate>System requirements</span>
<span>:&nbsp;{{ app === APP_STORE_OS.MAC ? 'Intel 64bit' : '64bit' }}</span>
</div>
- <a role="button" (click)="download(app, true)" class="app-download-card-link small" l10nTranslate>{{ app === APP_STORE_OS.MAC ? 'Download Apple Silicon ARM64 version' : 'Download ARM64 version' }}</a>
+ <a role="button" (click)="download(app, true)" class="app-download-card-link" l10nTranslate>{{ app === APP_STORE_OS.MAC ? 'Download Apple Silicon ARM64 version' : 'Download ARM64 version' }}</a>
}
</div>
</div>
diff --git a/frontend/src/app/applications/users/components/user-applications.component.scss b/frontend/src/app/applications/users/components/user-applications.component.scss
index ba62e6a3..71bcda37 100644
--- a/frontend/src/app/applications/users/components/user-applications.component.scss
+++ b/frontend/src/app/applications/users/components/user-applications.component.scss
@@ -23,13 +23,16 @@
align-items: center;
justify-content: center;
margin-bottom: 0.2rem;
+
+ fa-icon {
+ font-size: calc(var(--font-size-3xl) * 1.5)
+ }
}
.app-download-card-title {
margin: 0.75rem 0 0.35rem;
font-weight: 500;
line-height: 1.2;
- letter-spacing: 0.01em;
}
.app-download-card-btn {
@@ -41,7 +44,7 @@
}
.app-download-card-meta {
- font-size: 0.76rem;
+ font-size: var(--font-size-sm);
line-height: 1.35;
margin-bottom: 0.25rem;
}
@@ -50,6 +53,7 @@
display: inline-block;
line-height: 1.35;
text-underline-offset: 0.18rem;
+ font-size: var(--font-size-sm);
}
}
diff --git a/frontend/src/app/applications/users/components/user-groups.component.html b/frontend/src/app/applications/users/components/user-groups.component.html
index 8a5acba4..9067ff17 100644
--- a/frontend/src/app/applications/users/components/user-groups.component.html
+++ b/frontend/src/app/applications/users/components/user-groups.component.html
@@ -1,7 +1,7 @@
<!--Start Top Menu-->
<div class="app-top-menu">
<button (click)="refresh()"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
type="button">
@@ -9,14 +9,14 @@
</button>
<button (click)="openDialog(true)"
[disabled]="!allowedAction.addGroup && !allowedAction.addUsers"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="(allowedAction.addGroup ? 'New personal group': 'Add members') | translate:locale.language"
container="body"
type="button">
<fa-icon [icon]="icons.faPlus"></fa-icon>
</button>
<button (click)="openDialog(false, true)"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[disabled]="!allowedAction.removeGroup && !allowedAction.removeUser"
[tooltip]="(allowedAction.removeGroup ? 'Delete group' : 'Remove from group') | translate:locale.language"
container="body"
@@ -25,17 +25,17 @@
</button>
<button (click)="openDialog()"
[disabled]="!allowedAction.editGroup && !allowedAction.editUser"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="(allowedAction.editGroup ? 'Edit group' : 'Edit user') | translate:locale.language"
container="body"
type="button">
<fa-icon [icon]="icons.faPen"></fa-icon>
</button>
@if (!currentGroup) {
- <div class="btn-group btn-group-sm me-1" dropdown>
+ <div class="btn-group me-1" dropdown>
<button dropdownToggle
[class.disabled]="!selected"
- class="btn btn-sm btn-default dropdown-toggle"
+ class="btn btn-default dropdown-toggle"
type="button">
<fa-icon [icon]="icons.faEllipsis"></fa-icon>
</button>
@@ -110,7 +110,7 @@
<fa-icon class="m-0" [icon]="icons.faKey"></fa-icon>
}
</span>
- <span class="no-pointer-events text-muted fs-3xs" draggable="false">{{ m.description }}</span>
+ <span class="no-pointer-events text-muted fs-xs" draggable="false">{{ m.description }}</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 9cab21ee..4aa35f79 100644
--- a/frontend/src/app/applications/users/components/user-guests.component.html
+++ b/frontend/src/app/applications/users/components/user-guests.component.html
@@ -1,7 +1,7 @@
<!--Start Top Menu-->
<div class="app-top-menu">
<button (click)="loadGuests()"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Refresh' | translate:locale.language"
container="body"
type="button">
@@ -9,7 +9,7 @@
</button>
<button (click)="openGuestDialog(true)"
[disabled]="!canCreateGuest"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'New guest' | translate:locale.language"
container="body"
type="button">
@@ -17,7 +17,7 @@
</button>
<button (click)="openGuestDialog()"
[disabled]="!selected"
- class="btn btn-sm btn-default me-1"
+ class="btn btn-default me-1"
[tooltip]="'Edit guest' | translate:locale.language"
container="body"
type="button">
@@ -74,7 +74,7 @@
<span class="no-pointer-events" draggable="false">
{{ u.login }}
</span>
- <span class="no-pointer-events text-muted fs-3xs" draggable="false">{{ u.email }}</span>
+ <span class="no-pointer-events text-muted fs-xs" draggable="false">{{ u.email }}</span>
</div>
</div>
}
@@ -118,7 +118,7 @@
}
</span>
} @else {
- <span class="{{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}" l10nTranslate>never</span>
+ <span class="badge bg-danger" l10nTranslate>never</span>
}
}
}
diff --git a/frontend/src/app/applications/users/components/utils/users-search.component.html b/frontend/src/app/applications/users/components/utils/users-search.component.html
index c1949a53..6881a8da 100644
--- a/frontend/src/app/applications/users/components/utils/users-search.component.html
+++ b/frontend/src/app/applications/users/components/utils/users-search.component.html
@@ -12,10 +12,10 @@
<div class="d-flex ms-2 pe-5 {{member.description ? 'flex-column align-items-start' : 'align-items-center'}}">
<div [innerHTML]="member.name | highlight: selection"></div>
@if (member.description) {
- <span class="fs-4xs me-4 text-muted" [innerHTML]="member.description | highlight: selection"></span>
+ <span class="fs-xs me-4 text-muted" [innerHTML]="member.description | highlight: selection"></span>
}
</div>
- <div class="ms-auto ps-5 me-1 text-muted d-none d-lg-block fs-4xs align-self-center">
+ <div class="ms-auto ps-5 me-1 text-muted d-none d-lg-block fs-2xs align-self-center">
<span l10nTranslate>{{ member.type }}</span>
</div>
</div>
@@ -38,17 +38,17 @@
[typeaheadWaitMs]="100"
[typeaheadHideResultsOnBlur]="true"
[typeahead]="asyncSearchUsersOrGroups"
- class="form-control form-control-sm mb-3"
+ class="form-control mb-3"
/>
</div>
}
<div class="col-12 mt-1">
@for (member of members; track member.mid) {
<div class="{{rowBackgroundClass}} mb-1 px-3 py-2" style="border-radius: 4px">
- <div class="d-flex align-items-center text-truncate no-select fs-xs" style="max-height: 34px">
+ <div class="d-flex align-items-center text-truncate no-select fs-sm" style="max-height: 38px">
<div class="d-flex align-items-center text-truncate me-auto">
@if (member.isUser) {
- <img alt="" class="avatar-base-img" height="30" width="30" [src]="member.avatarUrl" />
+ <img alt="" class="avatar-base-img" height="35" width="35" [src]="member.avatarUrl" />
} @else if (member.isLink) {
<fa-icon [icon]="icons.LINKS" class="circle-primary-icon"></fa-icon>
} @else {
@@ -58,16 +58,16 @@
}
<div class="d-flex flex-column text-truncate ms-2">
<div class="text-truncate">{{ member.name }}</div>
- <div class="fs-3xs text-truncate text-muted">
+ <div class="fs-xs text-truncate text-muted">
@if (member.description) {
- <span class="fs-3xs">{{ member.description }}</span>
+ <span>{{ member.description }}</span>
} @else if (!member.linkId) {
- <span class="fs-3xs" l10nTranslate>{{ member.type }}</span>
+ <span l10nTranslate>{{ member.type }}</span>
}
</div>
</div>
</div>
- <div class="d-flex flex-column fs-3xs text-muted d-none d-lg-block ms-3">
+ <div class="d-flex flex-column fs-2xs text-muted d-none d-lg-block ms-3">
<div class="d-flex justify-content-end" l10nTranslate>{{ member.isLink ? MEMBER_TYPE.LINK : member.type }}</div>
<div class="d-flex justify-content-end">{{ member.createdAt | amTimeAgo }}</div>
</div>
diff --git a/frontend/src/app/auth/auth.component.html b/frontend/src/app/auth/auth.component.html
index 94b2b701..d7612239 100644
--- a/frontend/src/app/auth/auth.component.html
+++ b/frontend/src/app/auth/auth.component.html
@@ -1,14 +1,14 @@
<div class="app-auth">
- <div class="background">
+ <div class="auth-card">
<div class="content">
<div class="header">
- <img alt="" height="65" [src]="logoUrl">
+ <img alt="" class="auth-logo img-fluid" [src]="logoUrl">
</div>
<div class="body">
@if (twoFaVerify) {
- <p class="fs-xs mb-3 {{hasError ? 'text-danger' : 'text-white-50'}}" l10nTranslate>{{ hasError || 'Two-Factor Authentication' }}</p>
+ <p class="mb-3 {{hasError ? 'text-danger' : 'text-white-50'}}" l10nTranslate>{{ hasError || 'Two-Factor Authentication' }}</p>
<form (ngSubmit)="onSubmit2Fa()" [formGroup]="twoFaForm">
- <div class="input-group mt-2 mb-4">
+ <div class="input-group input-group-lg mt-2 mb-4">
@if (isRecoveryCode) {
<span class="input-group-text">
<fa-icon [icon]="icons.faKey"></fa-icon>
@@ -16,7 +16,7 @@
<input appAutofocus
[placeholder]="'Recovery code' | translate:locale.language"
type="password"
- class="form-control"
+ class="form-control form-control-lg"
formControlName="recoveryCode" />
} @else {
<span class="input-group-text">
@@ -25,14 +25,14 @@
<input appAutofocus
[placeholder]="'Authentication code' | translate:locale.language"
type="text"
- class="form-control"
+ class="form-control form-control-lg"
formControlName="totpCode"
inputmode="numeric"
autocomplete="one-time-code"
[maxlength]=twoFaCodelength />
}
</div>
- <div class="d-flex text-white-50 fs-xs">
+ <div class="d-flex text-white-50 fs-sm">
<div class="form-check form-switch form-check-inline">
<label class="form-check-label" for="useRecovery">
<input class="form-check-input" formControlName="isRecoveryCode" id="useRecovery" type="checkbox">
@@ -40,32 +40,32 @@
</label>
</div>
</div>
- <div class="d-flex mt-4">
- <button type="button" (click)="onCancel2Fa()" class="btn btn-secondary px-4 w-50 me-3" l10nTranslate>Cancel</button>
+ <div class="auth-actions d-flex flex-column flex-sm-row gap-2 mt-4">
+ <button type="button" (click)="onCancel2Fa()" class="btn btn-secondary auth-action-btn" l10nTranslate>Cancel</button>
<button type="submit"
[disabled]="isRecoveryCode ? twoFaForm.controls.recoveryCode.invalid : twoFaForm.controls.totpCode.invalid || submitted"
- class="btn btn-primary px-4 w-50" l10nTranslate>
+ class="btn btn-primary auth-action-btn" l10nTranslate>
Confirm
</button>
</div>
</form>
} @else {
<form (ngSubmit)="onSubmit()" [formGroup]="loginForm">
- <p class="fs-sm mb-3 {{hasError ? 'text-danger' : 'text-white-50'}}" l10nTranslate>{{ hasError || 'Sign-in to your account' }}</p>
- <div class="input-group my-2">
+ <p class="mb-3 {{hasError ? 'text-danger' : 'text-white-50'}}" l10nTranslate>{{ hasError || 'Sign-in to your account' }}</p>
+ <div class="input-group input-group-lg my-2">
<span class="input-group-text">
<fa-icon [icon]="icons.faUserAlt"></fa-icon>
</span>
- <input appAutofocus class="form-control" formControlName="username" [placeholder]="'Login or Email' | translate:locale.language" type="text" />
+ <input appAutofocus class="form-control form-control-lg" formControlName="username" [placeholder]="'Login or Email' | translate:locale.language" type="text" />
</div>
- <div class="input-group mb-3">
+ <div class="input-group input-group-lg mb-3">
<span class="input-group-text">
<fa-icon [icon]="icons.faLock"></fa-icon>
</span>
- <input class="form-control" formControlName="password" [placeholder]="'Password' | translate:locale.language" type="password" />
+ <input class="form-control form-control-lg" formControlName="password" [placeholder]="'Password' | translate:locale.language" type="password" />
</div>
<div class="d-flex">
- <button type="submit" [disabled]="loginForm.invalid || submitted" class="btn btn-primary px-4 w-100" l10nTranslate>Sign in</button>
+ <button type="submit" [disabled]="loginForm.invalid || submitted" class="btn btn-lg btn-primary w-100" l10nTranslate>Sign in</button>
</div>
</form>
@if (oidcSettings) {
@@ -73,7 +73,7 @@
<div class="d-flex mt-3">
<button
type="button"
- class="btn btn-primary px-4 w-100"
+ class="btn btn-lg btn-primary w-100"
[disabled]="OIDCSubmitted"
(click)="loginWithOIDC()">
<span l10nTranslate>{{ oidcSettings.buttonText }}</span>
diff --git a/frontend/src/app/common/components/badge-members.component.ts b/frontend/src/app/common/components/badge-members.component.ts
index 6ab5d3e3..28d9a52c 100644
--- a/frontend/src/app/common/components/badge-members.component.ts
+++ b/frontend/src/app/common/components/badge-members.component.ts
@@ -58,7 +58,7 @@ interface BadgeEntry {
align-items: center;
gap: 0.5rem;
color: var(--members-breakdown-color);
- font-size: 0.8125rem;
+ font-size: var(--font-size-base);
}
.members-part {
@@ -72,7 +72,7 @@ interface BadgeEntry {
}
.members-value {
- font-size: 0.765rem;
+ font-size: var(--font-size-sm);
line-height: 1;
}
`
diff --git a/frontend/src/app/common/components/badge-permissions.component.ts b/frontend/src/app/common/components/badge-permissions.component.ts
index af554932..34f40a79 100644
--- a/frontend/src/app/common/components/badge-permissions.component.ts
+++ b/frontend/src/app/common/components/badge-permissions.component.ts
@@ -70,7 +70,7 @@ interface FilePermissionEntry {
display: inline-block;
color: var(--permission-icon-color);
vertical-align: 0;
- font-size: 0.8125rem;
+ font-size: var(--font-size-base);
}
`
]
diff --git a/frontend/src/app/common/components/input-password.component.ts b/frontend/src/app/common/components/input-password.component.ts
index a4510477..7dddfbb0 100644
--- a/frontend/src/app/common/components/input-password.component.ts
+++ b/frontend/src/app/common/components/input-password.component.ts
@@ -13,7 +13,7 @@ import { togglePasswordType } from '../utils/functions'
template: `@if (showLabel) {
<label for="password" class="form-label" l10nTranslate>Password</label>
}
- <div id="password" class="input-group input-group-sm" style="min-width: 150px">
+ <div id="password" class="input-group" style="min-width: 150px">
<input
#Password
autocomplete="off"
@@ -22,10 +22,10 @@ import { togglePasswordType } from '../utils/functions'
[class.is-invalid]="isRequired && password?.length < passwordMinLength"
(keyup)="passwordChange.emit(password)"
type="password"
- class="form-control form-control-sm pe-0"
+ class="form-control pe-0"
[class.text-center]="centered"
[style.padding-left]="centered ? '2rem' : ''"
- [placeholder]="placeholder | translate: locale.language"
+ [attr.placeholder]="placeholder ? (placeholder | translate: locale.language) : null"
[required]="isRequired"
/>
@if (showGenerator) {
@@ -47,7 +47,7 @@ export class InputPasswordComponent implements OnInit {
@Input() password: string
@Output() passwordChange = new EventEmitter<string>()
@Input() passwordMinLength = USER_PASSWORD_MIN_LENGTH
- @Input() placeholder: string
+ @Input() placeholder: string | null = null
@Input() showGenerator = false
@Input() showLabel = false
@Input() disabled = false
diff --git a/frontend/src/app/common/components/navigation-view/navigation-view.component.html b/frontend/src/app/common/components/navigation-view/navigation-view.component.html
index 07658cb6..67af1f07 100644
--- a/frontend/src/app/common/components/navigation-view/navigation-view.component.html
+++ b/frontend/src/app/common/components/navigation-view/navigation-view.component.html
@@ -1,9 +1,9 @@
-<div class="btn-group btn-group-sm" dropdown>
- <button class="btn btn-sm btn-default dropdown-toggle" dropdownToggle type="button">
+<div class="btn-group" dropdown>
+ <button class="btn btn-default dropdown-toggle" dropdownToggle type="button">
<fa-icon [icon]="icons.faCog"></fa-icon>
</button>
<ul *dropdownMenu class="dropdown-menu dropdown-menu-right" role="menu">
- <li class="dropdown-header fw-semibold" l10nTranslate>Display</li>
+ <li class="dropdown-header text-bold" l10nTranslate>Display</li>
@for (view of viewsMode | keyvalue: originalOrderKeyValue; track view.key) {
<li role="menuitem">
<a (click)="setView(view.key)" class="dropdown-item">
@@ -12,7 +12,7 @@
</a>
</li>
}
- <li class="dropdown-header fw-semibold mt-1" l10nTranslate>Sort by</li>
+ <li class="dropdown-header text-bold mt-1" l10nTranslate>Sort by</li>
@for (field of sortFields | keyvalue: originalOrderKeyValue; track field.key) {
<li role="menuitem">
<a (click)="sortBy.emit(field.key)" class="dropdown-item">
diff --git a/frontend/src/app/common/components/select/select.component.html b/frontend/src/app/common/components/select/select.component.html
index cab0a11b..72762b9c 100644
--- a/frontend/src/app/common/components/select/select.component.html
+++ b/frontend/src/app/common/components/select/select.component.html
@@ -5,11 +5,11 @@
(keyup)="inputEvent($event, true)"
[disabled]="disabled"
autocomplete="false"
- class="form-control form-control-sm ui-select-search"
+ class="form-control ui-select-search"
tabindex="-1"
type="text">
} @else {
- <div class="ui-select-match form-control form-control-sm">
+ <div class="ui-select-match form-control">
<span (click)="matchClick($event)" class="ui-select-toggle no-select" style="outline: 0" tabindex="-1">
@if (active) {
<span [class.ui-select-allow-clear]="allowClear && active" class="ui-select-match-text w-100">
@@ -49,7 +49,7 @@
<fa-icon [icon]="itemIcon" [fixedWidth]="false"></fa-icon>
</span>
<span>{{ active.name }}</span>
- <div class="d-flex ms-auto me-4 fs-3xs text-muted">{{ active.description }}</div>
+ <div class="d-flex ms-auto me-4 fs-xs text-muted">{{ active.description }}</div>
</div>
</ng-template>
<ng-template #DefaultOptions let-i="i" let-o="o">
@@ -59,7 +59,7 @@
<fa-icon [icon]="itemIcon" [fixedWidth]="false"></fa-icon>
</span>
<span [innerHtml]="sanitize(o.name | highlight:i)"></span>
- <span class="d-flex ms-auto fs-3xs text-muted" [innerHtml]="sanitize(o.description | highlight:i)"></span>
+ <span class="d-flex ms-auto fs-xs text-muted" [innerHtml]="sanitize(o.description | highlight:i)"></span>
</div>
</a>
</ng-template>
diff --git a/frontend/src/app/common/components/select/select.component.scss b/frontend/src/app/common/components/select/select.component.scss
index 8a2eb089..283b5692 100644
--- a/frontend/src/app/common/components/select/select.component.scss
+++ b/frontend/src/app/common/components/select/select.component.scss
@@ -15,7 +15,7 @@
.ui-icon {
min-width: 26px;
min-height: 26px;
- font-size: .85rem;
+ font-size: calc(var(--font-size-base) * 0.9066667);
}
.ui-disabled {
@@ -49,7 +49,7 @@
}
.close {
- font-size: 1.6em;
+ font-size: calc(var(--font-size-base) * 1.6);
line-height: 0.75;
}
diff --git a/frontend/src/app/common/components/storage-quota.component.ts b/frontend/src/app/common/components/storage-quota.component.ts
index d00d8c78..5f84e047 100644
--- a/frontend/src/app/common/components/storage-quota.component.ts
+++ b/frontend/src/app/common/components/storage-quota.component.ts
@@ -17,7 +17,7 @@ import { quotaRegexp } from '../utils/regexp'
(ngModelChange)="onQuotaInput($event)"
(blur)="onQuotaBlur()"
[placeholder]="'Unlimited' | translate: locale.language"
- class="form-control form-control-sm {{ invalid() ? 'is-invalid' : '' }}"
+ class="form-control{{ invalid() ? 'is-invalid' : '' }}"
[class.w-100]="fullWidth()"
[style.max-width.%]="displayMaxWidth()"
placement="top"
diff --git a/frontend/src/app/common/components/virtual-scroll.component.ts b/frontend/src/app/common/components/virtual-scroll.component.ts
index b710d8b3..05550d94 100644
--- a/frontend/src/app/common/components/virtual-scroll.component.ts
+++ b/frontend/src/app/common/components/virtual-scroll.component.ts
@@ -58,7 +58,7 @@ export class VirtualScrollComponent<T> implements OnInit, OnChanges, OnDestroy {
@ViewChild('shim', { read: ElementRef, static: true }) shimElementRef: ElementRef
@Output() isScrollBottom = new EventEmitter<boolean>()
@Output() isScrollTop = new EventEmitter<boolean>()
- @Input() resizeOffset = 130
+ @Input() resizeOffset = 134
@Input() galleryMode = false
@Input() selectedChat: any = null
@Input() items: T[] = []
diff --git a/frontend/src/app/common/directives/input-edit.directive.ts b/frontend/src/app/common/directives/input-edit.directive.ts
index 06770cf2..7054c42c 100644
--- a/frontend/src/app/common/directives/input-edit.directive.ts
+++ b/frontend/src/app/common/directives/input-edit.directive.ts
@@ -59,7 +59,6 @@ export class InputEditDirective implements OnInit {
this.renderer.setStyle(this.elementRef.nativeElement, 'height', '100%')
this.renderer.setStyle(this.elementRef.nativeElement, 'min-height', '20px')
this.renderer.addClass(this.elementRef.nativeElement, 'form-control')
- this.renderer.addClass(this.elementRef.nativeElement, 'form-control-sm')
if (this.textCenter) {
this.renderer.addClass(this.elementRef.nativeElement, 'text-center')
this.renderer.setStyle(this.elementRef.nativeElement, 'padding', '0')
diff --git a/frontend/src/app/layout/navbar/navbar.component.html b/frontend/src/app/layout/navbar/navbar.component.html
index 8077c6ed..9ffc6ae5 100644
--- a/frontend/src/app/layout/navbar/navbar.component.html
+++ b/frontend/src/app/layout/navbar/navbar.component.html
@@ -11,9 +11,9 @@
</div>
<div class="navbar-right-side">
<div (click)="openSidebarUser()" class="menu">
- <div class="avatar">
+ <div class="d-flex">
@if (userAvatar) {
- <img class="avatar-img bg-gray-light-important" [src]="userAvatar" [width]="28" [height]="28" alt="">
+ <img class="avatar-img bg-gray-light-important" [src]="userAvatar" alt="">
}
<span class="avatar-{{allOnlineStatus[user?.onlineStatus]}}"></span>
</div>
diff --git a/frontend/src/app/layout/sidebar/components/windows.component.html b/frontend/src/app/layout/sidebar/components/windows.component.html
index 433a2986..dc3a66fa 100755
--- a/frontend/src/app/layout/sidebar/components/windows.component.html
+++ b/frontend/src/app/layout/sidebar/components/windows.component.html
@@ -1,6 +1,6 @@
<div class="sidebar-component-title">
@if (windows.length) {
- <button (click)="onCloseAll()" class="btn btn-sm btn-default">
+ <button (click)="onCloseAll()" class="btn btn-default">
<fa-icon [icon]="icons.faXmark"></fa-icon>
</button>
}
@@ -11,8 +11,8 @@
<div class="sidebar-item-container" (click)="onMaximize(modal)">
<div class="sidebar-item-content">
<img [ngSrc]="modal.element.mimeUrl" alt="" width="28" height="28">
- <div class="text-truncate fs-2xs ms-2">{{ modal.element.name }}</div>
- <button (click)="onClose($event, modal)" class="btn btn-xs btn-danger ms-auto">
+ <div class="text-truncate fs-sm mx-1">{{ modal.element.name }}</div>
+ <button (click)="onClose($event, modal)" class="btn btn-sm btn-danger ms-auto">
<fa-icon [icon]="icons.faTimes"></fa-icon>
</button>
</div>
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index 75cf2eea..0ea722a1 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "Zwei-Faktor-Authentifizierung ist deaktiviert",
"Scan this QR code using your authenticator app.": "Scannen Sie diesen QR‑Code mit Ihrer Authentifizierungs-App.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(z. B. FreeOTP, Proton Authenticator usw.)",
- "Or enter this secret manually": "Oder geben Sie diesen geheimen Schlüssel manuell ein",
+ "Or enter this secret manually:": "Oder geben Sie diesen geheimen Schlüssel manuell ein:",
"Valid with your TOTP code": "Mit Ihrem TOTP‑Code bestätigen",
"The secret has expired": "Der geheime Schlüssel ist abgelaufen",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "Bewahren Sie diese Codes an einem sicheren Ort auf. Sie ermöglichen Ihnen den Zugriff auf Ihr Konto, falls Sie den Zugriff auf Ihre Zwei‑Faktor‑Authentifizierung verlieren.",
diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json
index 0d85f8de..de5a5220 100644
--- a/frontend/src/i18n/es.json
+++ b/frontend/src/i18n/es.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "La autenticación de dos factores está desactivada",
"Scan this QR code using your authenticator app.": "Escanee este código QR con su aplicación de autenticación.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(Por ejemplo, FreeOTP, Proton Authenticator, etc.)",
- "Or enter this secret manually": "O introduzca este secreto manualmente",
+ "Or enter this secret manually:": "O introduzca este secreto manualmente:",
"Valid with your TOTP code": "Valide con su código TOTP",
"The secret has expired": "El secreto ha expirado",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "Guarde estos códigos en un lugar seguro. Le permitirán acceder a su cuenta si pierde el acceso a su autenticación de dos factores.",
diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json
index 8ed14eed..4cfae581 100644
--- a/frontend/src/i18n/fr.json
+++ b/frontend/src/i18n/fr.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "L’authentification à deux facteurs est désactivée",
"Scan this QR code using your authenticator app.": "Scannez ce code QR avec votre application d’authentification.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(Par ex. FreeOTP, Proton Authenticator, etc.)",
- "Or enter this secret manually": "Ou entrez ce secret manuellement",
+ "Or enter this secret manually:": "Ou entrez ce secret manuellement :",
"Valid with your TOTP code": "Validez avec votre code TOTP",
"The secret has expired": "Le secret a expiré",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "Conservez ces codes en lieu sûr. Ils vous permettront d’accéder à votre compte si vous perdez l’accès à votre authentification à deux facteurs.",
diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.json
index b96a459e..cc2f39d8 100644
--- a/frontend/src/i18n/hi.json
+++ b/frontend/src/i18n/hi.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "द्वि-कारक प्रमाणीकरण अक्षम है",
"Scan this QR code using your authenticator app.": "अपने ऑथेंटिकेटर ऐप से इस QR कोड को स्कैन करें।",
"(Such as FreeOTP, Proton Authenticator etc.)": "(जैसे FreeOTP, Proton Authenticator आदि)",
- "Or enter this secret manually": "या इस सीक्रेट को मैन्युअल रूप से दर्ज करें",
+ "Or enter this secret manually:": "या इस सीक्रेट को मैन्युअल रूप से दर्ज करें:",
"Valid with your TOTP code": "अपने TOTP कोड से सत्यापित करें",
"The secret has expired": "सीक्रेट समाप्त हो गया है",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "इन कोडों को सुरक्षित स्थान पर रखें। यदि आप द्वि-कारक प्रमाणीकरण की पहुँच खो देते हैं, तो ये आपके खाते तक पहुँचने में मदद करेंगे।",
diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json
index 0f2435fc..61837c21 100644
--- a/frontend/src/i18n/it.json
+++ b/frontend/src/i18n/it.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "L’autenticazione a due fattori è disabilitata",
"Scan this QR code using your authenticator app.": "Scansiona questo codice QR con la tua app di autenticazione.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(Come FreeOTP, Proton Authenticator, ecc.)",
- "Or enter this secret manually": "Oppure inserisci questo segreto manualmente",
+ "Or enter this secret manually:": "Oppure inserisci questo segreto manualmente:",
"Valid with your TOTP code": "Conferma con il tuo codice TOTP",
"The secret has expired": "Il segreto è scaduto",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "Conserva questi codici in un luogo sicuro. Ti permetteranno di accedere al tuo account se perdi l’accesso alla tua autenticazione a due fattori.",
diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json
index 265c03cb..23eaa5ca 100644
--- a/frontend/src/i18n/ja.json
+++ b/frontend/src/i18n/ja.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "二要素認証は無効です",
"Scan this QR code using your authenticator app.": "認証アプリでこのQRコードをスキャンしてください。",
"(Such as FreeOTP, Proton Authenticator etc.)": "(FreeOTP、Proton Authenticator など)",
- "Or enter this secret manually": "このシークレットを手動で入力",
+ "Or enter this secret manually:": "このシークレットを手動で入力:",
"Valid with your TOTP code": "TOTP コードで確認",
"The secret has expired": "シークレットの有効期限が切れました",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "これらのコードは安全な場所に保管してください。二要素認証を利用できなくなった場合でも、アカウントにアクセスできます。",
diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json
index e5c125a1..74a7884f 100644
--- a/frontend/src/i18n/ko.json
+++ b/frontend/src/i18n/ko.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "2단계 인증이 비활성화되었습니다",
"Scan this QR code using your authenticator app.": "인증 앱으로 이 QR 코드를 스캔하세요.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(FreeOTP, Proton Authenticator 등)",
- "Or enter this secret manually": "이 시크릿을 수동으로 입력",
+ "Or enter this secret manually:": "이 시크릿을 수동으로 입력:",
"Valid with your TOTP code": "TOTP 코드로 확인",
"The secret has expired": "시크릿이 만료되었습니다",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "이 코드는 안전한 곳에 보관하세요. 2단계 인증에 접근할 수 없게 되어도 계정에 접근할 수 있습니다.",
diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json
index b23dc170..1f219ee5 100644
--- a/frontend/src/i18n/pl.json
+++ b/frontend/src/i18n/pl.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "Uwierzytelnianie dwuskładnikowe jest wyłączone",
"Scan this QR code using your authenticator app.": "Zeskanuj ten kod QR za pomocą aplikacji uwierzytelniającej.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(np. FreeOTP, Proton Authenticator itp.)",
- "Or enter this secret manually": "Lub wprowadź ten sekret ręcznie",
+ "Or enter this secret manually:": "Lub wprowadź ten sekret ręcznie:",
"Valid with your TOTP code": "Potwierdź kodem TOTP",
"The secret has expired": "Sekret wygasł",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "Przechowuj te kody w bezpiecznym miejscu. Umożliwią dostęp do konta, jeśli utracisz dostęp do uwierzytelniania dwuskładnikowego.",
diff --git a/frontend/src/i18n/pt-BR.json b/frontend/src/i18n/pt-BR.json
index 5667d0a7..51f927b4 100644
--- a/frontend/src/i18n/pt-BR.json
+++ b/frontend/src/i18n/pt-BR.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "A autenticação de dois fatores está desativada",
"Scan this QR code using your authenticator app.": "Escaneie este QR code com seu app autenticador.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(Por exemplo, FreeOTP, Proton Authenticator etc.)",
- "Or enter this secret manually": "Ou insira este segredo manualmente",
+ "Or enter this secret manually:": "Ou insira este segredo manualmente:",
"Valid with your TOTP code": "Validar com seu código TOTP",
"The secret has expired": "O segredo expirou",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "Guarde estes códigos em um local seguro. Eles permitirão acessar sua conta caso você perca o acesso à autenticação de dois fatores.",
diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json
index dadb8683..19ec3186 100644
--- a/frontend/src/i18n/pt.json
+++ b/frontend/src/i18n/pt.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "A autenticação de dois fatores está desativada",
"Scan this QR code using your authenticator app.": "Escaneie este código QR com seu aplicativo de autenticação.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(Como FreeOTP, Proton Authenticator, etc.)",
- "Or enter this secret manually": "Ou insira este segredo manualmente",
+ "Or enter this secret manually:": "Ou insira este segredo manualmente:",
"Valid with your TOTP code": "Valide com seu código TOTP",
"The secret has expired": "O segredo expirou",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "Guarde estes códigos em um local seguro. Eles permitirão que você acesse sua conta se perder o acesso à sua autenticação de dois fatores.",
diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json
index 5f18e6a8..6e61faa1 100644
--- a/frontend/src/i18n/ru.json
+++ b/frontend/src/i18n/ru.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "Двухфакторная аутентификация отключена",
"Scan this QR code using your authenticator app.": "Отсканируйте этот QR-код с помощью приложения для аутентификации.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(например, FreeOTP, Proton Authenticator и др.)",
- "Or enter this secret manually": "Или введите секрет вручную",
+ "Or enter this secret manually:": "Или введите секрет вручную:",
"Valid with your TOTP code": "Подтвердите с помощью вашего TOTP-кода",
"The secret has expired": "Секрет истёк",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "Храните эти коды в надёжном месте. Они позволят вам получить доступ к аккаунту, если вы потеряете доступ к двухфакторной аутентификации.",
diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json
index 7e20f367..99b3d440 100644
--- a/frontend/src/i18n/tr.json
+++ b/frontend/src/i18n/tr.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "İki aşamalı doğrulama devre dışı",
"Scan this QR code using your authenticator app.": "Kimlik doğrulama uygulamanızla bu QR kodu tarayın.",
"(Such as FreeOTP, Proton Authenticator etc.)": "(Örneğin FreeOTP, Proton Authenticator vb.)",
- "Or enter this secret manually": "Veya bu gizli anahtarı elle girin",
+ "Or enter this secret manually:": "Veya bu gizli anahtarı elle girin:",
"Valid with your TOTP code": "TOTP kodunuzla doğrulayın",
"The secret has expired": "Gizli anahtarın süresi doldu",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "Bu kodları güvenli bir yerde saklayın. İki aşamalı doğrulamaya erişimi kaybetseniz bile hesabınıza erişmenizi sağlar.",
diff --git a/frontend/src/i18n/zh.json b/frontend/src/i18n/zh.json
index 4c3151d4..e1ca514f 100644
--- a/frontend/src/i18n/zh.json
+++ b/frontend/src/i18n/zh.json
@@ -589,7 +589,7 @@
"Two-Factor Authentication is disabled": "已禁用双重身份验证",
"Scan this QR code using your authenticator app.": "使用您的认证器应用扫描此二维码。",
"(Such as FreeOTP, Proton Authenticator etc.)": "(如 FreeOTP、Proton Authenticator 等)",
- "Or enter this secret manually": "或手动输入此密钥",
+ "Or enter this secret manually:": "或手动输入此密钥:",
"Valid with your TOTP code": "使用您的 TOTP 代码验证",
"The secret has expired": "密钥已过期",
"Keep these codes in a safe place. They will allow you to access your account if you lose access to your two-factor authentication.": "请将这些代码保存在安全的地方。如果您无法使用双重身份验证,它们可帮助您访问账户。",
diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scss
index 43de67d2..19d7d1a4 100755
--- a/frontend/src/styles/components/_app.scss
+++ b/frontend/src/styles/components/_app.scss
@@ -2,18 +2,23 @@
display: flex;
flex-direction: column;
justify-content: center;
+ align-items: center;
min-height: 100vh;
+ padding: 1rem;
background: $application_background;
- .background {
+ @supports (height: 100dvh) {
+ min-height: 100dvh;
+ }
+
+ .auth-card {
display: flex;
flex-direction: column;
- align-self: center;
background: rgba(0, 0, 0, 0.5);
- padding: 2rem 5rem 2rem 5rem;
+ padding: clamp(2.125rem, 3.5vw, 2.625rem) clamp(1.875rem, 5vw, 3.625rem);
border-radius: 8px;
- min-width: 400px;
- max-width: 425px;
+ width: min(100%, 400px);
+ min-width: 0;
.content {
display: flex;
@@ -21,9 +26,30 @@
.header {
margin-bottom: .6rem;
+ text-align: left;
+
+ .auth-logo {
+ display: block;
+ height: clamp(54px, 5.8vw, 58px);
+ width: auto;
+ }
}
.body {
+ form > p.text-white-50 {
+ color: rgba(255, 255, 255, 0.72) !important;
+ }
+
+ form .input-group:first-of-type {
+ margin-top: .75rem !important;
+ }
+
+ .auth-actions {
+ .auth-action-btn {
+ flex: 1 1 0;
+ }
+ }
+
.btn.btn-primary {
@include btn-dark-vars(
semantic-dark('primary', bg),
@@ -57,13 +83,33 @@
color: whitesmoke;
&::placeholder {
- font-size: .8rem;
+ font-size: $font-size-xs;
color: $placeholder-color;
}
}
}
}
}
+
+ @include media-breakpoint-up(md) {
+ .auth-card {
+ margin-top: clamp(-3.5rem, -5vh, -1.5rem);
+ }
+ }
+
+ @include media-breakpoint-down(sm) {
+ padding: .75rem;
+
+ .auth-card {
+ margin-top: 0;
+ padding: 1.875rem;
+ border-radius: 8px;
+
+ .content .header .auth-logo {
+ height: 54px;
+ }
+ }
+ }
}
.app-title {
@@ -81,7 +127,7 @@
align-items: center;
justify-content: center;
height: 100%;
- background: $application_background;
+ background: var(--application-background);
color: white;
&:after {
@@ -185,13 +231,12 @@
width: 100%;
background-color: transparent;
color: transparent;
- font-size: $font-size-xs;
margin-bottom: 0;
thead {
background-color: transparent;
- font-size: $font-size-2xs;
- line-height: 16px;
+ font-size: $font-size-sm;
+ line-height: 20px;
tr {
th {
@@ -243,6 +288,11 @@
}
}
+ tbody td img {
+ width: 30px;
+ height: 30px;
+ }
+
tbody td:first-child {
img, fa-icon {
margin-right: 0.3rem;
@@ -251,7 +301,7 @@
tbody td:not(:first-child) {
color: transparent;
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
border-top: none;
}
}
@@ -287,7 +337,6 @@
}
.btn {
- min-width: 36px;
> fa-icon {
font-size: .875rem;
@@ -297,7 +346,7 @@
font-size: $font-size-xs;
fa-icon {
- font-size: .875rem;
+ font-size: $font-size-md;
margin-right: 0.2rem;
}
}
@@ -317,7 +366,7 @@
fa-icon {
margin-right: 0.4rem;
- font-size: $font-size-md;
+ font-size: $font-size-base;
}
}
}
@@ -338,7 +387,7 @@ app-input-filter {
width: 100%;
height: 30px;
border: 1px solid transparent;
- border-radius: $btn-border-radius-sm;
+ border-radius: $border-radius-base;
input {
width: 100%;
@@ -346,12 +395,12 @@ app-input-filter {
border: 0;
outline: 0;
background: transparent;
- font-size: $font-size-xs;
+ font-size: $font-size-sm;
line-height: 1.5;
padding: 0 31px 0 29px;
&::placeholder {
- font-size: $font-size-xs;
+ font-size: $font-size-sm;
opacity: 1;
}
}
@@ -361,7 +410,7 @@ app-input-filter {
position: absolute;
left: 9px;
pointer-events: none;
- font-size: .68rem;
+ font-size: $font-size-xs;
}
.clear-btn {
@@ -378,7 +427,7 @@ app-input-filter {
cursor: pointer;
fa-icon {
- font-size: $font-size-2xs;
+ font-size: $font-size-xs;
}
:focus-visible {
@@ -396,15 +445,15 @@ app-input-filter {
position: absolute;
bottom: 0;
width: 100%;
- font-size: $font-size-2xs;
- height: 25px;
+ font-size: $font-size-xs;
+ height: 24px;
padding-left: 5px;
padding-right: 5px;
background-color: transparent;
color: transparent;
@include media-breakpoint-down(sm) {
- font-size: $font-size-4xs;
+ font-size: $font-size-2xs;
}
&.pagination-container {
diff --git a/frontend/src/styles/components/_badges.scss b/frontend/src/styles/components/_badges.scss
index 9d258cf2..9624b5cd 100644
--- a/frontend/src/styles/components/_badges.scss
+++ b/frontend/src/styles/components/_badges.scss
@@ -63,7 +63,7 @@
gap: 0.2rem;
padding: $badge-padding-y $badge-padding-x;
border-radius: 9999px;
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
font-weight: 500;
line-height: 1;
letter-spacing: 0.01em;
@@ -79,9 +79,8 @@
}
&.badge-small {
- gap: 0.15rem;
- padding: calc(#{$badge-padding-y} * 0.55) calc(#{$badge-padding-x} * 0.55);
- font-size: calc(#{$font-size-3xs} * 0.80);
+ padding: calc(#{$badge-padding-y} * 0.6) calc(#{$badge-padding-x} * 0.8);
+ font-size: calc(#{$font-size-xs} * 0.8);
}
&.badge-color-full {
@@ -91,7 +90,7 @@
}
fa-icon {
- font-size: $font-size-xs;
+ font-size: $font-size-base;
}
}
diff --git a/frontend/src/styles/components/_boxes.scss b/frontend/src/styles/components/_boxes.scss
index 9b730ef6..ce48362c 100644
--- a/frontend/src/styles/components/_boxes.scss
+++ b/frontend/src/styles/components/_boxes.scss
@@ -12,7 +12,7 @@
padding: 0.3rem 0.8rem;
> fa-icon {
- font-size: 1rem;
+ font-size: $font-size-base;
&:first-child {
margin-right: 10px;
@@ -50,7 +50,7 @@
> fa-icon {
color: $gray;
- font-size: $font-size-md;
+ font-size: $font-size-base;
}
}
@@ -114,7 +114,7 @@
margin-left: auto;
padding-right: 10px;
z-index: 0;
- font-size: 24px;
+ font-size: $font-size-2xl;
color: rgba(0, 0, 0, 0.15);
}
diff --git a/frontend/src/styles/components/_buttons.scss b/frontend/src/styles/components/_buttons.scss
index 593b3567..9bfcfe8f 100644
--- a/frontend/src/styles/components/_buttons.scss
+++ b/frontend/src/styles/components/_buttons.scss
@@ -121,11 +121,7 @@
}
.btn-xs {
- @include button-size($btn-padding-y-xs, $btn-padding-x-xs, $font-size-2xs, $btn-border-radius-sm);
-}
-
-.btn-xxs {
- @include button-size($btn-padding-y-xs, $btn-padding-x-xs, $font-size-3xs, $btn-border-radius-sm);
+ @include button-size($btn-padding-y-xs, $btn-padding-x-xs, $font-size-xs, $btn-border-radius-sm);
}
.btn-outline-secondary-alt {
@@ -147,10 +143,10 @@
}
}
-
.btn-minimize {
@extend .btn-close;
- background: transparent url("#{$theme-btn-minimize-icon-svg}") center/1em auto no-repeat;
+ $btn-minimize-icon-svg: "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";
+ background: transparent url("#{$btn-minimize-icon-svg}") center/1em auto no-repeat;
}
.btn-minimize-white {
diff --git a/frontend/src/styles/components/_circles.scss b/frontend/src/styles/components/_circles.scss
index e33cfb18..b793f676 100755
--- a/frontend/src/styles/components/_circles.scss
+++ b/frontend/src/styles/components/_circles.scss
@@ -4,7 +4,7 @@
justify-content: center;
min-width: 30px;
min-height: 30px;
- font-size: $font-size-md;
+ font-size: $font-size-lg;
border-radius: 50%;
}
diff --git a/frontend/src/styles/components/_contextmenu.scss b/frontend/src/styles/components/_contextmenu.scss
index efce5976..fe7eda4d 100644
--- a/frontend/src/styles/components/_contextmenu.scss
+++ b/frontend/src/styles/components/_contextmenu.scss
@@ -2,6 +2,7 @@
--ngx-contextmenu-font-family: var(--bs-body-font-family) !important;
--ngx-contextmenu-item-separator-width: 100% !important;
--ngx-contextmenu-outline: none !important;
+ --ngx-contextmenu-border-radius: var(--bs-border-radius) !important;
}
.ngx-contextmenu, .cdk-overlay-container {
@@ -10,10 +11,9 @@
.ngx-contextmenu {
padding: $dropdown-item-padding-y !important;
- font-size: $font-size-xs !important;
+ font-size: $dropdown-font-size !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;
diff --git a/frontend/src/styles/components/_dropdowns.scss b/frontend/src/styles/components/_dropdowns.scss
index 79101e4c..df77e256 100644
--- a/frontend/src/styles/components/_dropdowns.scss
+++ b/frontend/src/styles/components/_dropdowns.scss
@@ -1,6 +1,5 @@
.dropdown-menu {
min-width: 0 !important;
- font-size: $font-size-xs;
@include app-menu-surface-structure($btn-border-radius, .25rem);
> li > a {
@@ -12,7 +11,7 @@
}
.dropdown-header {
- font-size: $font-size-xs;
+ font-size: $font-size-sm;
}
}
diff --git a/frontend/src/styles/components/_forms.scss b/frontend/src/styles/components/_forms.scss
index 059966fb..42288673 100644
--- a/frontend/src/styles/components/_forms.scss
+++ b/frontend/src/styles/components/_forms.scss
@@ -1,12 +1,11 @@
.form-control {
- @include border-radius($border-radius-base);
-
&:focus {
border-color: $primary;
box-shadow: none;
}
&::placeholder {
+ font-size: $font-size-base !important;
color: $placeholder-color;
opacity: 1;
}
@@ -17,7 +16,9 @@
}
.form-control-sm {
- font-size: $font-size-xs;
+ &::placeholder {
+ font-size: $font-size-sm !important;
+ }
}
.form-validation {
@@ -44,4 +45,3 @@
margin-right: 0 !important;
}
-
diff --git a/frontend/src/styles/components/_header.scss b/frontend/src/styles/components/_header.scss
index 8dcea8a6..19d10d5d 100644
--- a/frontend/src/styles/components/_header.scss
+++ b/frontend/src/styles/components/_header.scss
@@ -47,10 +47,12 @@
.menu {
display: flex;
justify-content: center;
+ align-content: center;
width: $sidebar-apps-icons-width;
height: $sidebar-apps-icons-height;
cursor: pointer;
padding: 6px;
+ margin: auto;
user-select: none;
&:hover {
@@ -58,8 +60,12 @@
}
.avatar-img {
+ display: flex;
+ align-self: center;
width: 30px;
height: 30px;
+ object-fit: cover;
+ border-radius: 50%;
}
}
}
@@ -92,7 +98,7 @@
justify-content: flex-start;
height: $navbar-height;
background: transparent;
- font-size: $font-size-xs;
+ font-size: $font-size-sm;
padding: 10px 8px;
margin: 0;
color: $sidebar-light-icons-menu-color;
@@ -136,7 +142,7 @@
}
> fa-icon {
- font-size: $font-size-lg;
+ font-size: $font-size-xl;
}
}
}
diff --git a/frontend/src/styles/components/_links.scss b/frontend/src/styles/components/_links.scss
index 6a2e58dc..4851f5e8 100755
--- a/frontend/src/styles/components/_links.scss
+++ b/frontend/src/styles/components/_links.scss
@@ -37,7 +37,7 @@
.error-code {
@extend .no-select-pointer;
color: #fff;
- font-size: 20px;
+ font-size: $font-size-xl;
font-weight: 600;
text-shadow: 0 4px 0 rgba(0, 0, 0, 0.1);
line-height: normal;
@@ -50,7 +50,7 @@
padding: 0 20px;
.oops {
- font-size: 18px;
+ font-size: $font-size-lg;
}
.hr {
@@ -64,7 +64,7 @@
.solve {
display: inline-block;
- font-size: 18px;
+ font-size: $font-size-lg;
font-weight: 400;
}
}
diff --git a/frontend/src/styles/components/_miscellaneous.scss b/frontend/src/styles/components/_miscellaneous.scss
index c7f84c82..affa0fd1 100644
--- a/frontend/src/styles/components/_miscellaneous.scss
+++ b/frontend/src/styles/components/_miscellaneous.scss
@@ -45,7 +45,7 @@ mark, .mark {
}
.tooltip {
- font-size: $font-size-2xs;
+ font-size: $font-size-xs;
}
.table-disable-hover,
diff --git a/frontend/src/styles/components/_modal.scss b/frontend/src/styles/components/_modal.scss
index 236bc903..eea8900c 100644
--- a/frontend/src/styles/components/_modal.scss
+++ b/frontend/src/styles/components/_modal.scss
@@ -8,26 +8,25 @@
.modal-header {
max-height: 41.5px;
+ height: 41.5px;
line-height: 1;
@extend .no-select;
.modal-title {
+ font-size: $font-size-base;
@extend .text-truncate;
- font-size: $font-size-sm;
- line-height: 2;
- i {
- margin-right: 5px;
+ > fa-icon {
+ margin-right: 0.3rem;
}
&.ms-auto {
- font-size: $font-size-xs;
+ font-size: $font-size-sm;
}
}
}
.modal-body {
- font-size: $font-size-xs;
padding: 10px;
}
@@ -80,7 +79,7 @@
height: 1.35rem;
padding: 0 .35rem;
border-radius: 999px;
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
font-weight: 600;
line-height: 1;
}
diff --git a/frontend/src/styles/components/_notifications.scss b/frontend/src/styles/components/_notifications.scss
index 9a0f2cd5..fa365c6f 100644
--- a/frontend/src/styles/components/_notifications.scss
+++ b/frontend/src/styles/components/_notifications.scss
@@ -7,7 +7,7 @@
--toast-message: #{mix($gray-dark, $black, 64%)};
position: relative;
- padding: 0.56rem 1rem 0.54rem 1.6rem !important;
+ padding: 0.66rem 1.1rem 0.64rem 1.7rem !important;
border: 0.5px solid var(--toast-border, #{$gray-light}) !important;
background-color: var(--toast-bg, #{$white}) !important;
background-image: none !important;
@@ -26,7 +26,7 @@
}
.toast-title {
- font-size: $font-size-sm;
+ font-size: $font-size-md;
margin-top: 0 !important;
margin-bottom: 0.5rem !important;
line-height: 1.15;
@@ -34,7 +34,7 @@
}
.toast-message {
- font-size: $font-size-xs;
+ font-size: $font-size-base;
line-height: 1.2;
color: var(--toast-message) !important;
}
@@ -45,7 +45,7 @@
}
.ngx-toastr {
- //min-width: 250px;
+ min-width: 320px !important;
//width: auto !important
}
diff --git a/frontend/src/styles/components/_products.scss b/frontend/src/styles/components/_products.scss
index 1377faf9..c667d5c3 100644
--- a/frontend/src/styles/components/_products.scss
+++ b/frontend/src/styles/components/_products.scss
@@ -61,7 +61,7 @@
align-self: center;
position: absolute;
right: 10px;
- font-size: $font-size-2xs;
+ font-size: $font-size-xs;
> span {
display: flex;
@@ -71,7 +71,7 @@
.product-description {
@extend .text-truncate;
display: block;
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
color: #999;
}
}
diff --git a/frontend/src/styles/components/_profile.scss b/frontend/src/styles/components/_profile.scss
index c0d82164..e70cfa70 100644
--- a/frontend/src/styles/components/_profile.scss
+++ b/frontend/src/styles/components/_profile.scss
@@ -1,13 +1,12 @@
.profile-page {
height: 100%;
- font-size: $font-size-xs;
}
.user-groups-page {
display: flex;
flex-direction: column;
height: 100%;
- font-size: $font-size-xs;
+ font-size: $font-size-sm;
padding: 0.4rem;
}
@@ -23,12 +22,13 @@
align-items: flex-end;
> div:first-of-type {
+ // fullname
font-weight: 500;
- font-size: 1rem;
+ font-size: $font-size-lg;
}
.small {
- font-size: $font-size-4xs;
+ font-size: $font-size-xs;
}
}
}
diff --git a/frontend/src/styles/components/_recents.scss b/frontend/src/styles/components/_recents.scss
index 53f1f541..0aaef628 100644
--- a/frontend/src/styles/components/_recents.scss
+++ b/frontend/src/styles/components/_recents.scss
@@ -2,7 +2,7 @@
position: relative;
width: 100%;
border: 1px solid;
- border-radius: 12px;
+ border-radius: 14px;
overflow: hidden;
transition: box-shadow 0.14s ease;
}
@@ -11,8 +11,8 @@
display: flex;
align-items: center;
justify-content: space-between;
- gap: 0.75rem;
- padding: 0.45rem 0.6rem;
+ gap: 0.78rem;
+ padding: 0.34rem 0.66rem;
border-bottom: 1px solid;
}
@@ -20,31 +20,31 @@
display: flex;
align-items: center;
min-width: 0;
- gap: 0.55rem;
+ gap: 0.58rem;
}
.recents-widget-card__title-icon {
- width: 1.55rem;
- height: 1.55rem;
- border-radius: 0.55rem;
+ width: 2.05rem;
+ height: 2.05rem;
+ border-radius: 0.6rem;
display: inline-flex;
align-items: center;
justify-content: center;
- font-size: 0.78rem;
+ font-size: $font-size-base;
}
.recents-widget-card__title {
display: inline-block;
- line-height: 1;
- font-size: $font-size-sm;
- font-weight: 450;
+ line-height: 1.05;
+ font-size: $font-size-base;
+ font-weight: 500;
user-select: none;
}
.recents-widget-card__toggle {
- width: 1.65rem;
- height: 1.65rem;
- border-radius: 0.55rem;
+ width: 2rem;
+ height: 2rem;
+ border-radius: 0.6rem;
border: 1px solid transparent;
background: transparent;
color: inherit;
@@ -54,33 +54,33 @@
align-items: center;
justify-content: center;
cursor: pointer;
- transition: all 0.2s ease;
+ font-size: $font-size-base;
}
.recents-widget-card__body {
- padding: 0.4rem;
+ padding: 0.48rem 0.48rem 0.52rem;
}
.recent-item-card {
width: 100%;
border: 1px solid transparent;
- border-radius: 0.65rem;
+ border-radius: 0.68rem;
background: transparent;
color: inherit;
font: inherit;
appearance: none;
- padding: 0.32rem 0.42rem;
+ padding: 0.42rem 0.5rem;
display: grid;
- grid-template-columns: 1.9rem minmax(0, 1fr) auto;
+ grid-template-columns: 2rem minmax(0, 1fr) max-content;
align-items: center;
- gap: 0.45rem;
+ gap: 0.54rem;
text-align: left;
cursor: pointer;
animation: recent-card-enter 0.26s ease both;
transition: transform 0.2s ease, box-shadow 0.2s ease, border-color 0.2s ease, background-color 0.2s ease;
+ .recent-item-card {
- margin-top: 0.28rem;
+ margin-top: 0.34rem;
}
}
@@ -89,21 +89,21 @@
}
.recent-item-card__media {
- width: 1.9rem;
- height: 1.9rem;
+ width: 2rem;
+ height: 2rem;
}
.recent-item-card__content {
min-width: 0;
display: flex;
flex-direction: column;
- gap: 0.05rem;
+ gap: 0.1rem;
}
.recent-item-card__title {
line-height: 1.2;
- font-size: $font-size-xs;
- font-weight: 450;
+ font-size: $font-size-base;
+ font-weight: 400;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -111,7 +111,7 @@
.recent-item-card__path {
line-height: 1.15;
- font-size: $font-size-3xs;
+ font-size: $font-size-sm;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -119,12 +119,16 @@
.recent-item-card__time {
white-space: nowrap;
- font-size: $font-size-4xs;
- margin-left: 0.25rem;
+ font-size: $font-size-xs;
+ line-height: 1;
+ margin-left: 0.38rem;
+ min-width: 5.05rem;
+ text-align: right;
+ padding-top: 0.04rem;
}
.recent-empty-state {
- min-height: 150px;
+ min-height: 142px;
border-radius: 0.65rem;
display: flex;
flex-direction: column;
diff --git a/frontend/src/styles/components/_search.scss b/frontend/src/styles/components/_search.scss
index 7e6e8cb5..c97a36e8 100644
--- a/frontend/src/styles/components/_search.scss
+++ b/frontend/src/styles/components/_search.scss
@@ -8,10 +8,10 @@
.search-clear-btn {
position: absolute;
- top: 0.25rem;
- right: 2.8125rem;
+ top: 6px;
+ right: 45px;
z-index: 1001;
- font-size: 1rem;
+ font-size: $font-size-md;
cursor: pointer;
}
@@ -47,7 +47,7 @@
}
.search-result-name {
- font-size: $font-size-xs;
+ font-size: $font-size-base;
font-weight: 500;
line-height: 1.2;
}
@@ -58,13 +58,13 @@
}
.search-result-path-icon {
- font-size: $font-size-2xs;
+ font-size: $font-size-sm;
flex: 0 0 auto;
margin-right: 0.25rem;
}
.search-result-path-text {
- font-size: $font-size-2xs;
+ font-size: $font-size-sm;
min-width: 0;
user-select: none;
}
@@ -85,7 +85,7 @@
line-height: 1.32;
overflow-wrap: anywhere;
font-family: inherit;
- font-size: $font-size-3xs;
+ font-size: $font-size-sm;
background: transparent;
}
diff --git a/frontend/src/styles/components/_sidebar_left.scss b/frontend/src/styles/components/_sidebar_left.scss
index a72cdb21..99980e84 100755
--- a/frontend/src/styles/components/_sidebar_left.scss
+++ b/frontend/src/styles/components/_sidebar_left.scss
@@ -30,9 +30,10 @@
position: relative;
&:not(:first-child) {
+ $icon-item-inset: 3px;
box-sizing: border-box;
- padding: 3px;
- border-radius: $nav-pills-border-radius;
+ padding: $icon-item-inset;
+ border-radius: calc(#{$border-radius-base} + #{$icon-item-inset});
background-clip: content-box !important;
}
@@ -50,35 +51,49 @@
}
> fa-icon {
- font-size: 1rem;
+ font-size: $font-size-xl;
}
> .logo-container {
display: flex;
justify-content: center;
- align-items: center;
- width: 30px;
- height: 30px;
+ align-self: center;
+ width: 32px;
+ height: 32px;
object-fit: cover;
border-radius: 50%;
> img {
- height: 24px;
+ display: flex;
+ justify-content: center;
+ align-self: center;
+ height: 26px;
+ width: 26px;
}
}
.menu-badge-icon {
position: absolute;
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
width: $sidebar-apps-icons-width;
+ inset: 0;
+ pointer-events: none;
.badge {
- @extend .badge-small;
@extend .badge-color-full;
position: absolute;
- right: 3px;
- bottom: 1px;
+ top: 2px;
+ right: 2px;
+ min-width: 16px;
+ height: 16px;
+ padding: 0 5px;
+ border-radius: 9999px;
+ font-size: $font-size-2xs;
+ line-height: 16px;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
}
}
}
@@ -94,7 +109,7 @@
box-sizing: border-box;
padding: 3px 2px;
z-index: $sidebar-z-index;
- font-size: $font-size-2xs;
+ font-size: $font-size-sm;
border-top-right-radius: $btn-border-radius;
border-bottom-right-radius: $btn-border-radius;
@@ -123,7 +138,7 @@
@extend .no-select-pointer;
> fa-icon {
- font-size: $font-size-md;
+ font-size: $font-size-base;
margin-right: 0;
width: .95rem;
min-width: .95rem;
@@ -134,13 +149,17 @@
.menu-badge {
margin-left: auto;
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
}
}
> a.mini-submenu-item {
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
padding-left: 20px;
+
+ fa-icon {
+ font-size: $font-size-xs;
+ }
}
}
}
@@ -186,7 +205,7 @@
@extend .text-truncate;
text-transform: uppercase;
margin-right: auto;
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
> span {
@extend .text-truncate;
@@ -204,7 +223,7 @@
justify-content: center;
min-height: $navbar-height;
min-width: 30px;
- font-size: $font-size-lg;
+ font-size: $font-size-xl;
margin: 0;
color: inherit;
@@ -219,7 +238,7 @@
display: flex;
flex-direction: column;
flex: 1 1 auto;
- padding-top: 3px;
+ padding-top: 2px;
}
.menus-group {
@@ -233,15 +252,14 @@
min-height: $sidebar-apps-height;
height: $sidebar-apps-height;
min-width: $sidebar-apps-menus-width;
- font-size: $font-size-xs;
cursor: pointer;
&.submenu {
padding-left: 10px;
- font-size: $font-size-2xs;
+ font-size: $font-size-sm;
fa-icon {
- font-size: $font-size-sm
+ font-size: $font-size-base;
}
}
@@ -260,7 +278,7 @@
@extend .no-select-pointer;
> fa-icon {
- font-size: $font-size-md;
+ font-size: $font-size-lg;
margin-right: 0;
width: .95rem;
min-width: .95rem;
@@ -271,7 +289,7 @@
.menu-badge {
margin-left: auto;
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
}
}
@@ -300,13 +318,13 @@
display: none !important;
}
display: flex;
- padding: 5px;
+ padding: 4px;
margin-left: auto;
margin-top: auto;
span {
@extend .no-select;
- font-size: $font-size-3xs;
+ font-size: $font-size-2xs;
}
}
}
diff --git a/frontend/src/styles/components/_sidebar_right.scss b/frontend/src/styles/components/_sidebar_right.scss
index fe728211..84c65f48 100755
--- a/frontend/src/styles/components/_sidebar_right.scss
+++ b/frontend/src/styles/components/_sidebar_right.scss
@@ -26,7 +26,7 @@
justify-content: center;
font-weight: 500;
height: $sidebar-apps-height;
- font-size: $font-size-xs;
+ font-size: $font-size-base;
padding: .3rem .6rem;
}
@@ -46,7 +46,7 @@
display: flex;
align-items: center;
width: 100%;
- height: $sidebar-apps-height;
+ height: 45px;
padding: .2rem .4rem .2rem .4rem;
border-bottom: .5px solid transparent;
}
@@ -83,19 +83,23 @@
display: flex;
align-items: center;
justify-content: center;
- min-height: calc(#{$sidebar-apps-height} - 5px);
- width: calc(100% - 5px);
- margin: 4px;
+ min-height: $sidebar-apps-height;
+ width: 100%;
+ position: relative;
+ box-sizing: border-box;
+ $icon-item-inset: 3px;
+ padding: $icon-item-inset;
cursor: pointer;
- border-radius: $btn-border-radius;
+ border-radius: calc(#{$border-radius-base} + #{$icon-item-inset});
+ background-clip: content-box !important;
- > i {
- font-size: 1rem;
+ > fa-icon {
+ font-size: $font-size-xl;
}
.menu-badge {
position: absolute;
- font-size: $font-size-3xs;
+ font-size: $font-size-xs;
width: 100%;
.badge {
diff --git a/frontend/src/styles/components/_tasks.scss b/frontend/src/styles/components/_tasks.scss
index c6da92bb..76e2bd68 100755
--- a/frontend/src/styles/components/_tasks.scss
+++ b/frontend/src/styles/components/_tasks.scss
@@ -1,27 +1,20 @@
.task-list {
@extend .no-select-pointer;
border-bottom: .5px solid transparent;
- font-size: $font-size-2xs;
+ font-size: $font-size-sm;
&:hover {
background-color: transparent;
}
> div {
- height: $sidebar-apps-height;
+ padding: 0.3rem;
+ //max-height: 50px;
}
}
.custom-progress-bar {
background-color: black;
- font-size: $font-size-2xs;
-
- &.progress {
- height: 18px !important;
- }
-
- .progress-bar {
- height: 18px !important;
- }
+ font-size: $font-size-xs;
}
diff --git a/frontend/src/styles/components/_texts.scss b/frontend/src/styles/components/_texts.scss
index 1ea5d01c..14aa660e 100644
--- a/frontend/src/styles/components/_texts.scss
+++ b/frontend/src/styles/components/_texts.scss
@@ -1,3 +1,15 @@
+:root {
+ --font-size-3xl: #{$font-size-3xl};
+ --font-size-2xl: #{$font-size-2xl};
+ --font-size-xl: #{$font-size-xl};
+ --font-size-lg: #{$font-size-lg};
+ --font-size-md: #{$font-size-md};
+ --font-size-base: #{$font-size-base};
+ --font-size-sm: #{$font-size-sm};
+ --font-size-xs: #{$font-size-xs};
+ --font-size-2xs: #{$font-size-2xs};
+}
+
.white-space-normal {
white-space: normal !important;
}
@@ -56,32 +68,32 @@
text-decoration: line-through;
}
+.text-bold {
+ font-weight: 550;
+}
+
.fs-lg {
- font-size: $font-size-lg;
+ font-size: var(--font-size-lg, #{$font-size-lg});
+}
+
+.fs-base {
+ font-size: var(--font-size-base, #{$font-size-base});
}
.fs-md {
- font-size: $font-size-md;
+ font-size: var(--font-size-md, #{$font-size-md});
}
.fs-sm {
- font-size: $font-size-sm !important;
+ font-size: var(--font-size-sm, #{$font-size-sm}) !important;
}
.fs-xs {
- font-size: $font-size-xs !important;
+ font-size: var(--font-size-xs, #{$font-size-xs}) !important;
}
.fs-2xs {
- font-size: $font-size-2xs !important;
-}
-
-.fs-3xs {
- font-size: $font-size-3xs !important;
-}
-
-.fs-4xs {
- font-size: $font-size-4xs !important;
+ font-size: var(--font-size-2xs, #{$font-size-2xs}) !important;
}
.fw-500 {
diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scss
index 1598bd59..a3ea6b60 100755
--- a/frontend/src/styles/components/_theme_dark.scss
+++ b/frontend/src/styles/components/_theme_dark.scss
@@ -13,8 +13,6 @@
color: $sidebar-dark-icons-menu-color;
&:not(:first-child) {
- border-bottom: .5px solid $sidebar-dark-icons-menu-bg;
-
&:hover, &.active {
color: $sidebar-dark-icons-menu-hover-color;
background: $sidebar-dark-icons-menu-hover-bg;
@@ -59,16 +57,10 @@
}
.menu {
- border-bottom: .5px solid $sidebar-dark-apps-menu-bg;
-
> a {
color: $sidebar-dark-apps-menu-border-color;
}
- //&.submenu {
- // background-color: darken($sidebar-dark-apps-menu-bg, 3%);
- //}
-
&:hover, &.active {
> a {
background: $sidebar-dark-apps-menu-hover-bg;
@@ -687,14 +679,14 @@
app-files-recents-widget,
app-comments-recents-widget {
.recents-widget-card {
- border-color: rgba($dark-surface-border, 0.6);
- box-shadow: 0 16px 34px $dark-box-transparent-shadow-color;
- background: linear-gradient(175deg, rgba($dark-surface-bg, 0.96) 0%, rgba($dark-bg-theme, 0.97) 100%);
+ border-color: rgba($dark-surface-border, 0.82);
+ box-shadow: 0 12px 26px rgba($black, 0.3);
+ background: linear-gradient(180deg, rgba(lighten($dark-surface-bg, 4%), 0.98) 0%, rgba($dark-bg-theme, 0.97) 100%);
}
.recents-widget-card__header {
- border-bottom-color: rgba($dark-surface-border, 0.5);
- background: $sidebar-dark-apps-menu-title-bg;
+ border-bottom-color: rgba($dark-surface-border, 0.7);
+ background: lighten($sidebar-dark-apps-menu-title-bg, 4%);
}
.recents-widget-card__title {
@@ -703,34 +695,34 @@
.recents-widget-card__title-icon {
color: $dark-item-hover-color;
- background: rgba($dark-bg-theme, 0.45);
- border: 1px solid rgba($dark-surface-border, 0.4);
+ background: rgba(lighten($dark-bg-theme, 4%), 0.78);
+ border: 1px solid rgba($dark-surface-border, 0.58);
}
.recents-widget-card__toggle {
color: $dark-item-color;
- background: rgba($dark-bg-theme, 0.65);
- border-color: rgba($dark-surface-border, 0.46);
+ background: rgba(lighten($dark-bg-theme, 5%), 0.8);
+ border-color: rgba($dark-surface-border, 0.62);
}
.recents-widget-card__toggle:hover {
- background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 7%), 0.82);
+ background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 10%), 0.9);
color: $dark-item-hover-color;
}
.recents-widget-card__body {
- background: linear-gradient(180deg, rgba($dark-bg-theme, 0.7) 0%, rgba(darken($dark-bg-theme, 3%), 0.82) 100%);
+ background: linear-gradient(180deg, rgba(darken($dark-bg-theme, 1%), 0.8) 0%, rgba(darken($dark-bg-theme, 4%), 0.9) 100%);
}
.recent-item-card {
- background: rgba($sidebar-dark-apps-menu-title-bg, 0.72);
- border-color: rgba($dark-surface-border, 0.52);
- box-shadow: 0 8px 20px rgba($black, 0.26);
+ background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 5%), 0.92);
+ border-color: rgba($dark-surface-border, 0.7);
+ box-shadow: 0 6px 14px rgba($black, 0.24);
}
.recent-item-card:hover {
- border-color: mix($primary, $dark-surface-border, 58%);
- background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 6%), 0.88);
+ border-color: mix($primary, $dark-item-hover-color, 50%);
+ background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 8%), 0.96);
}
.recent-item-card__title {
@@ -738,8 +730,8 @@
}
.recent-item-card__media {
- background: rgba($dark-bg-theme, 0.72);
- border: 1px solid rgba($dark-surface-border, 0.42);
+ background: rgba(lighten($dark-bg-theme, 2%), 0.78);
+ border: 1px solid rgba($dark-surface-border, 0.56);
}
.recent-item-card__time {
@@ -747,9 +739,9 @@
}
.recent-empty-state {
- background: rgba($sidebar-dark-apps-menu-title-bg, 0.75);
+ background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 4%), 0.8);
color: $dark-item-color;
- border: 1px dashed rgba($dark-surface-border, 0.5);
+ border: 1px dashed rgba($dark-surface-border, 0.62);
}
}
.products-list > li:hover {
@@ -782,9 +774,6 @@
.bg-white {
background-color: lighten($sidebar-dark-apps-menu-bg, 4%) !important;
}
- .btn-close {
- filter: $theme-btn-close-white-filter;
- }
.btn-outline-secondary-alt {
border-color: $dark-field-border;
}
diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scss
index 4de4aed8..c5283c94 100755
--- a/frontend/src/styles/components/_theme_light.scss
+++ b/frontend/src/styles/components/_theme_light.scss
@@ -13,8 +13,6 @@
color: $sidebar-light-icons-menu-color;
&:not(:first-child) {
- border-bottom: .5px solid $sidebar-light-icons-menu-bg;
-
&:hover, &.active {
color: $sidebar-light-icons-menu-hover-color;
background: $sidebar-light-icons-menu-hover-bg;
@@ -72,17 +70,11 @@
}
.menu {
- border-bottom: 0;
-
> a {
color: $sidebar-light-apps-menu-hover-color;
border: .5px solid transparent;
}
- //&.submenu {
- // background-color: darken($sidebar-light-apps-menu-bg, 3%);
- //}
-
&:hover {
> a {
background: $light-sidebar-mini-hover-bg;
@@ -186,6 +178,9 @@
.text-muted {
color: darken($light-text-muted-color, 12%) !important;
}
+ .text-muted.text-uppercase.text-bold {
+ color: $light-text-muted-color !important;
+ }
tabset {
> .nav.nav-pills,
> ul.nav.nav-pills {
@@ -358,9 +353,9 @@
border-top: 1px solid $gray-light;
}
- thead {
- background-color: $light-table-head-bg;
- }
+ //thead {
+ // background-color: $light-table-head-bg;
+ //}
tbody tr {
border-bottom-color: $gray-lighter !important;
@@ -498,7 +493,7 @@
color: $custom-color;
}
.profile-page {
- background-color: $white;
+ background-color: $gray-lightest;
.box {
background-color: $gray-lighter;
diff --git a/frontend/src/styles/components/_tree.scss b/frontend/src/styles/components/_tree.scss
index 3610d921..fe7b55f5 100644
--- a/frontend/src/styles/components/_tree.scss
+++ b/frontend/src/styles/components/_tree.scss
@@ -5,36 +5,36 @@
@mixin directory($color) {
content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#{hexToRGBString($color)}" d="M64 480H448c35.3 0 64-28.7 64-64V160c0-35.3-28.7-64-64-64H288c-10.1 0-19.6-4.7-25.6-12.8L243.2 57.6C231.1 41.5 212.1 32 192 32H64C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64z"/></svg>');
display: inline-block;
- width: 20px;
+ width: 22px;
}
@mixin caret($color) {
content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="#{hexToRGBString($color)}" d="M278.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-160 160c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L210.7 256 73.4 118.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l160 160z"/></svg>');
display: inline-block;
- width: 8px;
+ width: 10px;
position: absolute;
- left: 2px;
- top: 4px;
+ left: 3px;
+ top: 5px;
}
@mixin file($color) {
content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#{hexToRGBString($color)}" d="M 384 442.876 C 392.8 442.876 400 436.406 400 428.5 L 400 169.751 L 320 169.751 C 302.3 169.751 288 156.902 288 141 L 288 69.125 L 128 69.125 C 119.2 69.125 112 75.594 112 83.5 L 112 428.5 C 112 436.406 119.2 442.876 128 442.876 L 384 442.876 Z M 64 83.5 C 64 51.785 92.7 26 128 26 L 293.5 26 C 310.5 26 326.8 32.019 338.8 42.801 L 429.3 124.109 C 441.3 134.891 448 149.534 448 164.808 L 448 428.5 C 448 460.215 419.3 486 384 486 L 128 486 C 92.7 486 64 460.215 64 428.5 L 64 83.5 Z"/></svg>');
display: inline-block;
- width: 20px;
+ width: 22px;
}
.angular-tree-component {
display: grid !important;
white-space: nowrap;
margin-bottom: 15px;
- font-size: $font-size-xs;
+ font-size: $font-size-sm;
.node-wrapper {
cursor: default;
display: flex;
align-items: center;
justify-content: flex-start;
- padding: 5px;
+ padding: 4px;
line-height: 0;
width: 100%;
diff --git a/frontend/src/styles/components/_variables.scss b/frontend/src/styles/components/_variables.scss
index 05923fd2..b9ec54d3 100644
--- a/frontend/src/styles/components/_variables.scss
+++ b/frontend/src/styles/components/_variables.scss
@@ -59,8 +59,6 @@ $sidebar-light-apps-menu-border-color: $gray-mid;
$theme-btn-focus-outline-fallback: rgba(13, 110, 253, 0.25);
$theme-btn-bg-hover-overlay-shadow: rgba(0, 0, 0, 0.2);
$theme-dropdown-divider-bg: #eee;
-$theme-btn-close-white-filter: $btn-close-white-filter;
-$theme-btn-minimize-icon-svg: "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";
$theme-dialog-tab-active-bg: $primary;
$theme-dialog-tab-active-border-color: darken($primary, 7%);
$theme-dialog-tab-count-color: inherit;
diff --git a/frontend/src/styles/components/_wizard.scss b/frontend/src/styles/components/_wizard.scss
index 36276b95..3e9af4a8 100644
--- a/frontend/src/styles/components/_wizard.scss
+++ b/frontend/src/styles/components/_wizard.scss
@@ -1,7 +1,7 @@
.wizard {
display: flex;
flex-direction: column;
- font-size: $font-size-md;
+ font-size: $font-size-base;
height: 100%;
padding: 10px;
@@ -12,7 +12,7 @@
}
thead {
- font-size: $font-size-2xs !important;
+ font-size: $font-size-base !important;
}
tbody tr {
@@ -47,7 +47,7 @@
border: 2px dashed $gray;
border-radius: $border-radius-base;
padding: 80px;
- font-size: 21px;
+ font-size: 1.875rem;
font-weight: 600;
color: $gray;
height: 100%;
diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss
index 984b80fa..1e7d582c 100644
--- a/frontend/src/styles/variables.scss
+++ b/frontend/src/styles/variables.scss
@@ -1,16 +1,27 @@
+// --------------------------------------------------------
// Custom variables
+// --------------------------------------------------------
+
$font-family-sans-serif: 'Inter Variable', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
$application_title: 'Sync-in';
-$application_background: linear-gradient(to bottom right, rgb(2, 0, 36) 0%, rgb(28, 104, 176) 35%, rgb(152, 92, 160) 100%);
+$application_background: linear-gradient(
+ to bottom right,
+ rgb(2, 0, 36) 0%,
+ rgb(28, 104, 176) 35%,
+ rgb(152, 92, 160) 100%
+);
+// --------------------------------------------------------
// Bootstrap overrides
// Colors
+// --------------------------------------------------------
+
$white: #ffffff;
$gray-dark: #384042;
-$gray: #95a8c6;
-$gray-mid: #b3c2d9;
-$gray-light: #cfd9e7;
-$gray-lighter: #dde5f0;
+$gray: #95a8c6;
+$gray-mid: #b3c2d9;
+$gray-light: #cfd9e7;
+$gray-lighter: #dde5f0;
$gray-lightest: #edf2f8;
$lighter-blue: #94c7e8;
$red: #dc3545;
@@ -27,7 +38,6 @@ $yellow: #ffc107;
$purple: #9b59b6;
$maroon: #b33c00;
$black: #111;
-
$primary: #1c68b0;
$success: $green;
$secondary: #c3cee0;
@@ -37,80 +47,147 @@ $warning: $orange;
$danger: $red;
$mark-bg: $light-green;
$muted: #6d7278;
-// Options
-//--------------------------------------------------------
-//Body background (Affects main content background only)
+
+// --------------------------------------------------------
+// TYPOGRAPHY SCALE (base UI = 15.5px)
+// --------------------------------------------------------
+
+$font-size-root: 16px;
+$font-size-3xl: 1.25rem; // 20px
+$font-size-2xl: 1.125rem; // 18px
+$font-size-xl: 1rem; // 16px
+$font-size-lg: 0.9375rem; // 15px
+$font-size-md: 0.875rem; // 14px
+$font-size-base: 0.8125rem;// 13px
+$font-size-sm: 0.75rem; // 12px
+$font-size-xs: 0.7125rem; // 11px
+$font-size-2xs: 0.65rem; // 10.4px
+
+$small-font-size: $font-size-sm;
+
+// --------------------------------------------------------
+// HEADINGS
+// --------------------------------------------------------
+
+$h1-font-size: $font-size-3xl;
+$h2-font-size: $font-size-2xl;
+$h3-font-size: $font-size-xl;
+$h4-font-size: $font-size-lg;
+$h5-font-size: $font-size-md;
+$h6-font-size: $font-size-base;
+
+// --------------------------------------------------------
+// Body
+// --------------------------------------------------------
+
$body-bg: $gray-lighter;
$body-color: #333;
$custom-color: #212529;
$custom-dark-color: #28353b;
$list-group-color: $custom-color;
$placeholder-color: $muted;
-// Quickly modify global styling by enabling or disabling optional features.
+
+// --------------------------------------------------------
+// Options
+// --------------------------------------------------------
+
$enable-transitions: true;
$enable-rounded: true;
$enable-grid-classes: true;
$enable-sidebar-nav-rounded: false;
$border-color: $gray-lighter;
$hr-color: $secondary;
-$btn-close-width: .75em !default;
-$btn-close-padding-x: .5em !default;
-
-// Font, line-height, and color for body text, headings, and more.
-// Typography scale tuned for dense file-browser UI with balanced readability
-$font-size-base: 0.96875rem; // 15.5px
-$font-size-xl: 1.1875rem; // 19px
-$font-size-lg: 1.0625rem; // 17px
-$font-size-md: $font-size-base; // 15.5px
-$font-size-sm: 0.875rem; // 14px
-$font-size-xs: 0.8125rem; // 13px
-$font-size-2xs: 0.75rem; // 12px
-$font-size-3xs: 0.7125rem; // 11.4px
-$font-size-4xs: 0.65rem; // 10.4px
-
-//LAYOUT
-//--------------------------------------------------------
+
+// --------------------------------------------------------
+// LAYOUT
+// --------------------------------------------------------
+
$spacer: 0.6rem;
+$border-radius-base: .375rem !default;
+$border-radius: .375rem !default;
+
+// --------------------------------------------------------
// Links
+// --------------------------------------------------------
+
$link-color: $blue;
$link-decoration: none;
$link-hover-color: darken($link-color, 5%);
$link-hover-decoration: none;
+
+// --------------------------------------------------------
// Navs
+// --------------------------------------------------------
+
+$nav-link-font-size: $font-size-base;
$nav-link-padding-y: .35rem;
$nav-link-padding-x: .65rem;
$nav-link-font-weight: 400;
-$nav-link-transition: background-color .2s ease, color .2s ease, border-color .2s ease, box-shadow .2s ease;
+$nav-link-transition: background-color .2s ease,
+color .2s ease,
+border-color .2s ease,
+box-shadow .2s ease;
$nav-link-focus-box-shadow: none;
$nav-tabs-border-width: .5px;
$nav-tabs-border-radius: .7rem;
$nav-pills-border-radius: .55rem;
+
+// --------------------------------------------------------
// Forms
+// --------------------------------------------------------
+
$input-bg: $white;
$input-color: $custom-color;
$input-border-color: $gray-light;
-$input-font-size-sm: $font-size-xs;
+$input-font-size: $font-size-base;
+$input-font-size-sm: $font-size-sm;
+$input-font-size-lg: $font-size-md;
$input-border-width: 1px;
$input-box-shadow: none !important;
$input-focus-box-shadow: none !important;
+$input-group-addon-padding-x: .5rem !default;
+$input-group-addon-padding-y: .3rem !default;
+$input-padding-x: .5rem !default;
+$input-padding-y: .3rem !default;
+$input-font-size: $font-size-base !default;
+$input-font-size-lg: $font-size-lg !default;
+
$form-group-margin-bottom: 0.6rem;
$form-check-margin-bottom: 0;
+//$form-label-font-size: $font-size-xs;
$form-label-margin-bottom: 0.25rem;
+//$form-text-font-size: $font-size-xs;
+$form-select-padding-x: .5rem !default;
+$form-select-padding-y: .3rem !default;
+$form-select-font-size: $font-size-base;
+
+// --------------------------------------------------------
// Table-hover
+// --------------------------------------------------------
+
$table-bg-hover: lighten($lighter-blue, 14%);
$table-bg: transparent !important;
$table-color: inherit !important;
$selected-background: $lighter-blue;
+
+// --------------------------------------------------------
// Dropdowns
+// --------------------------------------------------------
+
+$dropdown-font-size: $font-size-base;
$dropdown-link-color: #444;
$dropdown-link-active-color: $dropdown-link-color;
$dropdown-link-hover-bg: $table-bg-hover !important;
$dropdown-link-active-bg: $dropdown-link-hover-bg;
-$dropdown-item-padding-y: .2rem;
-$dropdown-item-padding-x: 1rem;
+$dropdown-item-padding-y: .25rem;
+$dropdown-item-padding-x: .8rem;
$dropdown-padding-y: .2rem;
$dropdown-header-color: #8aa4af;
+
+// --------------------------------------------------------
// Modals
+// --------------------------------------------------------
+
$modal-inner-padding: .4rem;
$modal-header-padding-x: .8rem;
$modal-header-padding-y: .5rem;
@@ -120,32 +197,49 @@ $modal-md: 650px;
$modal-lg: 768px;
$modal-xl: 1000px;
$modal-content-border-width: .5px;
+
+// --------------------------------------------------------
// Progress-bar
+// --------------------------------------------------------
+
$progress-height: 20px;
-// Others
-$border-radius-base: 4px;
+$progress-font-size: $font-size-xs;
+
+// --------------------------------------------------------
// Buttons
-$btn-font-size: $font-size-xs !default;
-$btn-font-size-sm: $font-size-xs;
+// --------------------------------------------------------
+
+$btn-font-size: $font-size-base !default;
+$btn-font-size-sm: $font-size-sm;
+$btn-font-size-lg: $font-size-base;
+
+$btn-padding-y: .25rem;
+$btn-padding-x: .5rem;
$btn-padding-x-xs: .5rem !default;
$btn-padding-y-xs: .2rem !default;
$btn-padding-x-xxs: .2rem !default;
$btn-padding-y-xxs: .1rem !default;
+$btn-padding-y-lg: .4rem !default;
+$btn-padding-x-lg: .9rem !default;
$btn-disabled-opacity: 0.4;
-$btn-border-radius: .375rem;
-$btn-border-radius-sm: .375rem;
+
+// --------------------------------------------------------
// Badges
-$badge-font-size: 89%;
+// --------------------------------------------------------
+
+$badge-font-size: $font-size-2xs;
$badge-font-weight: 500 !default;
$badge-padding-x: .5rem !default;
$badge-padding-y: .35rem !default;
-//$badge-padding-y: .25rem !default;
+
+// --------------------------------------------------------
// Pagination
+// --------------------------------------------------------
+
$pagination-font-size: $font-size-2xs !important;
$pagination-color: $body-color;
$pagination-hover-color: darken($body-color, 4%);
$pagination-focus-color: $pagination-hover-color;
-
$pagination-bg: $white;
$pagination-hover-bg: darken($gray-mid, 2%);
$pagination-focus-bg: $pagination-hover-bg;
@@ -154,11 +248,14 @@ $pagination-active-bg: $primary;
$pagination-active-border-color: darken($primary, 7%);
$pagination-disabled-color: lighten($muted, 12%);
$pagination-disabled-bg: $white;
-
$pagination-border-color: $gray-mid;
$pagination-hover-border-color: darken($gray-mid, 10%);
$pagination-disabled-border-color: lighten($gray-mid, 2%);
-
$pagination-focus-box-shadow: none;
+
+// --------------------------------------------------------
// List group
+// --------------------------------------------------------
+
$list-group-border-width: .5px;
+$list-group-font-size: $font-size-xs;