From 6f05579c4b074e9e79506f2ec87ba05396bef06d Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 15 Sep 2014 02:42:21 +0200 Subject: [PATCH] Update style --- src/main/java/io/bitsquare/gui/bitsquare.css | 20 +++---------------- .../gui/components/TitledSeparator.java | 12 +++++++---- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/bitsquare.css b/src/main/java/io/bitsquare/gui/bitsquare.css index a14b611b86..acb7d81c74 100644 --- a/src/main/java/io/bitsquare/gui/bitsquare.css +++ b/src/main/java/io/bitsquare/gui/bitsquare.css @@ -465,22 +465,8 @@ textfield */ /* TitledSeparator */ -#titled-separator-label { - -fx-font-weight: bold; - -fx-font-size: 14; - -fx-text-fill: -bs-dark-grey; - -fx-background-color: #f4f4f4; -} -#titled-separator-label-active { - -fx-font-weight: bold; - -fx-font-size: 14; - -fx-text-fill: -bs-theme-color; - -fx-background-color: #f4f4f4; -} #titled-separator:horizontal .line { - -fx-border-color: #cccccc transparent #999999 transparent; + -fx-border-color: transparent #f4f4f4 transparent #f4f4f4; + -fx-background-color: transparent; + -fx-border-width: 10px; } - -#titled-separator-active:horizontal .line { - -fx-border-color: #dddddd transparent derive(-bs-theme-color, 50%) transparent; -} \ No newline at end of file diff --git a/src/main/java/io/bitsquare/gui/components/TitledSeparator.java b/src/main/java/io/bitsquare/gui/components/TitledSeparator.java index 1a33430af0..3e2764c659 100644 --- a/src/main/java/io/bitsquare/gui/components/TitledSeparator.java +++ b/src/main/java/io/bitsquare/gui/components/TitledSeparator.java @@ -43,6 +43,9 @@ public class TitledSeparator extends Pane { separator = new Separator(); separator.prefWidthProperty().bind(widthProperty()); + separator.setLayoutX(0); + separator.setLayoutY(6); + separator.setId("titled-separator"); label = new Label(); label.textProperty().bind(text); @@ -51,16 +54,17 @@ public class TitledSeparator extends Pane { label.setPadding(new Insets(0, 7, 0, 5)); setActive(); getChildren().addAll(separator, label); + } public void setInactive() { - separator.setId("titled-separator"); - label.setId("titled-separator-label"); + setId("titled-group-bg"); + label.setId("titled-group-bg-label"); } public void setActive() { - separator.setId("titled-separator-active"); - label.setId("titled-separator-label-active"); + setId("titled-group-bg-active"); + label.setId("titled-group-bg-label-active"); } public String getText() {