CodeCow/clients
1
0
Fork 0
mirror of https://github.com/bitwarden/clients.git synced 2026-07-07 21:10:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[CL-1088] only apply macOS extra top padding to nav logo in overlay mode (#19418)

Browse Source 
* fix(uif): only apply macOS extra top padding to nav logo in overlay mode

The macOS extra top padding was unconditionally applied to the nav logo.
Now it only applies when the side nav is in overlay mode (open but not push mode).
This commit is contained in:
Will Martin 2026-03-17 16:26:15 -04:00 committed by GitHub
parent 3adbfea82c
commit cf2ff5d85f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/desktop/src/scss/environment.scss
View File

@ -1,4 +1,8 @@
html.os_macos {
:root {
--header-height: 54px;
}
html.os_macos {
.vault .header-search {
-webkit-app-region: drag;
@ -12,7 +16,7 @@
padding-top: 0;
}
--bit-sidenav-macos-extra-top-padding: 28px;
--bit-sidenav-extra-top-padding: var(--header-height);
}
.environment-selector-btn {

4
apps/desktop/src/scss/header.scss
View File

@ -1,7 +1,7 @@
.header {
-webkit-app-region: drag;
min-height: 54px;
max-height: 54px;
min-height: var(--header-height);
max-height: var(--header-height);
display: grid;
grid-template-columns: 25% 1fr 25%;
grid-column-gap: 5px;

13
libs/components/src/navigation/nav-logo.component.html
View File

@ -1,10 +1,11 @@
<div
class="tw-px-2 tw-pt-[calc(0.5rem_+_var(--bit-sidenav-macos-extra-top-padding,_0px))] tw-bg-bg-sidenav"
[class]="
sideNavService.open()
? 'tw-sticky tw-top-0 tw-z-50 tw-pb-4'
: 'tw-pb-[calc(theme(spacing.8)_+_2px)]'
"
class="tw-px-2 tw-bg-bg-sidenav"
[ngClass]="{
'tw-sticky tw-top-0 tw-z-50 tw-pb-4': sideNavService.open(),
'tw-pb-[calc(theme(spacing.8)_+_2px)]': !sideNavService.open(),
'tw-pt-[calc(0.5rem_+_var(--bit-sidenav-extra-top-padding,_0px))]': sideNavService.isOverlay(),
'tw-pt-2': !sideNavService.isOverlay(),
}"
>
<!-- absolutely position the link svg to avoid shifting layout when sidenav is closed -->
<a

3
libs/components/src/navigation/nav-logo.component.ts
View File

@ -1,3 +1,4 @@
import { NgClass } from "@angular/common";
import { ChangeDetectionStrategy, Component, input, inject } from "@angular/core";
import { RouterLinkActive, RouterLink } from "@angular/router";
@ -10,7 +11,7 @@ import { SideNavService } from "./side-nav.service";
@Component({
selector: "bit-nav-logo",
templateUrl: "./nav-logo.component.html",
imports: [RouterLinkActive, RouterLink, SvgComponent],
imports: [NgClass, RouterLinkActive, RouterLink, SvgComponent],
changeDetection: ChangeDetectionStrategy.OnPush,
host: { class: "tw-contents" },
})