changeset 6152:9a98b0b89f23

RT-25256: Charts - Labels/Legends don't have readable colors, when background is dark.
author jgiles
date Tue, 21 Jan 2014 09:50:22 +1300
parents b337db636594
children 2abb15915443
files modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css	Mon Jan 20 09:55:11 2014 +0100
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css	Tue Jan 21 09:50:22 2014 +1300
@@ -2819,7 +2819,8 @@
     -fx-font-size: 1.4em;
 }
 .chart-legend {
-   -fx-background-color:  #cccccc, #eeeeee;
+   -fx-background-color: ladder(-fx-background, derive(-fx-box-border, -10%) 50%, derive(-fx-box-border, 10%) 51%),
+                         ladder(-fx-background, derive(-fx-control-inner-background, 5%) 50%, derive(-fx-control-inner-background, -5%) 51%);
    -fx-background-insets: 0,1;
    -fx-background-radius: 6,5;
    -fx-padding: 6px;
@@ -3068,6 +3069,7 @@
 }
 .chart-pie-label {
     -fx-padding: 3px;
+    -fx-fill: -fx-text-base-color;
 }
 .chart-pie-label-line {
     -fx-stroke: #aaaaaa;
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css	Mon Jan 20 09:55:11 2014 +0100
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css	Tue Jan 21 09:50:22 2014 +1300
@@ -2829,6 +2829,7 @@
 }
 .chart-pie-label {
     -fx-padding: 3px;
+    -fx-fill: -fx-text-base-color;
 }
 .chart-pie-label-line {
     -fx-stroke: derive(-fx-background,-20%);