Skip to content

Commit da99ba1

Browse files
authored
Merge pull request jonaswinkler#1305 from paperless-ngx/fix/1299+1300
Fix: missing tooltip translation & filter editor wrapping
2 parents 0d23b33 + 9a66bd3 commit da99ba1

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

src-ui/messages.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,10 @@
511511
</trans-unit>
512512
<trans-unit id="5612903193691847840" datatype="html">
513513
<source>Suggest an idea</source>
514+
<context-group purpose="location">
515+
<context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
516+
<context context-type="linenumber">192</context>
517+
</context-group>
514518
<context-group purpose="location">
515519
<context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
516520
<context context-type="linenumber">196</context>

src-ui/src/app/components/app-frame/app-frame.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ <h6 class="sidebar-heading px-3 mt-auto pt-4 mb-1 text-muted">
189189
<use xlink:href="assets/bootstrap-icons.svg#github" />
190190
</svg>&nbsp;<ng-container i18n>GitHub</ng-container>
191191
</a>
192-
<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">
192+
<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>
193193
<svg xmlns="http://www.w3.org/2000/svg" width="1.1em" height="1.1em" fill="currentColor" class="me-1" viewBox="0 0 16 16">
194194
<use xlink:href="assets/bootstrap-icons.svg#lightbulb" />
195195
</svg>

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="row flex-wrap">
2-
<div class="col mb-2 mb-xl-0">
2+
<div class="col mb-2 mb-xxl-0">
33
<div class="form-inline d-flex align-items-center">
44
<div class="input-group input-group-sm flex-fill w-auto flex-nowrap">
55
<div ngbDropdown>
@@ -15,10 +15,10 @@
1515
</div>
1616
</div>
1717
</div>
18-
<div class="w-100 d-xl-none"></div>
18+
<div class="w-100 d-xxl-none"></div>
1919
<div class="col col-xl-auto">
2020
<div class="d-flex flex-wrap">
21-
<div class="d-flex flex-wrap mb-2 mb-lg-0">
21+
<div class="d-flex flex-wrap mb-2 mb-xxl-0">
2222
<app-filterable-dropdown class="flex-fill" title="Tags" icon="tag-fill" i18n-title
2323
filterPlaceholder="Filter tags" i18n-filterPlaceholder
2424
[items]="tags"
@@ -63,7 +63,7 @@
6363
</div>
6464
</div>
6565
</div>
66-
<div class="w-100 d-xl-none"></div>
66+
<div class="w-100 d-xxl-none"></div>
6767
<div class="col col-xl-auto ps-0">
6868
<button class="btn btn-link btn-sm px-0" [disabled]="!rulesModified" (click)="resetSelected()">
6969
<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">

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@
1717
.d-flex.flex-wrap {
1818
column-gap: 0.7rem;
1919
}
20+
21+
input[type="text"] {
22+
min-width: 120px;
23+
}

0 commit comments

Comments
 (0)