Merge pull request #3808 from ripcurlx/fix-remaining-dark-mode-bugs

Fixes remaining dark mode bugs (except chat bubbles)
This commit is contained in:
sqrrm 2019-12-19 15:17:21 +01:00 committed by GitHub
commit ab35dbcad7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions

View File

@ -838,6 +838,7 @@ textfield */
-fx-border-width: 0px;
-fx-underline: true;
-fx-text-fill: -bs-rd-font-dark;
-fx-fill: -bs-rd-font-dark;
}
.hyperlink.no-underline {
@ -846,6 +847,7 @@ textfield */
.hyperlink:hover {
-fx-text-fill: -bs-text-color;
-fx-fill: -bs-text-color;
}
.hyperlink:hover,

View File

@ -81,9 +81,6 @@ public class HyperlinkWithIcon extends Hyperlink {
setContentDisplay(ContentDisplay.RIGHT);
setGraphicTextGap(7.0);
//TODO: replace workaround of setting the style this way
tooltipProperty().addListener((observable, oldValue, newValue) -> newValue.getStyleClass().add("tooltip-hyperlink-icon"));
}
public void clear() {

View File

@ -65,8 +65,8 @@ import bisq.common.util.Tuple3;
import org.bitcoinj.core.Coin;
import javax.inject.Named;
import javax.inject.Inject;
import javax.inject.Named;
import de.jensd.fx.glyphs.GlyphIcons;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
@ -1002,13 +1002,11 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
iconView.setId("image-remove");
title = Res.get("shared.remove");
button.setId("cancel-button");
button.setStyle("-fx-text-fill: #444;"); // does not take the font colors sometimes from the style
button.setOnAction(e -> onRemoveOpenOffer(offer));
} else {
boolean isSellOffer = offer.getDirection() == OfferPayload.Direction.SELL;
iconView.setId(isSellOffer ? "image-buy-white" : "image-sell-white");
button.setId(isSellOffer ? "buy-button" : "sell-button");
button.setStyle("-fx-text-fill: white;"); // does not take the font colors sometimes from the style
if (isSellOffer) {
title = CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) ?
Res.get("offerbook.takeOfferToBuy", offer.getOfferPayload().getBaseCurrencyCode()) :