Skip to content

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

chore(frontend): improve sizing

johaven963a93fb6529
diff --git a/frontend/src/app/layout/layout.component.ts b/frontend/src/app/layout/layout.component.ts
index 25a7c77a..192d007d 100644
--- a/frontend/src/app/layout/layout.component.ts
+++ b/frontend/src/app/layout/layout.component.ts
@@ -1,4 +1,4 @@
-import { Component, DOCUMENT, HostListener, inject, OnDestroy, Renderer2 } from '@angular/core'
+import { Component, DOCUMENT, HostListener, inject, OnDestroy, OnInit, Renderer2 } from '@angular/core'
import { RouterOutlet } from '@angular/router'
import { Subscription } from 'rxjs'
import { themeLight } from './layout.interfaces'
@@ -12,7 +12,7 @@ import { SideBarRightComponent } from './sidebar/sidebar.right.component'
templateUrl: 'layout.component.html',
imports: [RouterOutlet, NavBarComponent, SideBarLeftComponent, SideBarRightComponent]
})
-export class LayoutComponent implements OnDestroy {
+export class LayoutComponent implements OnDestroy, OnInit {
protected themeMode = themeLight
private readonly document = inject<Document>(DOCUMENT)
private readonly layout = inject(LayoutService)
@@ -29,6 +29,11 @@ export class LayoutComponent implements OnDestroy {
this.subscriptions.push(this.layout.toggleLeftSideBar.subscribe((status) => this.toggleLeftSideBar(status)))
}
+ ngOnInit() {
+ this.isSmallerThanMediumScreen = this.layout.isSmallerMediumScreen()
+ this.checkLeftSideBarCollapse()
+ }
+
ngOnDestroy() {
this.subscriptions.forEach((s) => s.unsubscribe())
}
@@ -36,8 +41,9 @@ export class LayoutComponent implements OnDestroy {
@HostListener('window:resize')
onResize() {
this.layout.resizeEvent.next()
- if (this.isSmallerThanMediumScreen !== this.layout.isSmallerMediumScreen()) {
- this.isSmallerThanMediumScreen = !this.isSmallerThanMediumScreen
+ const isSmallerThanMediumScreen = this.layout.isSmallerMediumScreen()
+ if (this.isSmallerThanMediumScreen !== isSmallerThanMediumScreen) {
+ this.isSmallerThanMediumScreen = isSmallerThanMediumScreen
this.checkLeftSideBarCollapse()
}
}
diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.html b/frontend/src/app/layout/sidebar/sidebar.left.component.html
index 218a6a4d..74380d32 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.html
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.html
@@ -2,8 +2,8 @@
<div class="sidebar-apps-icons">
<div class="menu">
<a (click)="toggleSideBar()"
- (mouseenter)="onHoverIconsMenu(true, {title: appName}, true)"
- (mouseleave)="onHoverIconsMenu(false, {title: appName}, true)">
+ (mouseenter)="onHoverIconsMenuMouse(true, {title: appName}, true)"
+ (mouseleave)="onHoverIconsMenuMouse(false, {title: appName}, true)">
<div class="logo-container">
<img alt="" [src]="logoIconUrl">
</div>
@@ -15,8 +15,8 @@
}
@if (store.userImpersonate()) {
<a (click)="logOut()"
- (mouseenter)="onHoverIconsMenu(true, {title: 'logout'})"
- (mouseleave)="onHoverIconsMenu(false, {title: 'logout'})">
+ (mouseenter)="onHoverIconsMenuMouse(true, {title: 'logout'})"
+ (mouseleave)="onHoverIconsMenuMouse(false, {title: 'logout'})">
<fa-icon [icon]="icons.faUserSecret"></fa-icon>
</a>
}
@@ -68,8 +68,8 @@
</ng-template>
<ng-template #sidebarMenuIcons let-mainMenu="menu" let-previousLevel="previousLevel">
<a [class.mt-auto]="previousLevel < 9 && mainMenu.level > 9" [class.active]="mainMenu.isActive"
- (mouseenter)="onHoverIconsMenu(true, mainMenu)"
- (mouseleave)="onHoverIconsMenu(false, mainMenu)"
+ (mouseenter)="onHoverIconsMenuMouse(true, mainMenu)"
+ (mouseleave)="onHoverIconsMenuMouse(false, mainMenu)"
(click)="checkMenuContext(mainMenu)">
<ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: mainMenu, isMenuIcon: true}"></ng-container>
<!-- start mini menu-->
diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.ts b/frontend/src/app/layout/sidebar/sidebar.left.component.ts
index 5539696d..eab24d03 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.ts
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.ts
@@ -101,6 +101,13 @@ export class SideBarLeftComponent implements OnDestroy {
}
}
+ onHoverIconsMenuMouse(state: boolean, menu: AppMenu | any, ignoreCollapse = false) {
+ if (!window.matchMedia('(hover: hover) and (pointer: fine)').matches) {
+ return
+ }
+ this.onHoverIconsMenu(state, menu, ignoreCollapse)
+ }
+
onMiniMenuNavigate(ev: MouseEvent, url: string[], menu: AppMenu = null) {
ev.stopPropagation()
this.navigateToUrl(url, menu)
diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss
index 1e7d582c..90896343 100644
--- a/frontend/src/styles/variables.scss
+++ b/frontend/src/styles/variables.scss
@@ -53,15 +53,15 @@ $muted: #6d7278;
// --------------------------------------------------------
$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
+$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;
@@ -123,10 +123,7 @@ $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;
@@ -179,7 +176,7 @@ $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: .25rem;
+$dropdown-item-padding-y: .3rem;
$dropdown-item-padding-x: .8rem;
$dropdown-padding-y: .2rem;
$dropdown-header-color: #8aa4af;