Skip to content

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

style(frontend): align toolbar actions with breadcrumb

johaven527df3264582
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 ba4eabcb..1c6ca1f0 100644
--- a/frontend/src/app/applications/admin/components/admin-groups.component.html
+++ b/frontend/src/app/applications/admin/components/admin-groups.component.html
@@ -3,7 +3,7 @@
[attr.aria-label]="'Actions' | translate:locale.language"
role="toolbar">
<div class="btn-group" dropdown>
- <button class="btn btn-default dropdown-toggle app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ <button class="btn btn-default dropdown-toggle app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
[attr.aria-label]="'New' | translate:locale.language"
dropdownToggle
type="button">
diff --git a/frontend/src/app/applications/admin/components/admin-spaces.component.html b/frontend/src/app/applications/admin/components/admin-spaces.component.html
index 96c27914..4a5aabf1 100644
--- a/frontend/src/app/applications/admin/components/admin-spaces.component.html
+++ b/frontend/src/app/applications/admin/components/admin-spaces.component.html
@@ -4,7 +4,7 @@
role="toolbar">
<button (click)="openSpaceDialog(true)"
[attr.aria-label]="'New space' | translate:locale.language"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
[tooltip]="'New space' | translate:locale.language"
type="button">
<svg [lucideIcon]="icons.LucidePlus"></svg>
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 4be7f175..c9aa7282 100644
--- a/frontend/src/app/applications/admin/components/admin-users.component.html
+++ b/frontend/src/app/applications/admin/components/admin-users.component.html
@@ -4,7 +4,7 @@
role="toolbar">
<button (click)="openDialog(true)"
[attr.aria-label]="(guestsView ? 'New guest' : 'New user') | translate:locale.language"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
[tooltip]="(guestsView ? 'New guest' : 'New user') | translate:locale.language"
type="button">
<svg [lucideIcon]="icons.LucideUserRoundPlus"></svg>
diff --git a/frontend/src/app/applications/favorites/components/favorites.component.html b/frontend/src/app/applications/favorites/components/favorites.component.html
index f48a183b..7f316921 100644
--- a/frontend/src/app/applications/favorites/components/favorites.component.html
+++ b/frontend/src/app/applications/favorites/components/favorites.component.html
@@ -5,7 +5,7 @@
<button (click)="goTo()"
[attr.aria-label]="'Go to' | translate:locale.language"
[disabled]="!selected || selected.isDisabled"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
type="button">
<svg [lucideIcon]="icons.LucideMapPin"></svg>
<span class="app-top-menu-tool-bar__label" l10nTranslate>Go to</span>
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 a0601da2..3cc2373c 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
@@ -10,7 +10,7 @@
<div class="sidebar-component-title-label" l10nTranslate>Clipboard</div>
<div class="sidebar-component-title-side">
<button (click)="clearAll()"
- class="btn btn-default app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default"
type="button">
<svg [lucideIcon]="icons.LucideX"></svg>
</button>
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 1c83620e..d746fb69 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
@@ -22,14 +22,14 @@
<button type="button"
(click)="cancelTasks()"
[tooltip]="'Stop' | translate:locale.language"
- class="btn btn-default app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default"
placement="top">
<svg [lucideIcon]="icons.LucideOctagonX"></svg>
</button>
}
<button type="button"
(click)="removeTasks()"
- class="btn btn-default app-top-menu-tool-bar__action--highlighted">
+ class="btn btn-default">
<svg [lucideIcon]="icons.LucideX"></svg>
</button>
</div>
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 788cb477..6d920c5d 100644
--- a/frontend/src/app/applications/files/components/sidebar/files-tree.component.html
+++ b/frontend/src/app/applications/files/components/sidebar/files-tree.component.html
@@ -4,7 +4,7 @@
<div class="sidebar-component-title-label" l10nTranslate>Navigation</div>
<div class="sidebar-component-title-side">
<button (click)="onRefresh()"
- class="btn btn-default app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default"
type="button">
<svg [lucideIcon]="icons.LucideRotateCw"></svg>
</button>
diff --git a/frontend/src/app/applications/links/components/links.component.html b/frontend/src/app/applications/links/components/links.component.html
index 1ca5d7dd..c65071eb 100644
--- a/frontend/src/app/applications/links/components/links.component.html
+++ b/frontend/src/app/applications/links/components/links.component.html
@@ -5,7 +5,7 @@
<button (click)="copyToClipboard()"
[attr.aria-label]="'Copy link' | translate:locale.language"
[disabled]="!selected"
- class="btn {{linkWasCopied ? 'btn-primary' : 'btn-default'}} app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn {{linkWasCopied ? 'btn-primary' : 'btn-default'}} app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
type="button">
<svg [lucideIcon]="linkWasCopied? icons.LucideClipboardCheck : icons.LucideClipboard"></svg>
<span class="app-top-menu-tool-bar__label" l10nTranslate>Copy link</span>
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 59fcc51d..baa792a5 100644
--- a/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html
+++ b/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html
@@ -8,7 +8,7 @@
<div class="sidebar-component-title-side">
@if (store.notifications().length) {
<button (click)="removeAll()"
- class="btn btn-default app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default"
type="button">
<svg [lucideIcon]="icons.LucideTrash2"></svg>
</button>
diff --git a/frontend/src/app/applications/shares/components/shared.component.html b/frontend/src/app/applications/shares/components/shared.component.html
index 12309396..baa687e8 100644
--- a/frontend/src/app/applications/shares/components/shared.component.html
+++ b/frontend/src/app/applications/shares/components/shared.component.html
@@ -4,7 +4,7 @@
role="toolbar">
<button (click)="openShareDialog(true)"
[attr.aria-label]="'New share' | translate:locale.language"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
type="button">
<svg [lucideIcon]="icons.LucidePlus"></svg>
<span class="app-top-menu-tool-bar__label" l10nTranslate>New share</span>
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 2cf57a32..04387957 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -18,7 +18,7 @@
<!--Start New Button-->
<div class="btn-group">
<button (click)="openNewDialog()"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
[attr.aria-label]="'New' | translate:locale.language"
type="button">
<svg [lucideIcon]="icons.LucidePlus"></svg>
@@ -62,7 +62,7 @@
<button (click)="shortcutOpen()"
[attr.aria-label]="'Open' | translate:locale.language"
[disabled]="selection.length !== 1"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
type="button">
<svg [lucideIcon]="selection[0]?.isDir ? icons.LucideFolderOpen : icons.LucideEye"></svg>
<span class="app-top-menu-tool-bar__label" l10nTranslate>Open</span>
@@ -106,7 +106,7 @@
<button (click)="copyMoveFiles()"
[attr.aria-label]="'Restore to...' | translate:locale.language"
[disabled]="!hasSelection || hasDisabledItemsInSelection"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
type="button">
<svg [lucideIcon]="icons.LucideArchiveRestore"></svg>
<span class="app-top-menu-tool-bar__label" l10nTranslate>Restore to...</span>
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.html b/frontend/src/app/applications/spaces/components/spaces.component.html
index 0105b3fc..091ba15a 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces.component.html
@@ -5,7 +5,7 @@
@if (canCreateSpace) {
<button (click)="openSpaceDialog(true)"
[attr.aria-label]="'New space' | translate:locale.language"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
type="button">
<svg [lucideIcon]="icons.LucidePlus"></svg>
<span class="app-top-menu-tool-bar__label" l10nTranslate>New space</span>
diff --git a/frontend/src/app/applications/spaces/components/trash.component.html b/frontend/src/app/applications/spaces/components/trash.component.html
index 21b37533..a0136352 100644
--- a/frontend/src/app/applications/spaces/components/trash.component.html
+++ b/frontend/src/app/applications/spaces/components/trash.component.html
@@ -5,7 +5,7 @@
<button (click)="browse(selected)"
[attr.aria-label]="'Open' | translate:locale.language"
[disabled]="!selected?.enabled || loading"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
type="button">
<svg [lucideIcon]="icons.LucideFolderOpen"></svg>
<span class="app-top-menu-tool-bar__label" l10nTranslate>Open</span>
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 a91a85cf..58fa546a 100644
--- a/frontend/src/app/applications/sync/components/sync-clients.component.html
+++ b/frontend/src/app/applications/sync/components/sync-clients.component.html
@@ -3,7 +3,7 @@
role="toolbar">
<button (click)="loadClients()"
[attr.aria-label]="'Refresh' | translate:locale.language"
- class="d-none d-sm-flex align-items-center justify-content-center btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="d-none d-sm-flex align-items-center justify-content-center btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
type="button">
<svg [lucideIcon]="icons.LucideRotateCw"></svg>
<span class="app-top-menu-tool-bar__label" l10nTranslate>Refresh</span>
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 f23b8fec..082b7891 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.html
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.html
@@ -4,7 +4,7 @@
<button (click)="addToSync()"
[attr.aria-label]="'New' | translate:locale.language"
[tooltip]="'New' | translate:locale.language"
- class="btn btn-default app-top-menu-tool-bar__action--icon app-top-menu-tool-bar__action--highlighted" type="button">
+ class="btn btn-default app-top-menu-tool-bar__action--icon" type="button">
<svg [lucideIcon]="icons.LucidePlus"></svg>
</button>
<button (click)="openSettingsDialog()"
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 9aefeb9f..00584c52 100644
--- a/frontend/src/app/applications/users/components/user-groups.component.html
+++ b/frontend/src/app/applications/users/components/user-groups.component.html
@@ -5,7 +5,7 @@
<button (click)="openDialog(true)"
[attr.aria-label]="(!currentGroup && allowedAction.addGroup ? 'New personal group': 'Add members') | translate:locale.language"
[disabled]="!allowedAction.addGroup && !allowedAction.addUsers"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
[tooltip]="(!currentGroup && allowedAction.addGroup ? 'New personal group': 'Add members') | translate:locale.language"
type="button">
<svg [lucideIcon]="icons.LucidePlus"></svg>
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 9d63c8bb..2177705c 100644
--- a/frontend/src/app/applications/users/components/user-guests.component.html
+++ b/frontend/src/app/applications/users/components/user-guests.component.html
@@ -5,7 +5,7 @@
<button (click)="openGuestDialog(true)"
[attr.aria-label]="'New guest' | translate:locale.language"
[disabled]="!canCreateGuest"
- class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default app-top-menu-tool-bar__action--quiet app-top-menu-tool-bar__action--breadcrumb-aligned"
type="button">
<svg [lucideIcon]="icons.LucidePlus"></svg>
<span class="app-top-menu-tool-bar__label" l10nTranslate>New guest</span>
diff --git a/frontend/src/app/layout/sidebar/components/selection.component.html b/frontend/src/app/layout/sidebar/components/selection.component.html
index def675dc..f7b97c30 100644
--- a/frontend/src/app/layout/sidebar/components/selection.component.html
+++ b/frontend/src/app/layout/sidebar/components/selection.component.html
@@ -4,7 +4,7 @@
<div class="sidebar-component-title-side">
@if (selectionType() === SPACES_PATH.FILES && store.filesSelection().length > 1) {
<button (click)="clearSelection()"
- class="btn btn-default app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default"
type="button"
aria-label="Clear selection">
<svg [lucideIcon]="LucideX"></svg>
diff --git a/frontend/src/app/layout/sidebar/components/windows.component.html b/frontend/src/app/layout/sidebar/components/windows.component.html
index db518e49..bfe90eab 100755
--- a/frontend/src/app/layout/sidebar/components/windows.component.html
+++ b/frontend/src/app/layout/sidebar/components/windows.component.html
@@ -4,7 +4,7 @@
<div class="sidebar-component-title-side">
@if (windows.length) {
<button (click)="onCloseAll()"
- class="btn btn-default app-top-menu-tool-bar__action--highlighted"
+ class="btn btn-default"
type="button"
aria-label="Close all windows">
<svg [lucideIcon]="icons.LucideX"></svg>
diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scss
index 83fc9d6c..f42ef048 100755
--- a/frontend/src/styles/components/_app.scss
+++ b/frontend/src/styles/components/_app.scss
@@ -258,7 +258,6 @@
.app-top-menu-tool-bar {
--app-top-menu-action-active-bg: rgba(var(--bs-primary-rgb), #{$app-top-menu-action-active-bg-opacity});
- --app-top-menu-action-highlighted-bg: rgba(var(--bs-primary-rgb), #{$app-top-menu-action-highlighted-bg-opacity});
gap: .3rem;
padding: 0 .55rem;
@@ -318,12 +317,9 @@
}
}
- .app-top-menu-tool-bar__action--highlighted.btn-default {
- background-color: var(--app-top-menu-action-highlighted-bg) !important;
-
- &:disabled {
- background-color: var(--app-top-menu-action-highlighted-bg) !important;
- }
+ .app-top-menu-tool-bar__action--breadcrumb-aligned {
+ padding-inline-start: ($btn-padding-x + $dropdown-spacer - $app-top-menu-leading-content-offset);
+ padding-inline-end: ($btn-padding-x + $dropdown-spacer + $app-top-menu-leading-content-offset);
}
.app-top-menu-tool-bar__action--icon {
diff --git a/frontend/src/styles/components/_header.scss b/frontend/src/styles/components/_header.scss
index 670a9ed5..2aa622af 100644
--- a/frontend/src/styles/components/_header.scss
+++ b/frontend/src/styles/components/_header.scss
@@ -470,10 +470,14 @@
height: $navbar-height;
background: transparent;
font-size: $font-size-base;
- padding: 0 .5rem;
+ padding: 0 .5rem 0 .75rem;
margin: 0;
color: $sidebar-light-icons-menu-color;
+ @include media-breakpoint-down(sm) {
+ padding-left: .5rem;
+ }
+
.breadcrumb-content {
display: flex;
align-items: center;
diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scss
index 64b7e553..2b436e53 100755
--- a/frontend/src/styles/components/_theme_dark.scss
+++ b/frontend/src/styles/components/_theme_dark.scss
@@ -353,7 +353,6 @@
:is(.app-top-menu, .sidebar-component-title).app-top-menu-tool-bar {
--app-top-menu-action-active-bg: var(--app-action-state-bg);
- --app-top-menu-action-highlighted-bg: #{$dark-highlighted-action-bg};
--app-top-menu-action-hover-bg: var(--app-action-state-bg);
:is(.btn-default, .btn-custom):not(:disabled) {
diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scss
index 6a5fc51f..d8a267b5 100755
--- a/frontend/src/styles/components/_theme_light.scss
+++ b/frontend/src/styles/components/_theme_light.scss
@@ -364,7 +364,6 @@
}
:is(.app-top-menu, .sidebar-component-title).app-top-menu-tool-bar {
- --app-top-menu-action-highlighted-bg: #{$light-sidebar-mini-active-bg};
--app-top-menu-action-hover-bg: var(--app-action-state-bg);
:is(.btn-default, .btn-custom):hover:not(:disabled),
diff --git a/frontend/src/styles/components/_variables.scss b/frontend/src/styles/components/_variables.scss
index b9752d55..c56b62b9 100644
--- a/frontend/src/styles/components/_variables.scss
+++ b/frontend/src/styles/components/_variables.scss
@@ -16,8 +16,8 @@ $content-z-index: 1000;
$app-top-menu-action-min-width: 2.1875rem;
$app-top-menu-action-min-height: 1.9375rem;
$app-top-menu-label-font-weight: 450;
+$app-top-menu-leading-content-offset: .28rem;
$app-top-menu-action-active-bg-opacity: .16;
-$app-top-menu-action-highlighted-bg-opacity: .12;
$app-top-menu-dropdown-indicator-opacity: .65;
// Sidebar right (control)
@@ -76,7 +76,6 @@ $dark-tree-node-selected-bg: darken($sidebar-dark-apps-menu-title-bg, 4%);
$dark-surface-bg: lighten($sidebar-dark-icons-menu-bg, 5%);
$dark-menu-bg: darken($sidebar-dark-icons-menu-bg, 1.5%);
$dark-menu-surface-border: mix($theme-muted-blue, $dark-menu-bg, 18%);
-$dark-highlighted-action-bg: mix($primary, $dark-menu-bg, 55%);
$dark-action-state-bg: mix($primary, $dark-menu-bg, 78%);
$dark-surface-border: lighten($sidebar-dark-icons-menu-border-color, 10%);
$dark-item-color: lighten($gray-light, 8%);