Skip to content

Commit

Permalink
Multiple CSS bugfixes for light/dark themes
Browse files Browse the repository at this point in the history
[Light Theme]
* Fix wrong shade of gray used as background color on grid-pane
* Fix green scrollbars, should be gray as before

[Dark Theme]
* Fix action buttons being too dark on dark background
* Fix combo-box-editor referencing old CSS class names
* Fix incorrect shades of gray used for wizard item background
* Set font-smoothing to gray method

* Style javafx's main color palette, which fixes below issues:
* Fix dark text on dark background in text field on grid-pane
* Fix password entry input field dark on dark
* Fix trade chat bubbles and text
* Fix calendar date picker
* Fix viewing DAO proposal results
  • Loading branch information
wiz committed Sep 1, 2019
1 parent 04d073f commit 6cef6e0
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 108 deletions.
30 changes: 15 additions & 15 deletions desktop/src/main/java/bisq/desktop/bisq.css
Original file line number Diff line number Diff line change
Expand Up @@ -485,20 +485,20 @@ tree-table-view:focused {
}

.scroll-bar {
-fx-background-color: transparent;
-fx-background-color: -bs-background-color;
-fx-background-radius: 0;
}

.scroll-bar:horizontal .track,
.scroll-bar:vertical .track {
-fx-background-color: transparent;
-fx-border-color: transparent;
-fx-background-color: -bs-background-color;
-fx-border-color: -bs-background-color;
-fx-background-radius: 0;
}

.scroll-bar:vertical .track-background,
.scroll-bar:horizontal .track-background {
-fx-background-color: transparent;
-fx-background-color: -bs-background-color;
-fx-background-insets: 0;
-fx-background-radius: 0;
}
Expand All @@ -522,14 +522,14 @@ tree-table-view:focused {

.scroll-bar:horizontal .thumb:pressed,
.scroll-bar:vertical .thumb:pressed {
-fx-background-color: -bs-color-gray-ccc;
-fx-background-color: -bs-color-gray-ddd;
}

.scroll-bar:vertical .increment-button,
.scroll-bar:vertical .decrement-button,
.scroll-bar:horizontal .increment-button,
.scroll-bar:horizontal .decrement-button {
-fx-background-color: transparent;
-fx-background-color: -bs-background-color;
-fx-padding: 1;
}

Expand All @@ -538,12 +538,12 @@ tree-table-view:focused {
.scroll-bar:horizontal .decrement-arrow,
.scroll-bar:vertical .decrement-arrow {
-fx-shape: null;
-fx-background-color: transparent;
-fx-background-color: -bs-background-color;
}

.scroll-bar:vertical:focused,
.scroll-bar:horizontal:focused {
-fx-background-color: transparent, -bs-color-darkest, -bs-color-gray-6;
-fx-background-color: -bs-background-color, -bs-color-gray-ccc, -bs-color-gray-ddd;
}

/* Behavior */
Expand Down Expand Up @@ -1028,8 +1028,8 @@ textfield */
}

.delete:hover {
-fx-text-fill: -bs-rd-black;
-fx-fill: -bs-rd-black;
-fx-text-fill: -bs-text-color;
-fx-fill: -bs-text-color;
}

/*******************************************************************************
Expand Down Expand Up @@ -1250,7 +1250,7 @@ textfield */
.combo-box-editor-bold {
-fx-font-weight: bold;
-fx-padding: 5 8 5 8 !important;
-fx-text-fill: -bs-rd-black;
-fx-text-fill: -bs-text-color;
-fx-font-family: "IBM Plex Sans Medium";
}

Expand Down Expand Up @@ -1301,7 +1301,7 @@ textfield */

/* Account setup */
#wizard-item-background-deactivated {
-fx-body-color: linear-gradient(to bottom, -bs-color-gray-1, -bs-color-gray-1);
-fx-body-color: linear-gradient(to bottom, -bs-content-background-gray, -bs-color-gray-aaa);
-fx-outer-border: linear-gradient(to bottom, -bs-background-gray, -bs-color-gray-3);
-fx-background-color: -fx-shadow-highlight-color,
-fx-outer-border,
Expand All @@ -1312,7 +1312,7 @@ textfield */
}

#wizard-item-background-active {
-fx-body-color: linear-gradient(to bottom, -bs-color-gray-0, -bs-color-gray-1);
-fx-body-color: linear-gradient(to bottom, -bs-bg-gray-5, -bs-color-gray-6);
-fx-outer-border: linear-gradient(to bottom, -bs-color-blue-1, -bs-color-blue-2);
-fx-background-color: -fx-shadow-highlight-color,
-fx-outer-border,
Expand All @@ -1323,7 +1323,7 @@ textfield */
}

#wizard-item-background-completed {
-fx-body-color: linear-gradient(to bottom, -bs-color-gray-1, -bs-color-gray-1);
-fx-body-color: linear-gradient(to bottom, -bs-content-background-gray, -bs-color-gray-aaa);
-fx-outer-border: linear-gradient(to bottom, -bs-bg-green, -bs-color-green-2);
-fx-background-color: -fx-shadow-highlight-color,
-fx-outer-border,
Expand Down Expand Up @@ -1523,7 +1523,7 @@ textfield */
* *
******************************************************************************/
.grid-pane {
-fx-background-color: -bs-background-gray;
-fx-background-color: -bs-content-background-gray;
-fx-background-radius: 5;
-fx-effect: null;
-fx-effect: dropshadow(gaussian, -bs-color-gray-10, 10, 0, 0, 0);
Expand Down
Loading

0 comments on commit 6cef6e0

Please sign in to comment.