Merge remote-tracking branch 'upstream/master' into fix-prefs-extp-se…

…t-browse

CHANGELOG.md

@@ -117,6 +117,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where an NullPointer exception was thrown when a referenced entry in an Open/Libre Office document was no longer present in the library. Now an error message with the reference marker of the missing entry is shown. [#4932](https://github.com/JabRef/jabref/issues/4932)
 - We fixed an issue where a database exception related to a missing timezone was too big. [#4827](https://github.com/JabRef/jabref/issues/4827)
 - We fixed an issue where the command line help text had several errors, and arguments and descriptions have been rewritten to simplify and detail them better. [#4932](https://github.com/JabRef/jabref/issues/2016)
+- We fixed an issue where the same menu for changing entry type had two different sizes and weights. [#4977](https://github.com/JabRef/jabref/issues/4977)
 
 
 ### Removed

build.gradle

@@ -94,7 +94,7 @@ dependencies {
     compile 'org.apache.pdfbox:fontbox:2.0.15'
     compile 'org.apache.pdfbox:xmpbox:2.0.15'
 
-    compile group: 'org.apache.tika', name: 'tika-core', version: '1.20'
+    compile group: 'org.apache.tika', name: 'tika-core', version: '1.21'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
     compile 'org.bouncycastle:bcprov-jdk15on:1.61'

src/main/java/org/jabref/gui/entryeditor/EntryEditor.css

@@ -31,6 +31,16 @@
     -fx-background-color: -jr-icon-background-active;
 }
 
+#typeLabel .context-menu {
+    -fx-font-size: 0.92em;
+    -fx-font-weight: normal;
+}
+
+#typeLabel .tooltip {
+    -fx-font-size: 1em;
+    -fx-font-weight: normal;
+}
+
 .icon-button.narrow {
     -fx-padding: 0.1em;
 }