mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add general styles for consolidation

Browse source
This commit is contained in:
Christoph Atteneder 2017-12-15 11:08:50 +01:00
parent 519976c09b
commit 4b6298582a
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
15 changed files with 65 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
gui/src/main/java/io/bisq/gui/bisq.css
View file

@ -98,21 +98,44 @@ bg color of non edit textFields: fafafa
-fx-font-size: 13;
-fx-font-family: "Verdana";
}
/********************************************************************************************************************
* *
* General *
* *
********************************************************************************************************************/
.error-text {
-fx-text-fill: -bs-error-red;
}
.error {
-fx-accent: -bs-error-red;
}
.success-text {
-fx-text-fill: -bs-green;
}
.highlight {
-fx-text-fill: -fx-accent;
}
.headline-label {
-fx-font-weight: bold;
-fx-font-size: 22;
}
.show-hand {
-fx-cursor: hand;
}
/* Splash */
#splash {
-fx-background-color: -bs-white;
}
#splash-error-state-msg {
-fx-text-fill: -bs-error-red;
}
#splash-bitcoin-network-label {
-fx-text-fill: -fx-accent;
-fx-font-weight: bold;
}
/* Main UI */
#base-content-container {
-fx-background-color: -bs-bg-grey;
@ -210,10 +233,6 @@ bg color of non edit textFields: fafafa
-fx-background-color: transparent;
}
.copy-icon {
-fx-text-fill: -fx-accent;
}
.copy-icon-disputes {
-fx-text-fill: -bs-white;
}
@ -222,10 +241,6 @@ bg color of non edit textFields: fafafa
-fx-text-fill: -bs-black;
}
.external-link-icon {
-fx-text-fill: -fx-accent;
}
.received-funds-icon {
-fx-text-fill: -bs-green-soft;
}
@ -313,11 +328,6 @@ textfield */
-fx-padding: 4 4 4 4;
}
#address-text-field {
-fx-cursor: hand;
-fx-text-fill: -fx-accent;
}
#address-text-field:hover {
-fx-text-fill: -bs-black;
}
@ -469,11 +479,6 @@ textfield */
-fx-text-fill: -bs-medium-grey;
}
#clickable-icon {
-fx-text-fill: -fx-accent;
-fx-cursor: hand;
}
#clickable-icon:hover {
-fx-text-fill: -bs-grey;
}
@ -649,36 +654,6 @@ textfield */
}
/* Account setup */
#wizard-title-deactivated {
-fx-font-weight: bold;
-fx-font-size: 16;
-fx-text-fill: -bs-dark-grey;
}
#wizard-title-active {
-fx-font-weight: bold;
-fx-font-size: 16;
-fx-text-fill: -bs-font-dark;
}
#wizard-title-completed {
-fx-font-weight: bold;
-fx-font-size: 16;
-fx-text-fill: -bs-font-dark;
}
#wizard-sub-title-deactivated {
-fx-text-fill: -bs-dark-grey;
}
#wizard-sub-title-active {
-fx-text-fill: -bs-font-dark;
}
#wizard-sub-title-completed {
-fx-text-fill: -bs-font-dark;
}
#wizard-item-background-deactivated {
-fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, -bs-very-light-grey);
-fx-outer-border: linear-gradient(to bottom, -bs-bg-grey, -bs-light-grey);
@ -713,23 +688,6 @@ textfield */
}
/* Account settings */
#wizard-title-disabled {
-fx-font-weight: bold;
-fx-font-size: 16;
-fx-text-fill: -bs-dark-grey;
}
#wizard-title-active {
-fx-font-weight: bold;
-fx-font-size: 16;
-fx-text-fill: -bs-font-dark;
}
#wizard-title-selected {
-fx-font-weight: bold;
-fx-font-size: 16;
-fx-text-fill: -fx-accent;
}
#account-settings-item-background-disabled {
-fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, -bs-very-light-grey);
@ -826,7 +784,6 @@ textfield */
#titled-group-bg-label-active {
-fx-font-weight: bold;
-fx-font-size: 14;
-fx-text-fill: -fx-accent;
-fx-background-color: -bs-content-bg-grey;
}
@ -1231,19 +1188,6 @@ textfield */
-fx-background: -bs-light-grey;
}
.headline-label {
-fx-font-weight: bold;
-fx-font-size: 22;
}
.info-headline-label {
-fx-text-fill: -fx-accent;
}
.alert-headline-label {
-fx-text-fill: -bs-error-red;
}
/********************************************************************************************************************
* *
* Arbitration *
@ -1263,16 +1207,6 @@ textfield */
-fx-font-size: 11;
}
.system-message-header {
-fx-text-fill: -bs-green;
-fx-font-size: 11;
}
.my-message-header {
-fx-text-fill: -fx-accent;
-fx-font-size: 11;
}
/********************************************************************************************************************
* *
* DAO *

5
gui/src/main/java/io/bisq/gui/components/AddressTextField.java
View file

@ -53,6 +53,7 @@ public class AddressTextField extends AnchorPane {
public AddressTextField() {
TextField textField = new TextField();
textField.setId("address-text-field");
textField.getStyleClass().addAll("highlight","show-hand");
textField.setEditable(false);
textField.textProperty().bind(address);
String tooltipText = Res.get("addressTextField.openWallet");
@ -72,14 +73,14 @@ public class AddressTextField extends AnchorPane {
Label extWalletIcon = new Label();
extWalletIcon.setLayoutY(3);
extWalletIcon.getStyleClass().addAll("icon", "copy-icon");
extWalletIcon.getStyleClass().addAll("icon", "highlight");
extWalletIcon.setTooltip(new Tooltip(tooltipText));
AwesomeDude.setIcon(extWalletIcon, AwesomeIcon.SIGNIN);
extWalletIcon.setOnMouseClicked(e -> GUIUtil.showFeeInfoBeforeExecute(this::openWallet));
Label copyIcon = new Label();
copyIcon.setLayoutY(3);
copyIcon.getStyleClass().addAll("icon", "copy-icon");
copyIcon.getStyleClass().addAll("icon", "highlight");
Tooltip.install(copyIcon, new Tooltip(Res.get("addressTextField.copyToClipboard")));
AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
copyIcon.setOnMouseClicked(e -> GUIUtil.showFeeInfoBeforeExecute(() -> {

2
gui/src/main/java/io/bisq/gui/components/AddressWithIconAndDirection.java
View file

@ -46,7 +46,7 @@ public class AddressWithIconAndDirection extends AnchorPane {
openLinkIcon = new Label();
openLinkIcon.setLayoutY(3);
openLinkIcon.getStyleClass().addAll("icon", "external-link-icon");
openLinkIcon.getStyleClass().addAll("icon", "highlight");
openLinkIcon.setOpacity(0.7);
AwesomeDude.setIcon(openLinkIcon, awesomeIcon);

3
gui/src/main/java/io/bisq/gui/components/BsqAddressTextField.java
View file

@ -47,6 +47,7 @@ public class BsqAddressTextField extends AnchorPane {
public BsqAddressTextField() {
TextField textField = new TextField();
textField.setId("address-text-field");
textField.getStyleClass().addAll("highlight","show-hand");
textField.setEditable(false);
textField.textProperty().bind(address);
String tooltipText = Res.get("addressTextField.copyToClipboard");
@ -74,7 +75,7 @@ public class BsqAddressTextField extends AnchorPane {
Label copyIcon = new Label();
copyIcon.setLayoutY(3);
copyIcon.getStyleClass().addAll("icon", "copy-icon");
copyIcon.getStyleClass().addAll("icon", "highlight");
copyIcon.setTooltip(new Tooltip(Res.get("addressTextField.copyToClipboard")));
AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
copyIcon.setOnMouseClicked(e -> GUIUtil.showFeeInfoBeforeExecute(() -> {

2
gui/src/main/java/io/bisq/gui/components/HyperlinkWithIcon.java
View file

@ -29,7 +29,7 @@ public class HyperlinkWithIcon extends HBox {
hyperlink = new Hyperlink(text);
icon = new Label();
icon.getStyleClass().addAll("icon", "external-link-icon");
icon.getStyleClass().addAll("icon", "highlight");
AwesomeDude.setIcon(icon, awesomeIcon);
icon.setMinWidth(20);
icon.setOpacity(0.7);

1
gui/src/main/java/io/bisq/gui/components/TableGroupHeadline.java
View file

@ -67,6 +67,7 @@ public class TableGroupHeadline extends Pane {
private void setActive() {
setId("titled-group-bg-active");
label.setId("titled-group-bg-label-active");
label.getStyleClass().add("highlight");
}
public String getText() {

2
gui/src/main/java/io/bisq/gui/components/TextFieldWithCopyIcon.java
View file

@ -42,7 +42,7 @@ public class TextFieldWithCopyIcon extends AnchorPane {
public TextFieldWithCopyIcon() {
Label copyIcon = new Label();
copyIcon.setLayoutY(3);
copyIcon.getStyleClass().addAll("icon", "copy-icon");
copyIcon.getStyleClass().addAll("icon", "highlight");
copyIcon.setTooltip(new Tooltip(Res.get("shared.copyToClipboard")));
AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
AnchorPane.setRightAnchor(copyIcon, 0.0);

5
gui/src/main/java/io/bisq/gui/components/TxIdTextField.java
View file

@ -75,7 +75,7 @@ public class TxIdTextField extends AnchorPane {
copyIcon = new Label();
copyIcon.setLayoutY(3);
copyIcon.getStyleClass().addAll("icon", "copy-icon");
copyIcon.getStyleClass().addAll("icon", "highlight");
copyIcon.setTooltip(new Tooltip(Res.get("txIdTextField.copyIcon.tooltip")));
AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
AnchorPane.setRightAnchor(copyIcon, 30.0);
@ -83,7 +83,7 @@ public class TxIdTextField extends AnchorPane {
Tooltip tooltip = new Tooltip(Res.get("txIdTextField.blockExplorerIcon.tooltip"));
blockExplorerIcon = new Label();
blockExplorerIcon.getStyleClass().addAll("icon", "external-link-icon");
blockExplorerIcon.getStyleClass().addAll("icon", "highlight");
blockExplorerIcon.setTooltip(tooltip);
AwesomeDude.setIcon(blockExplorerIcon, AwesomeIcon.EXTERNAL_LINK);
blockExplorerIcon.setMinWidth(20);
@ -92,6 +92,7 @@ public class TxIdTextField extends AnchorPane {
textField = new TextField();
textField.setId("address-text-field");
textField.getStyleClass().addAll("highlight","show-hand");
textField.setEditable(false);
textField.setTooltip(tooltip);
AnchorPane.setRightAnchor(textField, 80.0);

7
gui/src/main/java/io/bisq/gui/main/MainView.java
View file

@ -424,7 +424,10 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
// createBitcoinInfoBox
btcSplashInfo = new Label();
btcSplashInfo.textProperty().bind(model.btcInfo);
walletServiceErrorMsgListener = (ov, oldValue, newValue) -> btcSplashInfo.setId("splash-error-state-msg");
walletServiceErrorMsgListener = (ov, oldValue, newValue) -> {
btcSplashInfo.setId("splash-error-state-msg");
btcSplashInfo.getStyleClass().add("error-text");
};
model.walletServiceErrorMsg.addListener(walletServiceErrorMsgListener);
btcSyncIndicator = new ProgressBar();
@ -466,6 +469,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
splashP2PNetworkErrorMsgListener = (ov, oldValue, newValue) -> {
if (newValue != null) {
splashP2PNetworkLabel.setId("splash-error-state-msg");
splashP2PNetworkLabel.getStyleClass().add("error-text");
splashP2PNetworkBusyAnimation.stop();
} else if (model.splashP2PNetworkAnimationVisible.get()) {
splashP2PNetworkBusyAnimation.play();
@ -554,6 +558,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
model.walletServiceErrorMsg.addListener((ov, oldValue, newValue) -> {
if (newValue != null) {
btcInfoLabel.setId("splash-error-state-msg");
btcInfoLabel.getStyleClass().add("error-text");
if (btcNetworkWarnMsgPopup == null) {
btcNetworkWarnMsgPopup = new Popup<>().warning(newValue);
btcNetworkWarnMsgPopup.show();

4
gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java
View file

@ -740,12 +740,12 @@ public class TraderDisputeView extends ActivatableView<VBox, Void> {
arrow.setManaged(!item.isSystemMessage());
statusIcon.setVisible(false);
if (item.isSystemMessage()) {
headerLabel.getStyleClass().add("system-message-header");
headerLabel.getStyleClass().addAll("message-header","success-text");
bg.setId("message-bubble-green");
messageLabel.getStyleClass().add("my-message");
copyIcon.getStyleClass().add("my-message");
} else if (isMyMsg) {
headerLabel.getStyleClass().add("my-message-header");
headerLabel.getStyleClass().add("highlight");
bg.setId("message-bubble-blue");
messageLabel.getStyleClass().add("my-message");
copyIcon.getStyleClass().add("my-message");

1
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
View file

@ -1199,6 +1199,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
private void setupTotalToPayInfoIconLabel() {
totalToPayInfoIconLabel.setId("clickable-icon");
totalToPayInfoIconLabel.getStyleClass().addAll("highlight", "show-hand");
AwesomeDude.setIcon(totalToPayInfoIconLabel, AwesomeIcon.QUESTION_SIGN);
totalToPayInfoIconLabel.setOnMouseEntered(e -> createInfoPopover());

1
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
View file

@ -1003,6 +1003,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
private void setupTotalToPayInfoIconLabel() {
totalToPayInfoIconLabel.setId("clickable-icon");
totalToPayInfoIconLabel.getStyleClass().addAll("highlight", "show-hand");
AwesomeDude.setIcon(totalToPayInfoIconLabel, AwesomeIcon.QUESTION_SIGN);
totalToPayInfoIconLabel.setOnMouseEntered(e -> createInfoPopover());

4
gui/src/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java
View file

@ -69,14 +69,14 @@ public class DisplayAlertMessageWindow extends Overlay<DisplayAlertMessageWindow
FormBuilder.addMultilineLabel(gridPane, ++rowIndex, alert.getMessage(), 10);
if (alert.isUpdateInfo()) {
headLine = Res.get("displayAlertMessageWindow.update.headline");
headLineLabel.getStyleClass().addAll("headline-label","info-headline-label");
headLineLabel.getStyleClass().addAll("headline-label","highlight");
String url = "https://bisq.network/downloads";
HyperlinkWithIcon hyperlinkWithIcon = FormBuilder.addLabelHyperlinkWithIcon(gridPane, ++rowIndex,
Res.get("displayAlertMessageWindow.update.download"), url, url).second;
hyperlinkWithIcon.setMaxWidth(550);
} else {
headLine = Res.get("displayAlertMessageWindow.headline");
headLineLabel.getStyleClass().addAll("headline-label", "alert-headline-label");
headLineLabel.getStyleClass().addAll("headline-label", "error-text");
}
closeButton = new Button(Res.get("shared.close"));
closeButton.setOnAction(e -> {

9
gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java
View file

@ -87,7 +87,7 @@ public class DisplayUpdateDownloadWindow extends Overlay<DisplayUpdateDownloadWi
private void addContent() {
headLine = "Important update information!";
headLineLabel.setStyle("-fx-text-fill: -fx-accent; -fx-font-weight: bold; -fx-font-size: 22;");
headLineLabel.getStyleClass().addAll("headline-label", "highlight");
checkNotNull(alert, "alertMessage must not be null");
addMultilineLabel(gridPane, ++rowIndex, alert.getMessage(), 10);
@ -205,12 +205,13 @@ public class DisplayUpdateDownloadWindow extends Overlay<DisplayUpdateDownloadWi
List<BisqInstaller.FileDescriptor> downloadResults = downloadTask.getValue();
Optional<BisqInstaller.FileDescriptor> downloadFailed = downloadResults.stream()
.filter(fileDescriptor -> !BisqInstaller.DownloadStatusEnum.OK.equals(fileDescriptor.getDownloadStatus())).findFirst();
downloadedFilesLabel.getStyleClass().removeAll("error-text","success-text");
if (downloadResults == null || downloadResults.isEmpty() || downloadFailed.isPresent()) {
showErrorMessage(downloadButton, statusLabel, downloadFailedString);
downloadedFilesLabel.setStyle("-fx-text-fill: -bs-error-red;");
downloadedFilesLabel.getStyleClass().add("error-text");
} else {
log.debug("Download completed successfully.");
downloadedFilesLabel.setStyle("-fx-text-fill: -bs-green;");
downloadedFilesLabel.getStyleClass().add("success-text");
verifyTask = installer.verify(downloadResults);
verifiedSigLabel.setOpacity(1);
@ -233,7 +234,7 @@ public class DisplayUpdateDownloadWindow extends Overlay<DisplayUpdateDownloadWi
if (verifyResults == null || verifyResults.isEmpty() || verifyFailed.isPresent()) {
showErrorMessage(downloadButton, statusLabel, Res.get("displayUpdateDownloadWindow.verify.failed"));
} else {
verifiedSigLabel.setStyle("-fx-text-fill: -bs-green;");
verifiedSigLabel.getStyleClass().add("success-text");
new Popup<>().feedback(Res.get("displayUpdateDownloadWindow.success"))
.actionButtonText(Res.get("displayUpdateDownloadWindow.download.openDir"))
.onAction(() -> {

8
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
View file

@ -214,13 +214,13 @@ public abstract class TradeStepView extends AnchorPane {
if (remainingTime != null) {
timeLeftTextField.setText(remainingTime);
if (model.showWarning() || model.showDispute()) {
timeLeftTextField.setStyle("-fx-text-fill: -bs-error-red");
timeLeftProgressBar.setStyle("-fx-accent: -bs-error-red;");
timeLeftTextField.getStyleClass().add("error-text");
timeLeftProgressBar.getStyleClass().add("error");
}
} else {
timeLeftTextField.setText("Trade not completed in time (" + model.getDateForOpenDispute() + ")");
timeLeftTextField.setStyle("-fx-text-fill: -bs-error-red");
timeLeftProgressBar.setStyle("-fx-accent: -bs-error-red;");
timeLeftTextField.getStyleClass().add("error-text");
timeLeftProgressBar.getStyleClass().add("error");
}
}
}