mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6017 from ripcurlx/fix-disabled-offer-display

Browse Source 
Improve text and icon colors for disabled offers
This commit is contained in:
Bisq GitHub Admin 2022-02-07 21:55:08 +01:00 committed by GitHub
commit fad721049c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
View File

@ -451,7 +451,9 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
super.updateItem(item, empty);
getStyleClass().removeAll("offer-disabled");
if (item != null) {
if (item.isNotPublished()) getStyleClass().add("offer-disabled");
if (item.isNotPublished()) {
getStyleClass().add("offer-disabled");
}
setGraphic(new AutoTooltipLabel(item.getDateAsString()));
} else {
setGraphic(null);
@ -844,7 +846,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
}
if (item.getOpenOffer().isBsqSwapOfferHasMissingFunds()) {
Label label = new Label();
Text icon = getRegularIconForLabel(MaterialDesignIcon.EYE_OFF, label);
Text icon = getRegularIconForLabel(MaterialDesignIcon.EYE_OFF, label, "opaque-icon");
Tooltip.install(icon, new Tooltip(Res.get("openOffer.bsqSwap.missingFunds")));
setGraphic(icon);
} else {

9
desktop/src/main/java/bisq/desktop/theme-dark.css
View File

@ -76,7 +76,6 @@
-bs-rd-nav-deselected: rgba(255, 255, 255, 0.45);
-bs-rd-nav-button-hover: rgba(255, 255, 255, 0.03);
-bs-tab-content-area: #111;
-bs-content-pane-bg-top: #212121;
-bs-rd-tab-border: rgba(255, 255, 255, 0.00);
-bs-tab-content-label-hover: rgba(0, 0, 0, 0.03);
@ -528,14 +527,18 @@
-fx-background-color: -bs-color-primary-dark;
}
.jfx-date-picker .date-picker-popup{
.jfx-date-picker .date-picker-popup {
-fx-background-color: -bs-color-gray-background;
}
.jfx-date-picker .left-button, .jfx-date-picker .right-button{
.jfx-date-picker .left-button, .jfx-date-picker .right-button {
-fx-background-color: derive(-bs-color-gray-0, -10%);
}
.progress-bar > .secondary-bar {
-fx-background-color: -bs-color-gray-0;
}
.offer-disabled .label {
-bs-text-color: -bs-color-gray-bbb;
}

6
desktop/src/main/java/bisq/desktop/util/FormBuilder.java
View File

@ -2274,7 +2274,11 @@ public class FormBuilder {
}
public static Text getRegularIconForLabel(GlyphIcons icon, Label label) {
return getIconForLabel(icon, "1.231em", label);
return getRegularIconForLabel(icon, label, null);
}
public static Text getRegularIconForLabel(GlyphIcons icon, Label label, String style) {
return getIconForLabel(icon, "1.231em", label, style);
}
public static Text getIcon(GlyphIcons icon) {