Light theme color scheme fixes

bisq-network · Mar 25, 2019 · 1b7b591 · 1b7b591
1 parent 8ed3629
commit 1b7b591
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/desktop/src/main/resources/styles/_ui-elements.scss b/desktop/src/main/resources/styles/_ui-elements.scss
@@ -125,7 +125,7 @@
 }
 
 .jfx-button, .action-button {
-    -fx-background-color: -bs-color-gray-3;
+    -fx-background-color: -bs-color-gray-2;
     -fx-text-fill: -bs-rd-font-dark-gray;
     -fx-font-size: 0.923em;
     -fx-font-weight: normal;
@@ -190,14 +190,14 @@
     -fx-background-color: -bs-background-gray;
 
     .list-cell {
-        -fx-background-color: -bs-background-gray;
+        -fx-background-color: -bs-background-color;
 
         &:odd {
-            -fx-background-color: derive(-bs-background-color, -10%);
+            -fx-background-color: derive(-bs-background-color, -5%);
         }
 
         &:even {
-            -fx-background-color: derive(-bs-background-color, 0%);
+            -fx-background-color: derive(-bs-background-color, 5%);
         }
 
         .text {
@@ -226,6 +226,16 @@
     -fx-background-color: -fx-selection-bar;
 }
 
+.list-view:focused,
+.tree-view:focused,
+.table-view:focused,
+.tree-table-view:focused,
+.table-view:focused,
+.tree-table-view:focused {
+    -fx-background-insets: 0;
+    -fx-background-color: $color-primary;
+}
+
 /* Selected rows */
 .list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
 .tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:filled:selected,
@@ -248,7 +258,7 @@
 
 .jfx-text-field {
     -jfx-focus-color: -bs-color-primary;
-    -fx-background-color: -bs-background-gray;
+    -fx-background-color: -bs-color-gray-0;
     -fx-text-fill: -bs-rd-font-dark;
     -fx-background-radius: 3 3 0 0;
     -fx-padding: 0.333333em 0.333333em 0.333333em 0.333333em;
@@ -383,6 +393,9 @@
     -fx-background-radius: 15;
     -fx-pref-width: 15;
     -fx-pref-height: 15;
+    .text {
+        -fx-fill: -bs-background-color;
+    }
 }
 
 .jfx-badge .badge-pane {

diff --git a/desktop/src/main/resources/styles/theme-light.scss b/desktop/src/main/resources/styles/theme-light.scss
@@ -1,7 +1,7 @@
 
 @import "_base-colors";
 
-$text-color: #000000;
+$text-color: #0a0a0a;
 $background-color: #ffffff;
 $background-color-gray: $color-gray-1;
 
@@ -35,24 +35,24 @@ $background-color-gray: $color-gray-1;
     -bs-rd-nav-border-color: rgba($background-color, 0.31);
 
     // Tab header
-    -bs-rd-tab-border: $color-gray-1;
+    -bs-rd-tab-border: derive($color-gray-0, -5%);
     -bs-tab-content-area: $background-color;
     //-bs-viewport-background: blue;
 
     // Content pane
     -bs-color-gray-background: $color-gray-0;
     -bs-content-pane-bg-top: $color-gray-0;
-    -bs-content-pane-bg-bottom: $color-gray-2;
+    -bs-content-pane-bg-bottom: derive($color-gray-0, -2%);
 
     // TODO Scrollbar on Settings
     -bs-scroll-pane-background: transparent;
     -bs-tab-content-area: transparent;
     -bs-viewport-background: transparent;
 
     // Footer pane
-    -bs-footer-pane-background: $color-gray-4;
+    -bs-footer-pane-background: $color-gray-1;
     -bs-footer-pane-text: $color-gray-11;
-    -bs-footer-pane-line: $color-gray-4;
+    -bs-footer-pane-line: $color-gray-1;
 
     -bs-rd-font-balance: $color-gray-11;
     -bs-rd-font-dark-gray: $color-gray-10;
@@ -66,8 +66,8 @@ $background-color-gray: $color-gray-1;
     -bs-text-color-transparent-dark: rgba($color-gray-11, 0.54);
     -bs-text-color-transparent: rgba($color-gray-11, 0.2);
     -bs-color-gray-line: $color-gray-6;
-    -bs-rd-separator: $color-gray-2;
-    -bs-rd-separator-dark: darken($color-gray-2, 10%);
+    -bs-rd-separator: $color-gray-1;
+    -bs-rd-separator-dark: derive($color-gray-0, -5%);
     -bs-rd-error-red: $color-red-1;
     -bs-rd-message-bubble: $color-blue-6;
     -bs-toggle-selected: $color-gray-6;