A community-supported supercharged document management system: scan, index and archive all your documents
Python aiangulararchivingdjangodmsdocument-managementdocument-management-systemllmmachine-learningocroptical-character-recognitionpdf
Enhancement: more v3 ui tweaks (#13774)
shamoon22c57fb392f4
diff --git a/src-ui/e2e/document-detail/document-detail.spec.ts b/src-ui/e2e/document-detail/document-detail.spec.tsindex 99080910a..b4ec0607a 100644--- a/src-ui/e2e/document-detail/document-detail.spec.ts+++ b/src-ui/e2e/document-detail/document-detail.spec.ts@@ -33,7 +33,7 @@ test('should warn on unsaved changes', async ({ page }) => {await page.getByRole('button', { name: 'Close', exact: true }).click()await expect(page.getByRole('dialog')).toHaveText(/unsaved changes/)await page.getByRole('button', { name: 'Cancel' }).click()- await page.getByRole('link', { name: 'Close all' }).click()+ await page.getByRole('button', { name: 'Close all' }).click()await expect(page.getByRole('dialog')).toHaveText(/unsaved changes/)})diff --git a/src-ui/src/app/components/admin/trash/trash.component.html b/src-ui/src/app/components/admin/trash/trash.component.htmlindex bb9a947a6..8beb2129d 100644--- a/src-ui/src/app/components/admin/trash/trash.component.html+++ b/src-ui/src/app/components/admin/trash/trash.component.html@@ -18,9 +18,11 @@</button></pngx-page-header>-<div class="row mb-3">- <ngb-pagination class="col-auto" [pageSize]="25" [collectionSize]="totalDocuments()" [page]="page()" [maxSize]="5" (pageChange)="page.set($event); reload()" size="sm" aria-label="Pagination"></ngb-pagination>-</div>+@if (totalDocuments() > 25) {+ <div class="row mb-3">+ <ngb-pagination class="col-auto" [pageSize]="25" [collectionSize]="totalDocuments()" [page]="page()" [maxSize]="5" (pageChange)="page.set($event); reload()" size="sm" aria-label="Pagination"></ngb-pagination>+ </div>+}<div class="card border table-responsive mb-3"><table class="table table-striped align-middle shadow-sm mb-0">diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.htmlindex 59b76de6b..273feaab2 100644--- a/src-ui/src/app/components/app-frame/app-frame.component.html+++ b/src-ui/src/app/components/app-frame/app-frame.component.html@@ -4,27 +4,34 @@(click)="closeMobileSearch(); toggleMenuCollapsed()"><span class="navbar-toggler-icon"></span></button>- <a class="navbar-brand d-flex align-items-center me-0 px-3 py-3 order-sm-0"- [ngClass]="{ 'slim': slimSidebarEnabled, 'col-auto col-md-3 col-lg-2 col-xxxl-1' : !slimSidebarEnabled, 'py-3' : !customAppTitle?.length || slimSidebarEnabled, 'py-2': customAppTitle?.length }"+ <a class="navbar-brand d-flex align-items-center me-0 ps-md-3 py-0 order-sm-0"+ [ngClass]="{ 'slim': slimSidebarEnabled, '' : !slimSidebarEnabled }"routerLink="/dashboard"tourAnchor="tour.intro">- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" width="1.5em" height="1.5em" fill="currentColor">- <path d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>- </svg>- <div class="ms-2 ms-md-3 d-inline-block" [class.d-md-none]="slimSidebarEnabled">- @if (customAppTitle?.length) {- <div class="d-flex flex-column align-items-start custom-title">- <span class="title">{{customAppTitle}}</span>- <span class="byline text-uppercase font-monospace" i18n>by Paperless-ngx</span>- </div>+ @if (!hasCustomBranding) {+ <pngx-logo extra_classes="navbar-official-logo px-1" height="2.4rem"></pngx-logo>+ <svg class="brand-mark brand-mark-slim d-none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" width="1.5em" height="1.5em" fill="currentColor">+ <path d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>+ </svg>+ } @else {+ @if (customAppLogo) {+ <img class="brand-logo" [src]="customAppLogo" alt="" />} @else {- Paperless-ngx+ <svg class="brand-mark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" width="1.5em" height="1.5em" fill="currentColor">+ <path d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>+ </svg>}- </div>+ <div class="brand-copy ms-2 text-truncate" [class.d-md-none]="slimSidebarEnabled">+ <span class="brand-title text-truncate">{{ appTitle }}</span>+ @if (customAppTitle) {+ <span class="byline text-uppercase font-monospace" i18n>by Paperless-ngx</span>+ }+ </div>+ }</a>- <div class="search-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 ps-md-4 me-sm-auto order-3 order-sm-1"+ <div class="search-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 ps-md-3 me-sm-auto order-3 order-sm-1"[class.mobile-hidden]="mobileSearchHidden()">- <div class="col-12 col-md-7">+ <div class="col-12 header-search"><pngx-global-search></pngx-global-search></div></div>@@ -34,7 +41,7 @@}<pngx-toasts-dropdown></pngx-toasts-dropdown><li ngbDropdown class="nav-item dropdown">- <button class="btn ps-1 border-0" id="userDropdown" ngbDropdownToggle aria-label="User menu" i18n-aria-label>+ <button class="btn border-0" id="userDropdown" ngbDropdownToggle aria-label="User menu" i18n-aria-label><i-bs width="1.3em" height="1.3em" name="person-circle"></i-bs><span class="small ms-2 d-none d-sm-inline">{{this.settingsService.displayName}}@@ -79,7 +86,7 @@}</button>}- <div class="sidebar-sticky pt-3 d-flex flex-column justify-space-around">+ <div class="sidebar-sticky pt-3 pb-1 d-flex flex-column justify-space-around"><ul class="nav flex-column"><li class="nav-item app-link"><a class="nav-link" routerLink="dashboard" routerLinkActive="active" (click)="closeMenu()"@@ -89,7 +96,9 @@</a></li><li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }">- <a class="nav-link" routerLink="documents" routerLinkActive="active" (click)="closeMenu()"+ <a class="nav-link" routerLink="documents" routerLinkActive="active"+ [routerLinkActiveOptions]="{ paths: 'exact', queryParams: 'ignored', matrixParams: 'ignored', fragment: 'ignored' }"+ (click)="closeMenu()"ngbPopover="Documents" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim"><i-bs class="me-2" name="files"></i-bs><span><ng-container i18n>Documents</ng-container></span>@@ -159,11 +168,12 @@}@if (openDocuments.length >= 1) {<li class="nav-item w-100 app-link">- <a class="nav-link app-link" [class.text-truncate]="!slimSidebarEnabled" [routerLink]="[]" (click)="closeAll()"+ <button type="button" class="nav-link nav-link-action app-link w-100 text-start"+ [class.text-truncate]="!slimSidebarEnabled" (click)="closeAll()"ngbPopover="Close all" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim"><i-bs class="me-2" name="x"></i-bs><span><ng-container i18n>Close all</ng-container></span>- </a>+ </button></li>}</ul>@@ -177,10 +187,11 @@@if (canManageAttributes) {<li class="nav-item app-link" tourAnchor="tour.tags"><div class="d-flex align-items-center attributes-row">- <a class="nav-link flex-fill" routerLink="attributes" routerLinkActive="active" (click)="closeMenu()"+ <a class="nav-link flex-fill" routerLink="attributes" routerLinkActive="active"+ [routerLinkActiveOptions]="{ exact: !(slimSidebarEnabled || attributesSectionsCollapsed) }" (click)="closeMenu()"ngbPopover="Attributes" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">- <i-bs class="me-2" name="stack"></i-bs><span><ng-container i18n>Attributes</ng-container></span>+ <i-bs name="stack"></i-bs><span class="ms-2"><ng-container i18n>Attributes</ng-container></span></a>@if (!slimSidebarEnabled && canSaveSettings) {<buttondiff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scssindex 2921541b5..47507da6f 100644--- a/src-ui/src/app/components/app-frame/app-frame.component.scss+++ b/src-ui/src/app/components/app-frame/app-frame.component.scss@@ -7,8 +7,8 @@bottom: 0;left: 0;z-index: 995; /* Behind the navbar */- padding: 50px 0 0; /* Height of navbar */- box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);+ padding: 64px 0 0; /* Height of navbar */+ border-right: 1px solid color-mix(in srgb, var(--bs-border-color) 65%, transparent);overflow-y: auto;--pngx-sidebar-width: 100%;max-width: var(--pngx-sidebar-width);@@ -25,7 +25,7 @@}.view-name {- max-width: calc(100% - 50px)+ max-width: calc(100% - 55px)}.nav-group:not(:has(.app-link)) .sidebar-heading {@@ -47,7 +47,7 @@}@media (max-width: 767.98px) {.sidebar {- top: 3.5rem;+ top: 4rem;}.search-container {@@ -71,12 +71,14 @@main {transition: all .2s ease;- padding-top: 110px;+ padding-top: 118px;+ background: var(--pngx-bg-darker);+ min-height: 100vh;}@media (min-width: 768px) {main {- padding-top: 56px;+ padding-top: 64px;}}@@ -91,7 +93,7 @@ main {@media(min-width: 768px) {.sidebar.slim {- max-width: 50px;+ max-width: 55px;li.nav-item span.badge {display: inline-block;@@ -150,7 +152,7 @@ main {display: block;position: fixed;left: calc(var(--pngx-sidebar-width) - 12px);- top: 60px;+ top: 72px;z-index: 996;--bs-btn-padding-x: 0.35rem;--bs-btn-padding-y: 0.125rem;@@ -158,7 +160,7 @@ main {}.sidebar.slim .sidebar-slim-toggler {- --pngx-sidebar-width: 50px !important;+ --pngx-sidebar-width: 56px !important;}}@@ -171,7 +173,7 @@ main {position: relative;top: 0;height: 100%;- padding-top: 0.5rem;+ padding: .75rem .5rem 1rem;overflow-x: hidden;overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */min-height: min-content;@@ -186,11 +188,14 @@ main {.sidebar .nav-link {font-weight: 500;white-space: nowrap;- border-left: 2px solid transparent;- transition: color .15s ease-in-out;+ border-radius: .55rem;+ margin: 1px 0;+ padding: .55rem .7rem;+ transition: color .15s ease-in-out, background-color .15s ease-in-out;- &:hover, &.active, &:focus {+ &:hover, &:focus {color: var(--bs-primary);+ background-color: color-mix(in srgb, var(--bs-primary) 8%, transparent);}&:focus-visible {@@ -199,8 +204,21 @@ main {}&.active {- font-weight: bold;- border-left-color: var(--bs-primary);+ font-weight: 600;+ color: var(--bs-primary);+ background-color: color-mix(in srgb, var(--bs-primary) 13%, transparent);+ }++ &.nav-link-action {+ color: var(--bs-secondary-color);+ font-weight: 400;+ background-color: transparent;++ &:hover,+ &:focus {+ color: var(--bs-primary);+ background-color: transparent;+ }}i-bs {@@ -209,20 +227,45 @@ main {}}-// sub-page gets marker only-.nav-item:has(.attributes-submenu.show .nav-link.active) > .attributes-row > .nav-link.active {- border-left-color: transparent;-}+.attributes-row {+ border-radius: .55rem;+ margin: .1rem 0;+ transition: color .15s ease-in-out, background-color .15s ease-in-out;++ > .nav-link {+ margin: 0;-// bring sub-menu markers back out to L edge-.attributes-submenu .nav-link {- margin-left: -1rem;- padding-left: calc(var(--bs-nav-link-padding-x) + 1rem);+ &:hover,+ &:focus,+ &.active {+ background-color: transparent;+ }+ }++ &:hover,+ &:has(> .nav-link:focus-visible) {+ background-color: color-mix(in srgb, var(--bs-primary) 8%, transparent);+ }++ &:has(> .nav-link.active) {+ background-color: color-mix(in srgb, var(--bs-primary) 13%, transparent);+ }}.attributes-row .attributes-expand-btn {opacity: 0.2;+ width: 1.75rem;+ height: 1.75rem;+ margin-right: .35rem !important;+ border-radius: 50%;+ box-shadow: none !important;transition: opacity 0.15s ease-in-out;++ &:focus-visible {+ outline: 2px solid color-mix(in srgb, var(--bs-primary) 55%, transparent);+ outline-offset: 1px;+ opacity: 1;+ }}.attributes-row:hover .attributes-expand-btn {@@ -230,8 +273,10 @@ main {}.sidebar-heading {- font-size: 0.75rem;+ font-size: 0.68rem;text-transform: uppercase;+ font-weight: 700;+ opacity: .75;}.nav {@@ -288,18 +333,115 @@ main {*/.navbar-brand {- font-size: 1rem;+ font-size: 1.0625rem;+ min-height: 64px;+ letter-spacing: -0.015em;++ &:hover,+ &:focus-visible {+ ::ng-deep .navbar-official-logo,+ .brand-mark,+ .brand-logo {+ filter: drop-shadow(0 2px 3px rgba(0, 0, 0, .7));+ }+ }++ ::ng-deep .navbar-official-logo {+ filter: drop-shadow(0 1px 2px rgba(0, 0, 0, .5));+ transition: filter .15s ease-in-out;++ @media screen and (max-width: 575.98px) {+ max-height: 2rem;+ }+ }++ .brand-mark {+ width: 1.65rem;+ height: 1.65rem;+ flex: 0 0 auto;+ transition: filter .15s ease-in-out;+ }++ .brand-copy {+ display: flex;+ flex-direction: column;+ align-items: flex-start;+ min-width: 0;+ line-height: 1.1;+ transition: transform .15s ease-in-out;+ }- .flex-column {- padding: 0.15rem 0;+ .brand-title {+ font-weight: 600;+ max-width: 100%;+ min-width: 0;}.byline {- font-size: 0.5rem;- letter-spacing: 0.1rem;+ margin-top: .15rem;+ font-size: .5rem;+ font-weight: 500;+ letter-spacing: .1rem;+ opacity: .8;+ }++ .brand-logo {+ width: auto;+ height: 2.75rem;+ max-width: 5rem;+ flex: 0 0 auto;+ object-fit: contain;+ transition: filter .15s ease-in-out, transform .15s ease-in-out;+ }++}++:host ::ng-deep .navbar-official-logo {+ .leaf {+ fill: color-mix(in srgb, var(--pngx-primary-text-contrast) 70%, var(--bs-primary)) !important;+ }++ .text {+ fill: var(--pngx-primary-text-contrast) !important;}}+.navbar {+ min-height: 64px;+ box-shadow: 0 1px 0 rgba(0, 0, 0, .12), 0 4px 18px rgba(0, 0, 0, .08) !important;+}++.navbar > ul {+ align-items: center;+ gap: .125rem;+ padding-right: .5rem;++ .btn {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ min-width: 2.5rem;+ min-height: 2.5rem;+ padding: .45rem .55rem;+ border-radius: .6rem;+ transition: background-color .15s ease-in-out, opacity .15s ease-in-out;++ &:hover,+ &:focus-visible {+ background-color: rgba(0, 0, 0, .14);+ }+ }+}++#userDropdown {+ padding-left: .75rem;+}++.header-search {+ width: 100%;+ max-width: 44rem;+}+@media screen and (max-width: 575.98px) {.navbar {display: grid;@@ -346,18 +488,39 @@ main {grid-area: actions;justify-self: end;flex-wrap: nowrap;+ gap: 0;+ padding-right: .25rem;+ }++ #userDropdown {+ min-width: 2.25rem;+ padding-right: .35rem;+ padding-left: .45rem;}}@media screen and (min-width: 768px) {.navbar-brand.slim {- max-width: 50px;+ max-width: 55px;++ .brand-logo {+ width: 1.65rem;+ max-width: 1.65rem;+ }++ .brand-mark-slim {+ display: block !important;+ }+ }++ :host ::ng-deep .navbar-brand.slim .navbar-official-logo {+ display: none;}}:host ::ng-deep .dropdown.show .dropdown-toggle,:host ::ng-deep .dropdown-toggle:hover {- opacity: 0.7;+ opacity: 1;}.dropdown-toggle::after {diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.tsindex db752dde7..52426b2af 100644--- a/src-ui/src/app/components/app-frame/app-frame.component.ts+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts@@ -45,6 +45,7 @@ import { TasksService } from 'src/app/services/tasks.service'import { ToastService } from 'src/app/services/toast.service'import { environment } from 'src/environments/environment'import { ChatComponent } from '../chat/chat/chat.component'+import { LogoComponent } from '../common/logo/logo.component'import { ProfileEditDialogComponent } from '../common/profile-edit-dialog/profile-edit-dialog.component'import { DocumentDetailComponent } from '../document-detail/document-detail.component'import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'@@ -59,6 +60,7 @@ const SCROLL_THRESHOLD = 16styleUrls: ['./app-frame.component.scss'],imports: [GlobalSearchComponent,+ LogoComponent,DocumentTitlePipe,IfPermissionsDirective,ToastsDropdownComponent,@@ -190,11 +192,34 @@ export class AppFrameComponentreturn `${environment.appTitle} v${this.settingsService.get(SETTINGS_KEYS.VERSION)}${environment.tag === 'prod' ? '' : ` #${environment.tag}`}`}+ get appTitle(): string {+ this.settingsService.trackChanges()+ return (+ this.settingsService.get(SETTINGS_KEYS.APP_TITLE) || environment.appTitle+ )+ }+get customAppTitle(): string {this.settingsService.trackChanges()return this.settingsService.get(SETTINGS_KEYS.APP_TITLE)}+ get hasCustomBranding(): boolean {+ this.settingsService.trackChanges()+ return !!(+ this.settingsService.get(SETTINGS_KEYS.APP_TITLE)?.length ||+ this.settingsService.get(SETTINGS_KEYS.APP_LOGO)?.length+ )+ }++ get customAppLogo(): string {+ this.settingsService.trackChanges()+ const logo = this.settingsService.get(SETTINGS_KEYS.APP_LOGO)+ return logo?.length+ ? environment.apiBaseUrl.replace(/\/api\/$/, logo)+ : null+ }+get canSaveSettings(): boolean {return (this.permissionsService.currentUserCan(diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.scss b/src-ui/src/app/components/app-frame/global-search/global-search.component.scssindex bbb7840c5..274eed472 100644--- a/src-ui/src/app/components/app-frame/global-search/global-search.component.scss+++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.scss@@ -4,12 +4,12 @@ form {> i-bs[name="search"] {position: absolute;left: 0.6rem;- top: .35rem;+ top: .25rem;color: rgba(255, 255, 255, 0.6);@media screen and (min-width: 768px) {// adjust for smaller font size on non-mobile- top: 0.25rem;+ top: .15rem;}}@@ -37,8 +37,9 @@ form {}.form-control {- color: rgba(255, 255, 255, 0.3);- background-color: rgba(0, 0, 0, 0.15);+ min-height: 2.25rem;+ color: rgba(255, 255, 255, 0.55);+ background-color: rgba(0, 0, 0, 0.16);padding-left: 1.8rem;border-color: rgba(255, 255, 255, 0.2);transition: all .3s ease, padding-left 0s ease, background-color 0s ease; // Safari requires all@@ -52,7 +53,7 @@ form {}&:focus-within {- background-color: rgba(0, 0, 0, 0.3);+ background-color: rgba(0, 0, 0, 0.26);color: var(--bs-light);flex-grow: 1;padding-left: 0.5rem;diff --git a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.htmlindex c79cb9107..26cee7024 100644--- a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html+++ b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html@@ -1,7 +1,7 @@-<li ngbDropdown class="nav-item mx-1" (openChange)="onOpenChange($event)">+<li ngbDropdown class="nav-item mx-1 position-relative" (openChange)="onOpenChange($event)">@if (toasts().length) {- <span class="badge rounded-pill z-3 pe-none bg-secondary me-2 position-absolute top-0 left-0">{{ toasts().length }}</span>+ <span class="notification-count badge rounded-pill z-3 pe-none bg-secondary position-absolute">{{ toasts().length }}</span>}<button class="btn border-0" id="notificationsDropdown" ngbDropdownToggle aria-label="Notifications" i18n-aria-label><i-bs width="1.3em" height="1.3em" name="bell"></i-bs>diff --git a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.scss b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.scssindex 2332e710d..e1be70b97 100644--- a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.scss+++ b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.scss@@ -11,11 +11,47 @@display: none;}+.notification-count {+ top: -.2rem;+ right: -.2rem;+ min-width: 1.15rem;+ height: 1.15rem;+ padding: .18rem .32rem;+ font-size: .68rem;+ line-height: 1;+}++.nav-item > .btn {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ min-width: 2.5rem;+ min-height: 2.5rem;+ padding: .45rem .55rem;+ border-radius: .6rem;++ &:hover,+ &:focus-visible {+ background-color: rgba(0, 0, 0, .14);+ }+}+.dropdown-item {white-space: initial;}@media screen and (max-width: 400px) {+ .nav-item {+ margin-right: 0 !important;+ margin-left: 0 !important;+ }++ .nav-item > .btn {+ min-width: 2.25rem;+ padding-right: .4rem;+ padding-left: .4rem;+ }+:host ::ng-deep .dropdown-menu-end {right: -3rem;}diff --git a/src-ui/src/app/components/common/page-header/page-header.component.scss b/src-ui/src/app/components/common/page-header/page-header.component.scssindex d8d3311bb..7c3a3a399 100644--- a/src-ui/src/app/components/common/page-header/page-header.component.scss+++ b/src-ui/src/app/components/common/page-header/page-header.component.scss@@ -7,6 +7,15 @@ h3 {}}+:host {+ display: block;+ margin-bottom: .35rem;+}++h3 > .h6 {+ color: var(--bs-secondary-color);+}+@media (min-width: 1200px) {h3 {min-height: 2.8rem;diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.htmlindex 7008dc27a..b32ed1165 100644--- a/src-ui/src/app/components/dashboard/dashboard.component.html+++ b/src-ui/src/app/components/dashboard/dashboard.component.html@@ -1,9 +1,7 @@-<pngx-page-header title="Dashboard" [subTitle]="subtitle" i18n-title tourAnchor="tour.dashboard">- <pngx-logo extra_classes="d-none d-md-block mt-n2" height="3rem"></pngx-logo>-</pngx-page-header>+<pngx-page-header title="Dashboard" [subTitle]="subtitle" i18n-title tourAnchor="tour.dashboard"></pngx-page-header>-<div class="row">- <div class="col-12 col-lg-8 col-xl-9 mb-4">+<div class="row dashboard-grid g-4 pb-0">+ <div class="col-12 col-lg-8 col-xl-9 mb-4 dashboard-main"><div class="row row-cols-1 g-4"cdkDropList[cdkDropListDisabled]="settingsService.globalDropzoneActive()"@@ -58,7 +56,7 @@</ng-container></div></div>- <div class="col-12 col-lg-4 col-xl-3 col-sidebar">+ <div class="col-12 col-lg-4 col-xl-3 col-sidebar dashboard-aside"><div class="row row-cols-1 g-4 mb-4 sticky-lg-top z-0"><pngx-upload-file-widget></pngx-upload-file-widget><pngx-statistics-widget *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.UISettings }"></pngx-statistics-widget>diff --git a/src-ui/src/app/components/dashboard/dashboard.component.scss b/src-ui/src/app/components/dashboard/dashboard.component.scssindex de41297ee..7583bcc00 100644--- a/src-ui/src/app/components/dashboard/dashboard.component.scss+++ b/src-ui/src/app/components/dashboard/dashboard.component.scss@@ -1,3 +1,13 @@.col-sidebar .row {- top: 3.5rem;+ top: 4.75rem;+}++.dashboard-grid {+ padding-bottom: 2rem;+}++@media (min-width: 1200px) {+ .dashboard-main {+ padding-right: 1rem;+ }}diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.tsindex 35c5bb093..ee0902a0c 100644--- a/src-ui/src/app/components/dashboard/dashboard.component.ts+++ b/src-ui/src/app/components/dashboard/dashboard.component.ts@@ -15,7 +15,6 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service'import { SettingsService } from 'src/app/services/settings.service'import { ToastService } from 'src/app/services/toast.service'import { environment } from 'src/environments/environment'-import { LogoComponent } from '../common/logo/logo.component'import { PageHeaderComponent } from '../common/page-header/page-header.component'import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'import { SavedViewWidgetComponent } from './widgets/saved-view-widget/saved-view-widget.component'@@ -28,7 +27,6 @@ import { WelcomeWidgetComponent } from './widgets/welcome-widget/welcome-widget.templateUrl: './dashboard.component.html',styleUrls: ['./dashboard.component.scss'],imports: [- LogoComponent,PageHeaderComponent,SavedViewWidgetComponent,StatisticsWidgetComponent,diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.scssindex bb2bc5b4f..832d5cbb4 100644--- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.scss+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.scss@@ -8,3 +8,14 @@width: 0.6rem;}}++.list-group {+ --bs-list-group-border-color: color-mix(in srgb, var(--bs-border-color) 58%, transparent);+ --bs-list-group-bg: transparent;+ border-radius: .6rem;+ overflow: hidden;+}++.list-group-item {+ padding: .7rem .8rem;+}diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scssindex f6d3aa6d4..553719077 100644--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss@@ -4,6 +4,16 @@.btn-outline-dark {--bs-btn-border-color: var(--bs-border-color-translucent);+ border-style: dashed;+ border-width: 1px;+ min-height: 5.25rem;+ background: color-mix(in srgb, var(--bs-primary) 4%, var(--bs-light)) !important;++ &:hover,+ &:focus {+ border-color: var(--bs-primary);+ background: color-mix(in srgb, var(--bs-primary) 9%, var(--bs-light)) !important;+ }}.smaller {diff --git a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.htmlindex 85e811caf..17f0e5d07 100644--- a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html+++ b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html@@ -1,5 +1,5 @@@if (!cardless()) {- <div class="card shadow-sm bg-light fade" [class.show]="show()" cdkDrag [cdkDragDisabled]="!draggable()" cdkDragPreviewContainer="parent">+ <div class="card bg-light fade" [class.show]="show()" cdkDrag [cdkDragDisabled]="!draggable()" cdkDragPreviewContainer="parent"><div class="card-header"><div class="d-flex justify-content-between align-items-center"><div class="d-flex align-items-center">diff --git a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.scss b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.scssindex 8fa4881d6..a00cc60c1 100644--- a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.scss+++ b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.scss@@ -2,6 +2,20 @@ i-bs {cursor: move;}+.card {+ overflow: hidden;+ border-color: color-mix(in srgb, var(--bs-border-color) 68%, transparent);++ .card-header {+ padding: .9rem 1rem;+ border-bottom-color: color-mix(in srgb, var(--bs-border-color) 55%, transparent);+ }++ .card-body {+ padding: 1rem;+ }+}+.fade.show {animation: pngx-entry-fade 160ms ease-out;}diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scssindex a5ea35ce4..9c6be4580 100644--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss@@ -1,5 +1,5 @@.dropdown-toggle-split {- --bs-border-radius: .25rem;+ --bs-border-radius: .45rem;}.dropdown-menu{diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.htmlindex 36cdcc516..fdd8a6135 100644--- a/src-ui/src/app/components/document-list/document-list.component.html+++ b/src-ui/src/app/components/document-list/document-list.component.html@@ -157,7 +157,7 @@</div></ng-template>- <div tourAnchor="tour.documents">+ <div class="mt-3 mb-n2" tourAnchor="tour.documents"><ng-container *ngTemplateOutlet="pagination"></ng-container></div>diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scssindex 21eeb4232..44545aa80 100644--- a/src-ui/src/app/components/document-list/document-list.component.scss+++ b/src-ui/src/app/components/document-list/document-list.component.scss@@ -56,11 +56,11 @@ $paperless-card-breakpoints: (.sticky-top {z-index: 990; // below main navbar- top: calc(7rem - 2px); // height of navbar + search row (mobile)+ top: calc(7.5rem - 2px); // height of navbar + search row (mobile)transition: top 0.2s ease;@media (min-width: 580px) {- top: 3.5rem; // height of navbar+ top: 4.5em; // height of navbar}}@@ -73,7 +73,7 @@ $paperless-card-breakpoints: (@media (max-width: 579.98px) {:host-context(main.mobile-search-hidden) .sticky-top {- top: calc(3.5rem - 2px); // height of navbar only when search is hidden+ top: calc(4rem - 2px); // height of navbar only when search is hidden}}diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.html b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.htmlindex b8b609fde..316cb4008 100644--- a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.html+++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.html@@ -1,7 +1,7 @@<div class="row mb-3"><div class="col mb-2 mb-xl-0"><div class="form-inline d-flex align-items-center">- <label class="text-muted me-2 mb-0" for="managementNameFilter" i18n>Filter by:</label>+ <label class="me-2 mb-0" for="managementNameFilter" i18n>Filter by:</label><input id="managementNameFilter" class="form-control form-control-sm flex-fill w-auto" type="text" autofocus [(ngModel)]="nameFilter" (keyup)="onNameFilterKeyUp($event)" placeholder="Name" i18n-placeholder></div></div>@@ -9,7 +9,7 @@<div class="col-auto mb-2 mb-xl-0"><div class="form-inline d-flex align-items-center"><div class="input-group input-group-sm w-auto d-none d-md-flex">- <label class="input-group-text border-0" for="managementPageSize" i18n>Show:</label>+ <label class="input-group-text bg-transparent border-0" for="managementPageSize" i18n>Show:</label></div><div class="input-group input-group-sm w-auto me-3"><select id="managementPageSize" class="form-select form-select-sm small" [(ngModel)]="pageSize">diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scssindex 654073c91..20da24abc 100644--- a/src-ui/src/styles.scss+++ b/src-ui/src/styles.scss@@ -1,7 +1,7 @@@use "sass:meta";// bs variables$grid-gutter-width: 1.5rem;-$border-radius: .375rem;+$border-radius: .425rem;$btn-border-width: var(--bs-border-width);$form-file-button-bg: var(--bs-body-bg);@@ -68,15 +68,44 @@ body {--pngx-body-font-size: 0.875rem;font-size: var(--pngx-body-font-size);height: 100vh;+ letter-spacing: -0.005em;}* {transition: background-color 0.3s ease, border-color 0.3s ease;}+.card,+.dropdown-menu,+.modal-content,+.popover {+ --bs-card-border-color: color-mix(in srgb, var(--bs-border-color) 72%, transparent);+ border-radius: .55rem;+}++.card {+ box-shadow: 0 1px 2px rgba(0, 0, 0, .04), 0 8px 24px rgba(0, 0, 0, .035);+}++.btn {+ --bs-btn-border-radius: .425rem;+ --bs-border-radius-sm: .425rem;+ font-weight: 500;+}++.form-control,+.form-select,+.input-group-text {+ border-radius: .425rem;+}++.pagination, .input-group {+ --bs-border-radius-sm: .425rem;+}+@media(min-width: 768px) {.col-slim {- padding-left: calc(50px + $grid-gutter-width) !important;+ padding-left: calc(56px + $grid-gutter-width) !important;}}@@ -660,6 +689,10 @@ table.table {--bs-toast-max-width: var(--pngx-toast-max-width);}+.alert {+ --bs-border-radius: .425rem;+}+.alert-primary {--bs-alert-color: var(--bs-primary);--bs-alert-bg: var(--pngx-primary-faded);@@ -791,6 +824,8 @@ code {--bs-accordion-bg: var(--bs-light);--bs-accordion-active-color: var(--bs-primary);--bs-accordion-active-bg: var(--pngx-bg-alt);+ --bs-border-radius: .425rem;+ --bs-accordion-inner-border-radius: calc(.425rem - 1px);}.accordion-button::after {diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scssindex c615707ed..ba8e8e281 100644--- a/src-ui/src/theme.scss+++ b/src-ui/src/theme.scss@@ -20,7 +20,7 @@--pngx-primary-darken-27: hsl(var(--pngx-primary), calc(var(--pngx-primary-lightness) - 27%));--pngx-success-darken-10: hsl(152, 69%, 11%); // based on success #198754--pngx-bg-alt: #fff;- --pngx-bg-darker: var(--bs-gray-100);+ --pngx-bg-darker: #f4f6f5;--pngx-bg-alt2: var(--bs-gray-200); // #e9ecef--pngx-bg-disabled: #f7f7f7;--pngx-card-hover-border: var(--bs-tertiary-color);@@ -91,7 +91,7 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='h--pngx-body-color-accent: #{$text-color-dark-bg-accent};--pngx-bg-alt: #242529;--pngx-bg-alt2: #232323;- --pngx-bg-darker: #101216;+ --pngx-bg-darker: #121315;--pngx-bg-disabled: var(--pngx-bg-alt);--pngx-card-hover-border: var(--bs-border-color);--pngx-focus-alpha: 0.6;@@ -107,7 +107,7 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='h--bs-light-rgb: 28, 28, 31;--bs-info: var(--pngx-bg-alt);--bs-info-rgb: 36, 36, 39;- --bs-border-color: #47494f;+ --bs-border-color: #34373d;--bs-tertiary-bg: var(--pngx-bg-darker);--bs-dark-border-subtle: var(--pngx-bg-darker);--bs-border-color-translucent: rgba(0, 0, 0, .175); // override bs