From fa0c74f06b1677fed3bd203e4836f6d9f35f542a Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Thu, 27 Aug 2020 13:11:23 +0200 Subject: [PATCH] set monospace font explicitly, add stage icons --- .../sparrowwallet/sparrow/AppController.java | 17 +++++++++++++++-- .../com/sparrowwallet/sparrow/MainApp.java | 2 ++ .../sparrow/control/AddressTreeTable.java | 4 ++-- .../sparrow/control/DeviceDialog.java | 1 + .../sparrowwallet/sparrow/control/IdLabel.java | 4 ++-- .../control/KeystorePassphraseDialog.java | 1 + .../sparrow/control/QRDisplayDialog.java | 3 ++- .../sparrow/control/QRScanDialog.java | 2 ++ .../sparrow/control/SeedDisplayDialog.java | 1 + .../sparrow/control/TextAreaDialog.java | 4 +++- .../sparrow/control/TransactionIdDialog.java | 3 ++- .../sparrow/control/WalletExportDialog.java | 4 ++-- .../sparrow/control/WalletImportDialog.java | 2 ++ .../sparrow/control/WalletNameDialog.java | 1 + .../sparrow/control/WalletPasswordDialog.java | 1 + .../sparrow/control/WelcomeDialog.java | 1 + .../keystoreimport/KeystoreImportDialog.java | 1 + .../sparrow/preferences/PreferencesDialog.java | 1 + .../com/sparrowwallet/sparrow/app.css | 2 +- .../com/sparrowwallet/sparrow/app.fxml | 3 +-- .../com/sparrowwallet/sparrow/general.css | 3 ++- .../com/sparrowwallet/sparrow/script.css | 5 +++-- .../sparrow/transaction/input.fxml | 8 ++++---- .../sparrow/transaction/inputs.css | 5 +++-- .../sparrow/transaction/output.fxml | 2 +- .../sparrow/transaction/outputs.css | 5 +++-- .../sparrow/transaction/transaction.css | 3 ++- .../sparrowwallet/sparrow/wallet/keystore.css | 3 ++- .../sparrowwallet/sparrow/wallet/keystore.fxml | 2 +- .../sparrowwallet/sparrow/wallet/receive.fxml | 4 ++-- .../com/sparrowwallet/sparrow/wallet/send.css | 3 ++- .../com/sparrowwallet/sparrow/wallet/send.fxml | 6 +++--- .../sparrowwallet/sparrow/wallet/settings.css | 3 ++- .../sparrowwallet/sparrow/wallet/wallet.css | 6 ++++-- src/main/resources/font/RobotoMono-Regular.ttf | Bin 0 -> 86908 bytes 35 files changed, 78 insertions(+), 38 deletions(-) create mode 100644 src/main/resources/font/RobotoMono-Regular.ttf diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java index d26bd9a2..267763ea 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -46,6 +46,7 @@ import javafx.scene.image.ImageView; import javafx.scene.input.Dragboard; import javafx.scene.input.TransferMode; import javafx.scene.layout.StackPane; +import javafx.scene.text.Font; import javafx.stage.FileChooser; import javafx.stage.Stage; import javafx.stage.StageStyle; @@ -185,7 +186,8 @@ public class AppController implements Initializable { } }); - tabs.setTabDragPolicy(TabPane.TabDragPolicy.REORDER); + //Draggle tabs introduce unwanted movement when selecting between them + //tabs.setTabDragPolicy(TabPane.TabDragPolicy.REORDER); tabs.getTabs().addListener((ListChangeListener) c -> { if(c.next() && (c.wasAdded() || c.wasRemoved())) { boolean walletAdded = c.getAddedSubList().stream().anyMatch(tab -> ((TabData)tab.getUserData()).getType() == TabData.TabType.WALLET); @@ -365,6 +367,7 @@ public class AppController implements Initializable { Stage stage = new Stage(); stage.setTitle("About " + MainApp.APP_NAME); stage.initStyle(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.OSX ? StageStyle.UNDECORATED : StageStyle.DECORATED); + setStageIcon(stage); stage.setResizable(false); stage.setScene(new Scene(root)); controller.setStage(stage); @@ -608,12 +611,22 @@ public class AppController implements Initializable { public static void showErrorDialog(String title, String content) { Alert alert = new Alert(Alert.AlertType.ERROR); + setStageIcon(alert.getDialogPane().getScene().getWindow()); alert.setTitle(title); alert.setHeaderText(title); alert.setContentText(content); alert.showAndWait(); } + public static void setStageIcon(Window window) { + Stage stage = (Stage)window; + stage.getIcons().add(new Image(AppController.class.getResourceAsStream("/image/sparrow.png"))); + } + + public static Font getMonospaceFont() { + return Font.font("Roboto Mono", 13); + } + public void selectTab(Wallet wallet) { for(Tab tab : tabs.getTabs()) { TabData tabData = (TabData) tab.getUserData(); @@ -1158,7 +1171,7 @@ public class AppController implements Initializable { currentBlockHeight = event.getBlockHeight(); targetBlockFeeRates = event.getTargetBlockFeeRates(); String banner = event.getServerBanner(); - String status = "Connected: " + (banner == null ? "Server" : banner.split(System.lineSeparator(), 2)[0]) + " at height " + event.getBlockHeight(); + String status = "Connected: " + (banner == null ? "Server" : banner.split("\\R", 2)[0]) + " at height " + event.getBlockHeight(); EventManager.get().post(new StatusEvent(status)); } diff --git a/src/main/java/com/sparrowwallet/sparrow/MainApp.java b/src/main/java/com/sparrowwallet/sparrow/MainApp.java index ed1c79e4..26187b86 100644 --- a/src/main/java/com/sparrowwallet/sparrow/MainApp.java +++ b/src/main/java/com/sparrowwallet/sparrow/MainApp.java @@ -12,6 +12,7 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.image.Image; +import javafx.scene.text.Font; import javafx.stage.Stage; import org.controlsfx.glyphfont.GlyphFontRegistry; import org.slf4j.LoggerFactory; @@ -38,6 +39,7 @@ public class MainApp extends Application { GlyphFontRegistry.register(new FontAwesome5()); GlyphFontRegistry.register(new FontAwesome5Brands()); + Font.loadFont(AppController.class.getResourceAsStream("/font/RobotoMono-Regular.ttf"), 13); boolean createNewWallet = false; Mode mode = Config.get().getMode(); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java b/src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java index 7774461c..0c255a4c 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java @@ -1,6 +1,7 @@ package com.sparrowwallet.sparrow.control; import com.sparrowwallet.drongo.wallet.WalletNode; +import com.sparrowwallet.sparrow.AppController; import com.sparrowwallet.sparrow.EventManager; import com.sparrowwallet.sparrow.event.ReceiveActionEvent; import com.sparrowwallet.sparrow.event.ReceiveToEvent; @@ -10,7 +11,6 @@ import javafx.application.Platform; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.scene.control.*; import javafx.scene.input.MouseButton; -import javafx.scene.text.Font; import java.util.List; import java.util.Optional; @@ -33,7 +33,7 @@ public class AddressTreeTable extends CoinTreeTable { getColumns().add(addressCol); if(address != null) { - addressCol.setMinWidth(TextUtils.computeTextWidth(Font.font("Courier"), address, 0.0)); + addressCol.setMinWidth(TextUtils.computeTextWidth(AppController.getMonospaceFont(), address, 0.0)); } TreeTableColumn labelCol = new TreeTableColumn<>("Label"); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/DeviceDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/DeviceDialog.java index 8c1b00f5..dc93e035 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/DeviceDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/DeviceDialog.java @@ -32,6 +32,7 @@ public abstract class DeviceDialog extends Dialog { final DialogPane dialogPane = getDialogPane(); dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm()); + AppController.setStageIcon(dialogPane.getScene().getWindow()); StackPane stackPane = new StackPane(); dialogPane.setContent(stackPane); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/IdLabel.java b/src/main/java/com/sparrowwallet/sparrow/control/IdLabel.java index 8678d4b5..51a4d97c 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/IdLabel.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/IdLabel.java @@ -1,6 +1,6 @@ package com.sparrowwallet.sparrow.control; -import javafx.scene.text.Font; +import com.sparrowwallet.sparrow.AppController; public class IdLabel extends CopyableLabel { public IdLabel() { @@ -9,6 +9,6 @@ public class IdLabel extends CopyableLabel { public IdLabel(String text) { super(text); - setFont(Font.font("Courier")); + setFont(AppController.getMonospaceFont()); } } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/KeystorePassphraseDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/KeystorePassphraseDialog.java index 9a44e6b6..6995feb4 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/KeystorePassphraseDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/KeystorePassphraseDialog.java @@ -26,6 +26,7 @@ public class KeystorePassphraseDialog extends Dialog { setTitle("Keystore Passphrase" + (walletName != null ? " - " + walletName : "")); dialogPane.setHeaderText("Please enter the passphrase for keystore: \n" + keystore.getLabel()); dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm()); + AppController.setStageIcon(dialogPane.getScene().getWindow()); dialogPane.getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK); dialogPane.setPrefWidth(380); dialogPane.setPrefHeight(200); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java index 476eab93..86eec9e2 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java @@ -5,7 +5,7 @@ import com.google.zxing.client.j2se.MatrixToImageConfig; import com.google.zxing.client.j2se.MatrixToImageWriter; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; -import com.sparrowwallet.sparrow.EventManager; +import com.sparrowwallet.sparrow.AppController; import com.sparrowwallet.sparrow.io.ImportException; import com.sparrowwallet.sparrow.ur.UR; import com.sparrowwallet.sparrow.ur.UREncoder; @@ -48,6 +48,7 @@ public class QRDisplayDialog extends Dialog { this.encoder = new UREncoder(ur, MAX_FRAGMENT_LENGTH, MIN_FRAGMENT_LENGTH, 0); final DialogPane dialogPane = getDialogPane(); + AppController.setStageIcon(dialogPane.getScene().getWindow()); StackPane stackPane = new StackPane(); qrImageView = new ImageView(); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java index fd2b5a27..14f3b53d 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java @@ -7,6 +7,7 @@ import com.sparrowwallet.drongo.protocol.Base43; import com.sparrowwallet.drongo.protocol.Transaction; import com.sparrowwallet.drongo.psbt.PSBT; import com.sparrowwallet.drongo.uri.BitcoinURI; +import com.sparrowwallet.sparrow.AppController; import com.sparrowwallet.sparrow.ur.ResultType; import com.sparrowwallet.sparrow.ur.UR; import com.sparrowwallet.sparrow.ur.URDecoder; @@ -34,6 +35,7 @@ public class QRScanDialog extends Dialog { WebcamView webcamView = new WebcamView(webcamService); final DialogPane dialogPane = getDialogPane(); + AppController.setStageIcon(dialogPane.getScene().getWindow()); StackPane stackPane = new StackPane(); stackPane.getChildren().add(webcamView.getView()); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/SeedDisplayDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/SeedDisplayDialog.java index 4f07c20c..f9ed4c10 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/SeedDisplayDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/SeedDisplayDialog.java @@ -11,6 +11,7 @@ public class SeedDisplayDialog extends Dialog { public SeedDisplayDialog(Keystore decryptedKeystore) { final DialogPane dialogPane = getDialogPane(); dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm()); + AppController.setStageIcon(dialogPane.getScene().getWindow()); int lines = decryptedKeystore.getSeed().getMnemonicCode().size() / 3; int height = lines * 40; diff --git a/src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java index f152d9a6..49c5bdef 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java @@ -1,5 +1,6 @@ package com.sparrowwallet.sparrow.control; +import com.sparrowwallet.sparrow.AppController; import javafx.application.Platform; import javafx.beans.NamedArg; import javafx.scene.control.*; @@ -24,7 +25,8 @@ public class TextAreaDialog extends Dialog { this.defaultValue = defaultValue; - getDialogPane().setContent(hbox); + dialogPane.setContent(hbox); + AppController.setStageIcon(dialogPane.getScene().getWindow()); dialogPane.getStyleClass().add("text-input-dialog"); dialogPane.getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/TransactionIdDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/TransactionIdDialog.java index eb3cb051..d722e407 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/TransactionIdDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/TransactionIdDialog.java @@ -23,8 +23,9 @@ public class TransactionIdDialog extends Dialog { public TransactionIdDialog() { this.txid = (CustomTextField) TextFields.createClearableTextField(); - txid.setFont(Font.font ("Courier", txid.getFont().getSize())); + txid.setFont(AppController.getMonospaceFont()); final DialogPane dialogPane = getDialogPane(); + AppController.setStageIcon(dialogPane.getScene().getWindow()); setTitle("Load Transaction"); dialogPane.setHeaderText("Enter the transaction ID:"); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java index e762e8db..788f7c53 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java @@ -3,13 +3,12 @@ package com.sparrowwallet.sparrow.control; import com.google.common.eventbus.Subscribe; import com.sparrowwallet.drongo.policy.PolicyType; import com.sparrowwallet.drongo.wallet.Wallet; +import com.sparrowwallet.sparrow.AppController; import com.sparrowwallet.sparrow.EventManager; import com.sparrowwallet.sparrow.event.WalletExportEvent; -import com.sparrowwallet.sparrow.event.WalletImportEvent; import com.sparrowwallet.sparrow.io.ColdcardMultisig; import com.sparrowwallet.sparrow.io.Electrum; import com.sparrowwallet.sparrow.io.WalletExport; -import com.sparrowwallet.sparrow.io.WalletImport; import javafx.scene.control.*; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.StackPane; @@ -26,6 +25,7 @@ public class WalletExportDialog extends Dialog { }); final DialogPane dialogPane = getDialogPane(); + AppController.setStageIcon(dialogPane.getScene().getWindow()); StackPane stackPane = new StackPane(); dialogPane.setContent(stackPane); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java index a2c7c18e..69978ff4 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java @@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.control; import com.google.common.eventbus.Subscribe; import com.sparrowwallet.drongo.wallet.Wallet; +import com.sparrowwallet.sparrow.AppController; import com.sparrowwallet.sparrow.EventManager; import com.sparrowwallet.sparrow.event.WalletImportEvent; import com.sparrowwallet.sparrow.io.*; @@ -21,6 +22,7 @@ public class WalletImportDialog extends Dialog { }); final DialogPane dialogPane = getDialogPane(); + AppController.setStageIcon(dialogPane.getScene().getWindow()); StackPane stackPane = new StackPane(); dialogPane.setContent(stackPane); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WalletNameDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WalletNameDialog.java index e5186bcf..a1cc6628 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WalletNameDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WalletNameDialog.java @@ -22,6 +22,7 @@ public class WalletNameDialog extends Dialog { public WalletNameDialog() { this.name = (CustomTextField)TextFields.createClearableTextField(); final DialogPane dialogPane = getDialogPane(); + AppController.setStageIcon(dialogPane.getScene().getWindow()); setTitle("Wallet Name"); dialogPane.setHeaderText("Enter a name for this wallet:"); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WalletPasswordDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WalletPasswordDialog.java index c81ab31f..ea41d155 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WalletPasswordDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WalletPasswordDialog.java @@ -36,6 +36,7 @@ public class WalletPasswordDialog extends Dialog { setTitle("Wallet Password" + (walletName != null ? " - " + walletName : "")); dialogPane.setHeaderText(walletName != null ? requirement.description.substring(0, requirement.description.length() - 1) + " for " + walletName + ":" : requirement.description); dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm()); + AppController.setStageIcon(dialogPane.getScene().getWindow()); dialogPane.getButtonTypes().addAll(ButtonType.CANCEL); dialogPane.setPrefWidth(380); dialogPane.setPrefHeight(260); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java index 83a446b9..28814d80 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java @@ -28,6 +28,7 @@ public class WelcomeDialog extends Dialog { setTitle("Welcome to Sparrow"); dialogPane.setHeaderText("Welcome to Sparrow!"); dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm()); + AppController.setStageIcon(dialogPane.getScene().getWindow()); dialogPane.setPrefWidth(600); dialogPane.setPrefHeight(480); diff --git a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportDialog.java b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportDialog.java index 06b25afe..63af695a 100644 --- a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportDialog.java @@ -32,6 +32,7 @@ public class KeystoreImportDialog extends Dialog { }); final DialogPane dialogPane = getDialogPane(); + AppController.setStageIcon(dialogPane.getScene().getWindow()); try { FXMLLoader ksiLoader = new FXMLLoader(AppController.class.getResource("keystoreimport/keystoreimport.fxml")); diff --git a/src/main/java/com/sparrowwallet/sparrow/preferences/PreferencesDialog.java b/src/main/java/com/sparrowwallet/sparrow/preferences/PreferencesDialog.java index 82e96ca7..ee39e0c0 100644 --- a/src/main/java/com/sparrowwallet/sparrow/preferences/PreferencesDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/preferences/PreferencesDialog.java @@ -27,6 +27,7 @@ public class PreferencesDialog extends Dialog { public PreferencesDialog(PreferenceGroup initialGroup, boolean initialSetup) { final DialogPane dialogPane = getDialogPane(); + AppController.setStageIcon(dialogPane.getScene().getWindow()); try { FXMLLoader preferencesLoader = new FXMLLoader(AppController.class.getResource("preferences/preferences.fxml")); diff --git a/src/main/resources/com/sparrowwallet/sparrow/app.css b/src/main/resources/com/sparrowwallet/sparrow/app.css index cf63043a..99e937c6 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/app.css +++ b/src/main/resources/com/sparrowwallet/sparrow/app.css @@ -20,7 +20,7 @@ -fx-fill: #383a42; } -.status-bar, .status-bar .status-label { +.status-bar .status-label { -fx-alignment: center-left; } diff --git a/src/main/resources/com/sparrowwallet/sparrow/app.fxml b/src/main/resources/com/sparrowwallet/sparrow/app.fxml index 767968dc..559c92f7 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/app.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/app.fxml @@ -8,7 +8,7 @@ - + @@ -33,7 +33,6 @@ - diff --git a/src/main/resources/com/sparrowwallet/sparrow/general.css b/src/main/resources/com/sparrowwallet/sparrow/general.css index d447c478..6059aa49 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/general.css +++ b/src/main/resources/com/sparrowwallet/sparrow/general.css @@ -28,7 +28,8 @@ } .id { - -fx-font-family: Courier; + -fx-font-size: 13px; + -fx-font-family: 'Roboto Mono'; } .form-separator { diff --git a/src/main/resources/com/sparrowwallet/sparrow/script.css b/src/main/resources/com/sparrowwallet/sparrow/script.css index b8f10333..d584e7e6 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/script.css +++ b/src/main/resources/com/sparrowwallet/sparrow/script.css @@ -27,8 +27,9 @@ -fx-translate-y: 2; } -.uneditable-codearea { - -fx-font: 14px Courier; +.virtualized-scroll-pane .code-area, .uneditable-codearea { + -fx-font-size: 13px; + -fx-font-family: 'Roboto Mono'; -fx-padding: 4; } diff --git a/src/main/resources/com/sparrowwallet/sparrow/transaction/input.fxml b/src/main/resources/com/sparrowwallet/sparrow/transaction/input.fxml index 807ada6c..93e46623 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/transaction/input.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/transaction/input.fxml @@ -56,28 +56,28 @@ - + - + - + - + diff --git a/src/main/resources/com/sparrowwallet/sparrow/transaction/inputs.css b/src/main/resources/com/sparrowwallet/sparrow/transaction/inputs.css index 525ab250..59df4500 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/transaction/inputs.css +++ b/src/main/resources/com/sparrowwallet/sparrow/transaction/inputs.css @@ -20,8 +20,9 @@ .locktime { -fx-fill: #e5e5e6 } -.chart-legend-item{ - -fx-font-family: Courier; +.chart-legend-item { + -fx-font-size: 13px; + -fx-font-family: 'Roboto Mono'; } .default-color0.chart-pie { -fx-pie-color: #ca1243 } diff --git a/src/main/resources/com/sparrowwallet/sparrow/transaction/output.fxml b/src/main/resources/com/sparrowwallet/sparrow/transaction/output.fxml index aa445ef4..8004847b 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/transaction/output.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/transaction/output.fxml @@ -52,7 +52,7 @@ - + diff --git a/src/main/resources/com/sparrowwallet/sparrow/transaction/outputs.css b/src/main/resources/com/sparrowwallet/sparrow/transaction/outputs.css index 3fc90eba..17649920 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/transaction/outputs.css +++ b/src/main/resources/com/sparrowwallet/sparrow/transaction/outputs.css @@ -20,8 +20,9 @@ .locktime { -fx-fill: #e5e5e6 } -.chart-legend-item{ - -fx-font-family: Courier; +.chart-legend-item { + -fx-font-size: 13; + -fx-font-family: 'Roboto Mono'; } .default-color7.chart-pie { -fx-pie-color: #0184bc } diff --git a/src/main/resources/com/sparrowwallet/sparrow/transaction/transaction.css b/src/main/resources/com/sparrowwallet/sparrow/transaction/transaction.css index 523ec217..823fe68b 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/transaction/transaction.css +++ b/src/main/resources/com/sparrowwallet/sparrow/transaction/transaction.css @@ -1,6 +1,7 @@ #txhex { -fx-background-color: #ffffff; - -fx-font: 14px Courier; + -fx-font-size: 13px; + -fx-font-family: 'Roboto Mono'; -fx-padding: 2; } diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.css b/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.css index 84be80ad..93a9c4a8 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.css +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.css @@ -14,7 +14,8 @@ } #fingerprint, #derivation, #xpub { - -fx-font-family: Courier; + -fx-font-size: 13px; + -fx-font-family: 'Roboto Mono'; } #type { diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.fxml b/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.fxml index f9e1047a..bbf11500 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.fxml @@ -46,7 +46,7 @@ -