Skip to content

Commit 087cc95

Browse files
committed
Merge remote-tracking branch 'upstream/main' into globalSearchBar
* upstream/main: fix: Improper icon sizing with respect to font size (#13841) Ensure latest JDK veriant (#13843)
2 parents 511549f + 9b13538 commit 087cc95

File tree

6 files changed

+31
-4
lines changed

6 files changed

+31
-4
lines changed

.github/workflows/binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
with:
198198
java-version: '24'
199199
distribution: 'corretto'
200-
java-package: 'jdk'
200+
check-latest: true
201201
- name: Setup Gradle
202202
uses: gradle/actions/setup-gradle@v4
203203
- name: Generate JBang cache key

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
with:
9595
java-version: '24'
9696
distribution: 'corretto'
97-
java-package: 'jdk'
97+
check-latest: true
9898
- name: Setup Gradle
9999
uses: gradle/actions/setup-gradle@v4
100100
- name: Generate JBang cache key

.github/workflows/run-openrewrite.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
with:
3636
java-version: 24
3737
distribution: 'corretto'
38+
check-latest: true
3839
- name: Setup Gradle
3940
uses: gradle/actions/setup-gradle@v4
4041
- name: Generate JBang cache key

.github/workflows/tests-code-fetchers.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
with:
5858
java-version: 24
5959
distribution: 'corretto'
60+
check-latest: true
6061
- name: Setup Gradle
6162
uses: gradle/actions/setup-gradle@v4
6263
- name: Run fetcher tests

.github/workflows/tests-code.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
with:
5353
java-version: 24
5454
distribution: 'corretto'
55+
check-latest: true
5556
- name: Run checkstyle reporter
5657
uses: dbelyaev/action-checkstyle@master
5758
with:
@@ -91,6 +92,7 @@ jobs:
9192
with:
9293
java-version: 24
9394
distribution: 'corretto'
95+
check-latest: true
9496
- name: Setup Gradle
9597
uses: gradle/actions/setup-gradle@v4
9698
- name: Generate JBang cache key
@@ -125,6 +127,7 @@ jobs:
125127
with:
126128
java-version: 24
127129
distribution: 'corretto'
130+
check-latest: true
128131
- name: Setup Gradle
129132
uses: gradle/actions/setup-gradle@v4
130133
- name: Generate JBang cache key
@@ -242,6 +245,7 @@ jobs:
242245
with:
243246
java-version: 24
244247
distribution: 'corretto'
248+
check-latest: true
245249
- name: Setup Gradle
246250
uses: gradle/actions/setup-gradle@v4
247251
- name: Generate JBang cache key
@@ -277,6 +281,7 @@ jobs:
277281
with:
278282
java-version: 24
279283
distribution: 'corretto'
284+
check-latest: true
280285
- name: Generate JBang cache key
281286
id: cache-key
282287
shell: bash
@@ -325,6 +330,7 @@ jobs:
325330
with:
326331
java-version: 24
327332
distribution: 'corretto'
333+
check-latest: true
328334
- name: Setup Gradle
329335
uses: gradle/actions/setup-gradle@v4
330336
- name: Generate JBang cache key
@@ -374,6 +380,7 @@ jobs:
374380
with:
375381
java-version: 24
376382
distribution: 'corretto'
383+
check-latest: true
377384
- name: Setup Gradle
378385
uses: gradle/actions/setup-gradle@v4
379386
- name: Generate JBang cache key
@@ -422,6 +429,7 @@ jobs:
422429
with:
423430
java-version: 24
424431
distribution: 'corretto'
432+
check-latest: true
425433
- name: Generate JBang cache key
426434
id: cache-key
427435
shell: bash
@@ -462,6 +470,7 @@ jobs:
462470
with:
463471
java-version: 24
464472
distribution: 'corretto'
473+
check-latest: true
465474
- name: Generate JBang cache key
466475
id: cache-key
467476
shell: bash
@@ -538,6 +547,7 @@ jobs:
538547
with:
539548
java-version: 24
540549
distribution: 'corretto'
550+
check-latest: true
541551
- name: Setup Gradle
542552
uses: gradle/actions/setup-gradle@v4
543553
- name: Generate JBang cache key
@@ -583,6 +593,7 @@ jobs:
583593
with:
584594
java-version: 24
585595
distribution: 'corretto'
596+
check-latest: true
586597
- name: Setup Gradle
587598
uses: gradle/actions/setup-gradle@v4
588599
- run: ./gradlew traceRequirements

jabgui/src/main/resources/org/jabref/gui/Base.css

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,14 +1097,28 @@ TextFlow > .tooltip-text-monospaced {
10971097
-fx-border-width: 0;
10981098
}
10991099

1100+
.mainToolbar .icon-button {
1101+
-fx-padding: 0.5em;
1102+
}
1103+
1104+
/*
1105+
* -fx-icon-size is intentionally omitted to prevent a rendering loop. The library sets font size
1106+
* based on the computed icon size, which is itself relative to the font size.
1107+
*/
11001108
.mainToolbar .glyph-icon,
11011109
.mainToolbar .ikonli-font-icon {
1102-
-fx-font-size: 1.7em;
1110+
/* `!important` is override library's default font size */
1111+
-fx-font-size: 1.7em!important;
11031112
-fx-fill: -jr-theme-text;
11041113
-fx-text-fill: -jr-theme-text;
11051114
-fx-icon-color: -jr-theme-text;
11061115
}
11071116

1117+
.mainToolbar .progress-indicator {
1118+
-fx-min-width: 2.8em;
1119+
-fx-max-width: 2.8em;
1120+
}
1121+
11081122
.search-field {
11091123
-fx-background-color: -jr-search-background;
11101124
-fx-border-width: 1;
@@ -3207,7 +3221,7 @@ journalInfo .grid-cell-b {
32073221
-fx-hgap: 1.5em;
32083222
-fx-vgap: 0.8em;
32093223
}
3210-
3224+
32113225
/* Automatic Field Editor */
32123226
.edit-field-content-pane {
32133227
-fx-padding: 0em 1em;

0 commit comments

Comments
 (0)