Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into update_jdk
Browse files Browse the repository at this point in the history
* upstream/main:
  Bump slf4j-api from 2.0.4 to 2.0.5 (#9428)
  Bump archunit-junit5-api from 1.0.0 to 1.0.1 (#9429)
  Bump jackson-datatype-jsr310 from 2.14.0 to 2.14.1 (#9430)
  Bump lucene-highlighter from 9.4.1 to 9.4.2 (#9431)
  Fix weird checkbox styling (#9425)
  New translations JabRef_en.properties (Italian) (#9424)
  New translations JabRef_en.properties (German) (#9418)
  • Loading branch information
Siedlerchr committed Dec 5, 2022
2 parents 23bdf9b + 14058a6 commit 77c3378
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ dependencies {
implementation 'org.apache.lucene:lucene-queryparser:9.4.2'
implementation 'org.apache.lucene:lucene-queries:9.4.1'
implementation 'org.apache.lucene:lucene-analysis-common:9.4.2'
implementation 'org.apache.lucene:lucene-highlighter:9.4.1'
implementation 'org.apache.lucene:lucene-highlighter:9.4.2'

implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.9.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
Expand All @@ -144,7 +144,7 @@ dependencies {
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.3.0.202209071007-r'

implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.14.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.14.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.14.1'

implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.7'

Expand Down Expand Up @@ -178,7 +178,7 @@ dependencies {
implementation 'org.jsoup:jsoup:1.15.3'
implementation 'com.konghq:unirest-java:3.14.0'

implementation 'org.slf4j:slf4j-api:2.0.4'
implementation 'org.slf4j:slf4j-api:2.0.5'
implementation "org.tinylog:tinylog-api:2.5.0"
implementation "org.tinylog:slf4j-tinylog:2.5.0"
implementation "org.tinylog:tinylog-impl:2.5.0"
Expand Down Expand Up @@ -212,7 +212,7 @@ dependencies {
testImplementation 'org.xmlunit:xmlunit-core:2.9.0'
testImplementation 'org.xmlunit:xmlunit-matchers:2.9.0'
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:1.0.1'
testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.0.0'
testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.0.1'
testImplementation "org.testfx:testfx-core:4.0.16-alpha"
testImplementation "org.testfx:testfx-junit5:4.0.16-alpha"
testImplementation "org.hamcrest:hamcrest-library:2.2"
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/org/jabref/gui/Base.css
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,17 @@ TextFlow > .tooltip-text-monospaced {
-fx-font-family: monospace;
}


.radio-button > .radio,
.check-box > .box {
-fx-background-color: transparent;
-fx-background-insets: 0;
-fx-background-radius: 0;
-fx-text-fill: -fx-text-base-color;
}

.button,
.toggle-button,
.radio-button > .radio,
.check-box > .box,
.menu-button,
.choice-box,
.combo-box-base,
Expand All @@ -343,6 +350,7 @@ TextFlow > .tooltip-text-monospaced {
-fx-text-fill: -fx-text-base-color;
}


.button {
-fx-background-color: transparent;
-fx-border-color: -fx-outer-border; /* rgba(0, 0, 0, 0.23); */
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/l10n/JabRef_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,11 @@ Invalid\ style\ selected=Ungültiger Stil ausgewählt
Reload=Neu laden

Capitalize=Großschreiben
Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Schreibt alle Wörter groß, wandelt jedoch Artikel, Präpositionen und Konjunktionen in Kleinbuchstaben um.
Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Schreibt das erste Wort groß, schreibt alle anderen Wörter klein.
changes\ all\ letters\ to\ lower\ case.=ändert alle Buchstaben in Kleinbuchstaben.
CHANGES\ ALL\ LETTER\ TO\ UPPER\ CASE.=ÄNDERT ALLE BUCHSTABEN IN GROSSBUCHSTABEN.
Changes\ The\ First\ Letter\ Of\ All\ Words\ To\ Capital\ Case\ And\ The\ Remaining\ Letters\ To\ Lower\ Case.=Schreibt den ersten Buchstaben eines jeden Wortes groß und schreibt alle anderen Wörter klein.
Cleans\ up\ LaTeX\ code.=Räumt LaTeX-Code auf.
Converts\ HTML\ code\ to\ LaTeX\ code.=Konvertiere HTML-Code in LaTeX-Code.
HTML\ to\ Unicode=HTML zu Unicode
Expand Down Expand Up @@ -1489,6 +1493,7 @@ Sentence\ case=Groß-/Kleinschreibung von Sätzen
Shortens\ lists\ of\ persons\ if\ there\ are\ more\ than\ 2\ persons\ to\ "et\ al.".=Verkleinert die Liste von Personen zu "et al" bei mehr als 2 Personen.
Unicode\ to\ LaTeX=Unicode zu LaTeX
Units\ to\ LaTeX=Einheiten zu LaTeX
UPPER\ CASE=GROßSCHREIBUNG
Does\ nothing.=Macht nichts.
Identity=Identität
Clears\ the\ field\ completely.=Löscht das Feld komplett
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/l10n/JabRef_it.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1492,6 +1492,7 @@ Shorten\ DOI=Accorcia il DOI
Shortens\ DOI\ to\ more\ human\ readable\ form.=Abbrevia il DOI in forma più leggibile.
Sentence\ case=Frase maiuscola/minuscola
Shortens\ lists\ of\ persons\ if\ there\ are\ more\ than\ 2\ persons\ to\ "et\ al.".=Se ci sono più di due persone in una lista, abbrevia in "et al.".
Title\ Case=Iniziali in maiuscolo
Unicode\ to\ LaTeX=Da Unicode a LaTeX
Units\ to\ LaTeX=Da unità a LaTeX
UPPER\ CASE=MAIUSCOLO
Expand Down

0 comments on commit 77c3378

Please sign in to comment.