Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix style issues #3876

Merged
merged 6 commits into from Jan 8, 2020
Merged

Fix style issues #3876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b38fee
Force the text-fill style to fix wrong text color every now and then
ripcurlx Jan 8, 2020
34dc386
Update buy and sell color and move all color codes to the top
ripcurlx Jan 8, 2020
10cf4bb
The small icon on top should match the label color
ripcurlx Jan 8, 2020
6638d01
Remove non existing id style "cancel-button"
ripcurlx Jan 8, 2020
ce1e954
Remove dead code
ripcurlx Jan 8, 2020
3a395bc
Add back manual style workaround
ripcurlx Jan 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
View file
Open in desktop
Expand Up @@ -1294,7 +1294,7 @@ private void addAmountPriceFields() {
Res.get("shared.distanceInPercent"));
percentagePriceDescription = priceAsPercentageInputBoxTuple.first;

getSmallIconForLabel(MaterialDesignIcon.CHART_LINE, percentagePriceDescription);
getSmallIconForLabel(MaterialDesignIcon.CHART_LINE, percentagePriceDescription, "small-icon-label");

percentagePriceBox = priceAsPercentageInputBoxTuple.second;

Expand Down Expand Up @@ -1367,7 +1367,7 @@ private void addSecondRow() {
Tuple2<Label, VBox> priceInputBoxTuple = getTradeInputBox(priceValueCurrencyBox, "");
priceDescriptionLabel = priceInputBoxTuple.first;

getSmallIconForLabel(MaterialDesignIcon.LOCK, priceDescriptionLabel);
getSmallIconForLabel(MaterialDesignIcon.LOCK, priceDescriptionLabel, "small-icon-label");

editOfferElements.add(priceDescriptionLabel);
fixedPriceBox = priceInputBoxTuple.second;
Expand Down
4 changes: 2 additions & 2 deletions desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
View file
Open in desktop
Expand Up @@ -1106,7 +1106,7 @@ private void addAmountPriceFields() {
Res.get("takeOffer.amountPriceBox.priceDescription"));
priceDescriptionLabel = priceInputBoxTuple.first;

getSmallIconForLabel(MaterialDesignIcon.LOCK, priceDescriptionLabel);
getSmallIconForLabel(MaterialDesignIcon.LOCK, priceDescriptionLabel, "small-icon-label");

VBox priceBox = priceInputBoxTuple.second;

Expand Down Expand Up @@ -1145,7 +1145,7 @@ private void addSecondRow() {
Res.get("shared.distanceInPercent"));
priceAsPercentageDescription = priceAsPercentageInputBoxTuple.first;

getSmallIconForLabel(MaterialDesignIcon.CHART_LINE, priceAsPercentageDescription);
getSmallIconForLabel(MaterialDesignIcon.CHART_LINE, priceAsPercentageDescription, "small-icon-label");

priceAsPercentageInputBox = priceAsPercentageInputBoxTuple.second;

Expand Down
6 changes: 6 additions & 0 deletions desktop/src/main/java/bisq/desktop/theme-dark.css
View file
Open in desktop
Expand Up @@ -248,11 +248,17 @@
.scroll-bar:vertical .thumb:hover {
-fx-background-color: -bs-color-gray-5;
}

.scroll-bar:horizontal .thumb:pressed,
.scroll-bar:vertical .thumb:pressed {
-fx-background-color: -bs-color-gray-4;
}

.scroll-bar:vertical:focused,
.scroll-bar:horizontal:focused {
-fx-background-color: transparent, -bs-color-gray-4, -bs-color-gray-4;
}

.small-icon-label {
-fx-fill: -bs-text-color;
}
13 changes: 12 additions & 1 deletion desktop/src/main/java/bisq/desktop/util/FormBuilder.java
View file
Open in desktop
Expand Up @@ -2045,10 +2045,13 @@ public static void removeRowsFromGridPane(GridPane gridPane, int fromGridRow, in
// Icons
///////////////////////////////////////////////////////////////////////////////////////////

public static Text getIconForLabel(GlyphIcons icon, String iconSize, Label label) {
public static Text getIconForLabel(GlyphIcons icon, String iconSize, Label label, String style) {
if (icon.fontFamily().equals(MATERIAL_DESIGN_ICONS)) {
final Text textIcon = MaterialDesignIconFactory.get().createIcon(icon, iconSize);
textIcon.setOpacity(0.7);
if (style != null) {
textIcon.getStyleClass().add(style);
}
label.setContentDisplay(ContentDisplay.LEFT);
label.setGraphic(textIcon);
return textIcon;
Expand All @@ -2057,6 +2060,14 @@ public static Text getIconForLabel(GlyphIcons icon, String iconSize, Label label
}
}

public static Text getIconForLabel(GlyphIcons icon, String iconSize, Label label) {
return getIconForLabel(icon, iconSize, label, null);
}

public static Text getSmallIconForLabel(GlyphIcons icon, Label label, String style) {
return getIconForLabel(icon, "0.769em", label, style);
}

public static Text getSmallIconForLabel(GlyphIcons icon, Label label) {
return getIconForLabel(icon, "0.769em", label);
}
Expand Down