Skip to content

Commit

Permalink
Header and other visual tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
pedromvpg committed Aug 4, 2020
1 parent 9ab39c2 commit 5a16db8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
6 changes: 2 additions & 4 deletions desktop/src/main/java/bisq/desktop/bisq.css
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,8 @@ tree-table-view:focused {
}

.top-navigation .separator:vertical .line {
-fx-border-color: transparent transparent transparent -bs-rd-nav-border-color;
-fx-border-width: 1;
-fx-border-color: transparent transparent transparent transparent;
-fx-border-width: 3;
-fx-border-insets: 0 0 0 1;
}

Expand All @@ -661,7 +661,6 @@ tree-table-view:focused {
.nav-price-balance {
-fx-background-color: -bs-color-gray-background;
-fx-background-radius: 3;
-fx-effect: innershadow(gaussian, -bs-text-color-transparent, 3, 0, 0, 1);
-fx-pref-height: 41;
-fx-padding: 0 10 0 0;
}
Expand Down Expand Up @@ -2120,4 +2119,3 @@ textfield */
-fx-stroke: linear-gradient(to bottom, -bs-text-color-transparent, -bs-text-color-transparent-dark) !important;
-fx-fill: -bs-background-color !important;
}

12 changes: 6 additions & 6 deletions desktop/src/main/java/bisq/desktop/main/MainView.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
import bisq.desktop.util.Transitions;

import bisq.core.dao.monitoring.DaoStateMonitoringService;
import bisq.common.BisqException;
import bisq.core.locale.GlobalSettings;
import bisq.core.locale.LanguageUtil;
import bisq.core.locale.Res;

import bisq.common.BisqException;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.app.Version;
Expand Down Expand Up @@ -319,12 +319,12 @@ protected Tooltip computeValue() {
HBox primaryNav = new HBox(marketButton, getNavigationSeparator(), buyButton, getNavigationSeparator(),
sellButton, getNavigationSeparator(), portfolioButtonWithBadge, getNavigationSeparator(), fundsButton);

primaryNav.setAlignment(Pos.CENTER_LEFT);
primaryNav.setAlignment(Pos.CENTER);
primaryNav.getStyleClass().add("nav-primary");
HBox.setHgrow(primaryNav, Priority.SOMETIMES);

HBox secondaryNav = new HBox(supportButtonWithBadge, getNavigationSpacer(), settingsButton,
getNavigationSpacer(), accountButtonWithBadge, getNavigationSpacer(), daoButtonWithBadge);
HBox secondaryNav = new HBox(supportButtonWithBadge, getNavigationSeparator(), settingsButton,
getNavigationSeparator(), accountButtonWithBadge, getNavigationSeparator(), daoButtonWithBadge);
secondaryNav.getStyleClass().add("nav-secondary");
HBox.setHgrow(secondaryNav, Priority.SOMETIMES);

Expand All @@ -339,14 +339,14 @@ protected Tooltip computeValue() {
priceAndBalance.getStyleClass().add("nav-price-balance");

HBox navPane = new HBox(primaryNav, secondaryNav,
priceAndBalance) {{
getNavigationSpacer(), priceAndBalance) {{
setLeftAnchor(this, 0d);
setRightAnchor(this, 0d);
setTopAnchor(this, 0d);
setPadding(new Insets(0, 0, 0, 0));
getStyleClass().add("top-navigation");
}};
navPane.setAlignment(Pos.CENTER);
navPane.setAlignment(Pos.CENTER_LEFT);

AnchorPane contentContainer = new AnchorPane() {{
getStyleClass().add("content-pane");
Expand Down
5 changes: 5 additions & 0 deletions desktop/src/main/java/bisq/desktop/theme-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -524,3 +524,8 @@
.jfx-date-picker .left-button, .jfx-date-picker .right-button{
-fx-background-color: derive(-bs-color-gray-0, -10%);
}


.popup-bg, .notification-popup-bg, .peer-info-popup-bg {
-fx-effect: dropshadow(gaussian, -bs-color-gray-fafa, 44, 0, 0, 0);
}

0 comments on commit 5a16db8

Please sign in to comment.