Merge branch 'release/1.2.2'

biddster · Sep 17, 2019 · 393513d · 393513d
2 parents 427b024 + 9f47255
commit 393513d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,10 +16,10 @@ plugins {
 
 mainClassName = 'uk.co.biddell.diceware.ui.DiceWareApp'
 group = 'uk.co.biddell'
-version = '1.2.1'
+version = '1.2.2'
 description = """DiceWare"""
-//sourceCompatibility = 1.6
-//targetCompatibility = 1.6
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 repositories {
     jcenter()

diff --git a/src/main/java/uk/co/biddell/diceware/dictionaries/DiceWords.java b/src/main/java/uk/co/biddell/diceware/dictionaries/DiceWords.java
@@ -48,7 +48,7 @@ public int getLength() {
 
     public String toHTMLString() {
         final StringBuilder html = new StringBuilder((words.size() + 1) * 32);
-        html.append("<html><body style=\"background-color: #d6d9df; font-weight: bold;font-size: 11px;\">");
+        html.append("<html><body style=\"background-color: #ffffff; font-weight: bold;font-size: 11px;padding: 8px;font-family: courier;\">");
         for (int i = 0; i < words.size(); ++i) {
             // Append the word to our formatted output in alternate colours so the dice words
             // are easily seen and hopefully remembered.

diff --git a/src/main/java/uk/co/biddell/diceware/ui/DiceWarePanel.java b/src/main/java/uk/co/biddell/diceware/ui/DiceWarePanel.java
@@ -84,7 +84,7 @@ final class DiceWarePanel extends JPanel implements ChangeListener, ActionListen
         add(separatorField, "insets:8,8,8,8 fill:HORIZONTAL anchor:WEST gridx:3 gridy:5 gridwidth:1 weightx:0.5");
         add(typeLabel, "insets:8,8,8,8 fill:NONE anchor:WEST gridx:0 gridy:6 gridwidth:1");
         final JScrollPane comp = new JScrollPane(passphrasePane);
-        comp.setViewportBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
+        comp.setViewportBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         add(comp, "insets:8,8,8,8 fill:BOTH anchor:WEST gridx:0 gridy:7 gridwidth:4 weightx:1.0 weighty:1.0");
         add(helpButton, "insets:8,8,8,8 fill:NONE anchor:WEST gridx:0 gridy:8 gridwidth:1");
         add(copyButton, "insets:8,8,8,8 fill:NONE anchor:WEST gridx:1 gridy:8 gridwidth:2");