Skip to content

A community-supported supercharged document management system: scan, index and archive all your documents

Tweak: more misc UI tweaks (#13783)

shamooncd525819d726
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.html
index e33b1e9ea..ffc3381ad 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
@@ -2,7 +2,7 @@
<button class="navbar-toggler d-md-none collapsed border-0" type="button" data-toggle="collapse"
data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"
(click)="closeMobileSearch(); toggleMenuCollapsed()">
- <span class="navbar-toggler-icon"></span>
+ <i-bs width="1.5em" height="1.5em" name="list"></i-bs>
</button>
<a class="navbar-brand d-flex align-items-center me-0 ps-md-3 py-0 order-sm-0"
[ngClass]="{ 'slim': slimSidebarEnabled, '' : !slimSidebarEnabled }"
@@ -29,9 +29,9 @@
</div>
}
</a>
- <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"
+ <div class="search-container flex-grow-1 py-2 pb-3 pb-sm-2 me-sm-auto order-3 order-sm-1"
[class.mobile-hidden]="mobileSearchHidden()">
- <div class="col-12 header-search">
+ <div class="col-12 header-search mx-auto">
<pngx-global-search></pngx-global-search>
</div>
</div>
@@ -324,7 +324,7 @@
</li>
}
<li class="nav-item mt-2" tourAnchor="tour.outro">
- <a class="px-3 py-2 text-muted small d-flex align-items-center flex-wrap text-decoration-none"
+ <a class="text-muted small d-flex align-items-center flex-wrap text-decoration-none nav-anchor"
target="_blank" rel="noopener noreferrer" href="https://docs.paperless-ngx.com" ngbPopover="Documentation"
i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
triggers="mouseenter:mouseleave" popoverClass="popover-slim">
@@ -332,7 +332,7 @@
</a>
</li>
<li class="nav-item" [class.visually-hidden]="slimSidebarEnabled">
- <div class="px-3 py-0 text-muted small d-flex align-items-center flex-wrap">
+ <div class="text-muted small d-flex align-items-center flex-wrap nav-label">
<div class="me-3">
<a class="text-muted text-decoration-none" target="_blank" rel="noopener noreferrer"
href="https://github.com/paperless-ngx/paperless-ngx" ngbPopover="GitHub" i18n-ngbPopover
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss
index 6f7319589..e45fa5d9e 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
@@ -67,6 +67,23 @@
main.mobile-search-hidden {
padding-top: 56px;
}
+
+ .navbar-toggler {
+ padding-left: calc(12px - (1.5em * 2.5 / 16));
+ }
+}
+
+.search-container {
+ padding-left: 1rem;
+ padding-right: 1rem;
+}
+
+// Below sm the search gets its own full-width row, so line it up with main's content edge
+@media (max-width: 575.98px) {
+ .search-container {
+ padding-left: 12px;
+ padding-right: 12px;
+ }
}
main {
@@ -97,7 +114,7 @@ main {
li.nav-item span.badge {
display: inline-block;
- margin-right: 2px;
+ margin-right: -4px;
}
}
@@ -141,18 +158,11 @@ main {
}
}
- .sidebar.slim {
- li.nav-item span.badge {
- display: inline-block;
- margin-right: 2px;
- }
- }
-
.sidebar-slim-toggler {
display: block;
position: fixed;
left: calc(var(--pngx-sidebar-width) - 12px);
- top: 72px;
+ bottom: 16px;
z-index: 996;
--bs-btn-padding-x: 0.35rem;
--bs-btn-padding-y: 0.125rem;
@@ -227,6 +237,10 @@ main {
}
}
+.sidebar .nav-anchor, .sidebar .nav-label {
+ padding: .25rem .7rem;
+}
+
.attributes-row {
border-radius: .55rem;
margin: .1rem 0;
@@ -444,7 +458,7 @@ main {
.header-search {
width: 100%;
- max-width: 44rem;
+ max-width: 55rem;
}
@media screen and (max-width: 575.98px) {
@@ -458,6 +472,7 @@ main {
.navbar-toggler {
grid-area: toggler;
+ color: var(--pngx-primary-text-contrast);
text-align: left;
}
diff --git a/src-ui/src/app/components/common/page-header/page-header.component.html b/src-ui/src/app/components/common/page-header/page-header.component.html
index 05df7dcd5..be0327e50 100644
--- a/src-ui/src/app/components/common/page-header/page-header.component.html
+++ b/src-ui/src/app/components/common/page-header/page-header.component.html
@@ -1,6 +1,6 @@
-<div class="row pt-3 pb-3 pb-md-2 align-items-center">
+<div class="row pt-3 pb-2 align-items-center">
<div class="col-md text-truncate">
- <h3 class="d-flex align-items-center mb-1" style="line-height: 1.4">
+ <h3 class="d-flex align-items-center mb-2 mb-md-1" style="line-height: 1.4">
<span class="text-truncate">{{title()}}</span>
@if (id()) {
<span class="badge bg-primary text-primary-text-contrast ms-3 small fs-normal cursor-pointer" (click)="copyID()">
@@ -12,10 +12,10 @@
</span>
}
@if (subTitle()) {
- <span class="h6 mb-0 mt-1 d-block d-md-inline fw-normal ms-md-3 text-truncate" style="line-height: 1.4">{{subTitle()}}</span>
+ <span class="page-subtitle h6 mb-0 mt-1 fw-normal ms-md-3 text-truncate" style="line-height: 1.4">{{subTitle()}}</span>
}
@if (info()) {
- <button class="btn btn-sm btn-link text-muted p-0 p-md-2" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">
+ <button class="btn btn-sm btn-link text-muted p-0 ms-2 p-md-2 ms-md-0" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">
<i-bs name="question-circle"></i-bs>
</button>
<ng-template #infoPopover>
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.scss
index 7c3a3a399..f897d16d5 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
@@ -1,5 +1,6 @@
h3 {
min-height: calc(1.325rem + 0.9vw);
+ flex-wrap: wrap;
.badge {
font-size: 0.65rem;
@@ -7,6 +8,16 @@ h3 {
}
}
+// Drop the subtitle onto its own and shrink it
+@media (max-width: 767.98px) {
+ h3 > .page-subtitle {
+ flex: 0 0 100%;
+ margin-top: 0 !important;
+ font-size: .7rem;
+ line-height: 1.3 !important;
+ }
+}
+
:host {
display: block;
margin-bottom: .35rem;
diff --git a/src-ui/src/main.ts b/src-ui/src/main.ts
index f4fb079cd..174d0f5e0 100644
--- a/src-ui/src/main.ts
+++ b/src-ui/src/main.ts
@@ -118,6 +118,7 @@ import {
journalBookmarkFill,
journals,
link,
+ list,
listNested,
listTask,
listUl,
@@ -365,6 +366,7 @@ const icons = {
journalBookmarkFill,
journals,
link,
+ list,
listNested,
listTask,
listUl,
diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index 20da24abc..79c171971 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -536,6 +536,7 @@ ul.pagination {
}
.nav-underline {
+ gap: calc(0.5 * var(--bs-nav-underline-gap)) var(--bs-nav-underline-gap);
.nav-link {
&.active, &:hover, &:focus {
color: var(--bs-primary);