From 7752d83781fa24549b09359ff7ffbfeb232f3add Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:24:37 -0700
Subject: [PATCH 1/2] Fix "suggest an idea" not using translation
Closes #1300
---
src-ui/messages.xlf | 4 ++++
src-ui/src/app/components/app-frame/app-frame.component.html | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 331d9bf5d..08e08608d 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -511,6 +511,10 @@
</trans-unit>
<trans-unit id="5612903193691847840" datatype="html">
<source>Suggest an idea</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+ <context context-type="linenumber">192</context>
+ </context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
<context context-type="linenumber">196</context>
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 a745f9de4..4db6825b3 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
@@ -189,7 +189,7 @@
<use xlink:href="assets/bootstrap-icons.svg#github" />
</svg> <ng-container i18n>GitHub</ng-container>
</a>
- <a class="nav-link-additional small text-muted ms-3" target="_blank" rel="noopener noreferrer" href="https://github.com/paperless-ngx/paperless-ngx/discussions/categories/feature-requests" title="Suggest an idea">
+ <a class="nav-link-additional small text-muted ms-3" target="_blank" rel="noopener noreferrer" href="https://github.com/paperless-ngx/paperless-ngx/discussions/categories/feature-requests" title="Suggest an idea" i18n-title>
<svg xmlns="http://www.w3.org/2000/svg" width="1.1em" height="1.1em" fill="currentColor" class="me-1" viewBox="0 0 16 16">
<use xlink:href="assets/bootstrap-icons.svg#lightbulb" />
</svg>
From 9a66bd3c3432f87697f3a2a37289f5c4d5924360 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:43:49 -0700
Subject: [PATCH 2/2] Better filter editor wrapping across display sizes
Closes #1299
---
.../filter-editor/filter-editor.component.html | 8 ++++----
.../filter-editor/filter-editor.component.scss | 4 ++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 6709cfd0e..6c9d9f8c7 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -1,5 +1,5 @@
<div class="row flex-wrap">
- <div class="col mb-2 mb-xl-0">
+ <div class="col mb-2 mb-xxl-0">
<div class="form-inline d-flex align-items-center">
<div class="input-group input-group-sm flex-fill w-auto flex-nowrap">
<div ngbDropdown>
@@ -15,10 +15,10 @@
</div>
</div>
</div>
- <div class="w-100 d-xl-none"></div>
+ <div class="w-100 d-xxl-none"></div>
<div class="col col-xl-auto">
<div class="d-flex flex-wrap">
- <div class="d-flex flex-wrap mb-2 mb-lg-0">
+ <div class="d-flex flex-wrap mb-2 mb-xxl-0">
<app-filterable-dropdown class="flex-fill" title="Tags" icon="tag-fill" i18n-title
filterPlaceholder="Filter tags" i18n-filterPlaceholder
[items]="tags"
@@ -63,7 +63,7 @@
</div>
</div>
</div>
- <div class="w-100 d-xl-none"></div>
+ <div class="w-100 d-xxl-none"></div>
<div class="col col-xl-auto ps-0">
<button class="btn btn-link btn-sm px-0" [disabled]="!rulesModified" (click)="resetSelected()">
<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x me-1" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss
index 6bfe1448d..0e8796b3d 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss
@@ -17,3 +17,7 @@
.d-flex.flex-wrap {
column-gap: 0.7rem;
}
+
+input[type="text"] {
+ min-width: 120px;
+}