Use new logo and colors

This commit is contained in:
Manfred Karrer 2014-09-20 17:25:34 +02:00
parent 02b82b63ef
commit 99d552da07
41 changed files with 47 additions and 19 deletions

View File

@ -5,6 +5,12 @@ logo colors:
blue: 0096c9
dark grey: #333333
new blue: 0f87c3
new grey: 666666
00abff
main bg grey: dddddd
content bg grey: f4f4f4
tab pane upper bg gradient color mid dark grey to bright grey: cfcfcf -> dddddd
@ -15,11 +21,15 @@ lower gradient color on tab: dddddd
*/
.root {
-bs-theme-color: #0096c9;
-bs-dark-grey: #333333;
-bs-bg-grey: #dddddd;
-fx-accent: #0f87c3;
-fx-default-button: derive(-fx-accent,100%);
-fx-focus-color: -fx-accent;
-fx-faint-focus-color: #0f87c322;
-fx-selection-bar: derive(-fx-accent,50%);
}
/* Splash */
#splash {
@ -71,6 +81,7 @@ lower gradient color on tab: dddddd
#nav-button:selected .text {
-fx-font-size: 11;
-fx-font-weight: bold;
-fx-fill: -fx-accent;
}
#nav-alert-button {
@ -109,7 +120,7 @@ lower gradient color on tab: dddddd
}
.copy-icon {
-fx-text-fill: -bs-theme-color;
-fx-text-fill: -fx-accent;
-fx-cursor: hand;
}
@ -117,9 +128,22 @@ lower gradient color on tab: dddddd
-fx-text-fill: black;
}
/*******************************************************************************
* *
* Tooltip *
* *
******************************************************************************/
.tooltip {
-fx-background-color: white;
-fx-background: rgba(30,30,30);
-fx-text-fill: black;
-fx-background-color: rgba(100,100,100,0.8);
-fx-background-radius: 6px;
-fx-background-insets: 0;
-fx-padding: 0.667em 0.75em 0.667em 0.75em; /* 10px */
-fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.5) , 10, 0.0 , 0 , 3 );
-fx-font-size: 0.85em;
}
@ -133,7 +157,7 @@ textfield */
#address-text-field {
-fx-cursor: hand;
-fx-text-fill: -bs-theme-color;
-fx-text-fill: -fx-accent;
}
#address-text-field:hover {
-fx-text-fill: black;
@ -169,7 +193,7 @@ textfield */
}
.table-view .table-row-cell .copy-icon .text {
-fx-fill: -bs-theme-color;
-fx-fill: -fx-accent;
}
.table-view .table-row-cell .copy-icon .text:hover {
@ -185,7 +209,7 @@ textfield */
}
.table-view .table-row-cell .hyperlink .text {
-fx-fill: -bs-theme-color;
-fx-fill: -fx-accent;
}
.table-view .table-row-cell .hyperlink .text:hover {
@ -200,6 +224,8 @@ textfield */
-fx-fill: black;
}
#form-header-text {
-fx-font-weight: bold;
-fx-font-size: 14;
@ -210,7 +236,7 @@ textfield */
}
#clickable-icon {
-fx-text-fill: -bs-theme-color;
-fx-text-fill: -fx-accent;
-fx-cursor: hand;
}
@ -395,7 +421,7 @@ textfield */
#wizard-title-selected {
-fx-font-weight: bold;
-fx-font-size: 16;
-fx-text-fill: -bs-theme-color;
-fx-text-fill: -fx-accent;
}
#account-settings-item-background-disabled {
@ -442,7 +468,7 @@ textfield */
#titled-group-bg-label-active {
-fx-font-weight: bold;
-fx-font-size: 14;
-fx-text-fill: -bs-theme-color;
-fx-text-fill: -fx-accent;
-fx-background-color: #f4f4f4;
}
#titled-group-bg {

View File

@ -241,6 +241,7 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
final AnchorPane pane = new AnchorPane(label, removeButton);
{
label.setLayoutY(5);
removeButton.setId("icon-button");
AnchorPane.setRightAnchor(removeButton, 0d);
}
@ -299,6 +300,7 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
final AnchorPane pane = new AnchorPane(label, removeButton);
{
label.setLayoutY(5);
removeButton.setId("icon-button");
AnchorPane.setRightAnchor(removeButton, 0d);
}
@ -343,11 +345,11 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
final AnchorPane pane = new AnchorPane(label, removeButton);
{
label.setLayoutY(5);
removeButton.setId("icon-button");
AnchorPane.setRightAnchor(removeButton, 0d);
}
@Override
public void updateItem(final Arbitrator item, boolean empty) {
super.updateItem(item, empty);

View File

@ -23,9 +23,9 @@
prefHeight="660.0" prefWidth="1000.0"
xmlns:fx="http://javafx.com/fxml">
<VBox fx:id="leftVBox" spacing="5" prefWidth="200" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="20"
<VBox fx:id="leftVBox" spacing="5" prefWidth="200" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
AnchorPane.topAnchor="20"/>
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="10" AnchorPane.rightAnchor="30" AnchorPane.leftAnchor="250"
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="10" AnchorPane.rightAnchor="25" AnchorPane.leftAnchor="250"
AnchorPane.topAnchor="30" prefWidth="720"/>
</AnchorPane>

View File

@ -22,6 +22,7 @@ import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.ViewCB;
import io.bitsquare.gui.main.account.content.ContextAware;
import io.bitsquare.gui.util.Colors;
import io.bitsquare.util.ViewLoader;
import java.io.IOException;
@ -45,7 +46,7 @@ import de.jensd.fx.fontawesome.AwesomeIcon;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class AccountSettingsViewCB extends CachedViewCB<AccountSettingsPM> {
public class AccountSettingsViewCB extends CachedViewCB<AccountSettingsPM> {
private static final Logger log = LoggerFactory.getLogger(AccountSettingsViewCB.class);
@ -219,7 +220,7 @@ class MenuItem extends ToggleButton {
selectedProperty().addListener((ov, oldValue, newValue) -> {
if (newValue) {
setId("account-settings-item-background-selected");
icon.setTextFill(Paint.valueOf("#0096c9"));
icon.setTextFill(Colors.BLUE);
}
else {
setId("account-settings-item-background-active");

View File

@ -22,9 +22,9 @@
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.setup.AccountSetupViewCB"
xmlns:fx="http://javafx.com/fxml">
<VBox fx:id="leftVBox" spacing="5" prefWidth="300" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="20"
<VBox fx:id="leftVBox" spacing="5" prefWidth="300" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
AnchorPane.topAnchor="20"/>
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="10" AnchorPane.rightAnchor="30" AnchorPane.leftAnchor="350"
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="10" AnchorPane.rightAnchor="25" AnchorPane.leftAnchor="350"
AnchorPane.topAnchor="30" prefWidth="620"/>
</AnchorPane>

View File

@ -48,7 +48,7 @@ import javafx.scene.layout.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class AccountSetupViewCB extends CachedViewCB<AccountSetupPM> implements MultiStepNavigation {
public class AccountSetupViewCB extends CachedViewCB<AccountSetupPM> implements MultiStepNavigation {
private static final Logger log = LoggerFactory.getLogger(AccountSetupViewCB.class);

View File

@ -20,7 +20,6 @@ package io.bitsquare.gui.util;
import javafx.scene.paint.*;
public class Colors {
public static final Paint YELLOW = Color.valueOf("#edc035");
public static final Paint BLUE = Color.valueOf("#0096c9");
public static final Paint LIGHT_GREY = Color.valueOf("#f4f4f4");
public static final Paint DARK_GREY = Color.valueOf("#333333");

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 710 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 838 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 756 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 841 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 971 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 585 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 871 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 852 B

After

Width:  |  Height:  |  Size: 876 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 918 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 854 B

After

Width:  |  Height:  |  Size: 864 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 971 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 999 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 452 B

After

Width:  |  Height:  |  Size: 798 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 812 B

After

Width:  |  Height:  |  Size: 812 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 848 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 811 B

After

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 827 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 730 B

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 906 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 731 B

After

Width:  |  Height:  |  Size: 730 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 958 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB