Skip to content

Commit

Permalink
Fix style issues with dark mode (#3495)
Browse files Browse the repository at this point in the history
  • Loading branch information
ripcurlx authored and sqrrm committed Oct 28, 2019
1 parent f9b0a8a commit 07c6264
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 9 deletions.
14 changes: 12 additions & 2 deletions desktop/src/main/java/bisq/desktop/bisq.css
Original file line number Diff line number Diff line change
Expand Up @@ -783,11 +783,15 @@ tree-table-view:focused {
}

.close-icon {
-fx-text-fill: -bs-text-color;
-fx-fill: -bs-text-color;
}

.close-icon:hover {
-fx-text-fill: -fx-accent;
-fx-fill: -fx-accent;
}

.tooltip-icon {
-fx-fill: -bs-text-color;
}

/*******************************************************************************
Expand Down Expand Up @@ -2040,3 +2044,9 @@ textfield */
.popover > .content {
-fx-padding: 10;
}

.popover > .content .default-text {
-fx-text-fill: -bs-text-color;
}


Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public void hideIcon() {

private void positionAndActivateIcon(ContentDisplay contentDisplay, String info, double width) {
textIcon.setOpacity(0.4);
textIcon.getStyleClass().add("tooltip-icon");

textIcon.setOnMouseEntered(e -> {
hidePopover = false;
Expand Down
14 changes: 7 additions & 7 deletions desktop/src/main/java/bisq/desktop/util/FormBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -2107,14 +2107,14 @@ public static Button getIconButton(GlyphIcons icon, String styleClass) {

public static Button getIconButton(GlyphIcons icon, String styleClass, String iconSize) {
if (icon.fontFamily().equals(MATERIAL_DESIGN_ICONS)) {
Button textIcon = MaterialDesignIconFactory.get().createIconButton(icon,
Button iconButton = MaterialDesignIconFactory.get().createIconButton(icon,
"", iconSize, null, ContentDisplay.CENTER);
textIcon.setId("icon-button");
textIcon.getGraphic().getStyleClass().add(styleClass);
textIcon.setPrefWidth(20);
textIcon.setPrefHeight(20);
textIcon.setPadding(new Insets(0));
return textIcon;
iconButton.setId("icon-button");
iconButton.getGraphic().getStyleClass().add(styleClass);
iconButton.setPrefWidth(20);
iconButton.setPrefHeight(20);
iconButton.setPadding(new Insets(0));
return iconButton;
} else {
throw new IllegalArgumentException("Not supported icon type");
}
Expand Down

0 comments on commit 07c6264

Please sign in to comment.