diff -r b04a69fea5fd javafx-ui-controls/src/com/sun/javafx/scene/control/skin/modena/modena.css --- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/modena/modena.css Mon Apr 29 15:26:26 2013 +0100 +++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/modena/modena.css Mon Apr 29 11:49:13 2013 -0700 @@ -155,6 +155,29 @@ CHART_COLOR_6: #9a42c8; CHART_COLOR_7: #c84164; CHART_COLOR_8: #888888; + /* Chart Color Palette Semi-Transparent + * These are used by charts that need semi transparent versions of the above colors, such as BubbleChart. They + * are exactly the same colors as above just with alpha + * + * 20% opacity + */ + CHART_COLOR_1_TRANS_20: #f3622d33; + CHART_COLOR_2_TRANS_20: #fba71b33; + CHART_COLOR_3_TRANS_20: #57b75733; + CHART_COLOR_4_TRANS_20: #41a9c933; + CHART_COLOR_5_TRANS_20: #4258c933; + CHART_COLOR_6_TRANS_20: #9a42c833; + CHART_COLOR_7_TRANS_20: #c8416433; + CHART_COLOR_8_TRANS_20: #88888833; + /* 70% opacity */ + CHART_COLOR_1_TRANS_70: #f3622db3; + CHART_COLOR_2_TRANS_70: #fba71bb3; + CHART_COLOR_3_TRANS_70: #57b757b3; + CHART_COLOR_4_TRANS_70: #41a9c9b3; + CHART_COLOR_5_TRANS_70: #4258c9b3; + CHART_COLOR_6_TRANS_70: #9a42c8b3; + CHART_COLOR_7_TRANS_70: #c84164b3; + CHART_COLOR_8_TRANS_70: #888888b3; /*************************************************************************** * * @@ -2703,14 +2726,14 @@ -fx-stroke: null; -fx-fill: #f9d90044; } -.default-color0.chart-series-area-fill { -fx-fill: CHART_COLOR_1; -fx-opacity: 0.2; } -.default-color1.chart-series-area-fill { -fx-fill: CHART_COLOR_2; -fx-opacity: 0.2; } -.default-color2.chart-series-area-fill { -fx-fill: CHART_COLOR_3; -fx-opacity: 0.2; } -.default-color3.chart-series-area-fill { -fx-fill: CHART_COLOR_4; -fx-opacity: 0.2; } -.default-color4.chart-series-area-fill { -fx-fill: CHART_COLOR_5; -fx-opacity: 0.2; } -.default-color5.chart-series-area-fill { -fx-fill: CHART_COLOR_6; -fx-opacity: 0.2; } -.default-color6.chart-series-area-fill { -fx-fill: CHART_COLOR_7; -fx-opacity: 0.2; } -.default-color7.chart-series-area-fill { -fx-fill: CHART_COLOR_8; -fx-opacity: 0.2; } +.default-color0.chart-series-area-fill { -fx-fill: CHART_COLOR_1_TRANS_20; } +.default-color1.chart-series-area-fill { -fx-fill: CHART_COLOR_2_TRANS_20; } +.default-color2.chart-series-area-fill { -fx-fill: CHART_COLOR_3_TRANS_20; } +.default-color3.chart-series-area-fill { -fx-fill: CHART_COLOR_4_TRANS_20; } +.default-color4.chart-series-area-fill { -fx-fill: CHART_COLOR_5_TRANS_20; } +.default-color5.chart-series-area-fill { -fx-fill: CHART_COLOR_6_TRANS_20; } +.default-color6.chart-series-area-fill { -fx-fill: CHART_COLOR_7_TRANS_20; } +.default-color7.chart-series-area-fill { -fx-fill: CHART_COLOR_8_TRANS_20; } .area-legend-symbol { -fx-padding: 6px; -fx-background-radius: 6px; /* makes sure this remains circular */ @@ -2731,14 +2754,14 @@ -fx-bubble-fill: #f9d900; -fx-background-color: radial-gradient(center 50% 50%, radius 80%, derive(-fx-bubble-fill,20%), derive(-fx-bubble-fill,-30%)); } -.default-color0.chart-bubble { -fx-bubble-fill: CHART_COLOR_1; -fx-opacity: 0.7; } -.default-color1.chart-bubble { -fx-bubble-fill: CHART_COLOR_2; -fx-opacity: 0.7; } -.default-color2.chart-bubble { -fx-bubble-fill: CHART_COLOR_3; -fx-opacity: 0.7; } -.default-color3.chart-bubble { -fx-bubble-fill: CHART_COLOR_4; -fx-opacity: 0.7; } -.default-color4.chart-bubble { -fx-bubble-fill: CHART_COLOR_5; -fx-opacity: 0.7; } -.default-color5.chart-bubble { -fx-bubble-fill: CHART_COLOR_6; -fx-opacity: 0.7; } -.default-color6.chart-bubble { -fx-bubble-fill: CHART_COLOR_7; -fx-opacity: 0.7; } -.default-color7.chart-bubble { -fx-bubble-fill: CHART_COLOR_8; -fx-opacity: 0.7; } +.default-color0.chart-bubble { -fx-bubble-fill: CHART_COLOR_1_TRANS_70; } +.default-color1.chart-bubble { -fx-bubble-fill: CHART_COLOR_2_TRANS_70; } +.default-color2.chart-bubble { -fx-bubble-fill: CHART_COLOR_3_TRANS_70; } +.default-color3.chart-bubble { -fx-bubble-fill: CHART_COLOR_4_TRANS_70; } +.default-color4.chart-bubble { -fx-bubble-fill: CHART_COLOR_5_TRANS_70; } +.default-color5.chart-bubble { -fx-bubble-fill: CHART_COLOR_6_TRANS_70; } +.default-color6.chart-bubble { -fx-bubble-fill: CHART_COLOR_7_TRANS_70; } +.default-color7.chart-bubble { -fx-bubble-fill: CHART_COLOR_8_TRANS_70; } /******************************************************************************* * *