Merge pull request #4398 from pedromvpg/header-tweaks

Header and other visual tweaks
This commit is contained in:
Christoph Atteneder 2020-08-24 20:46:47 +02:00 committed by GitHub
commit 30eeb6ec61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 12 deletions

View file

@ -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;
}
@ -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;
}
@ -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;
}

View file

@ -43,12 +43,12 @@ import bisq.desktop.util.DisplayUtils;
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.core.provider.price.MarketPrice;
import bisq.common.BisqException;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.app.Version;
@ -318,15 +318,17 @@ public class MainView extends InitializableView<StackPane, MainViewModel>
}
});
HBox primaryNav = new HBox(marketButton, getNavigationSeparator(), buyButton, getNavigationSeparator(),
sellButton, getNavigationSeparator(), portfolioButtonWithBadge, getNavigationSeparator(), fundsButton);
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);
@ -341,14 +343,14 @@ public class MainView extends InitializableView<StackPane, MainViewModel>
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");

View file

@ -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);
}