changeset 1051:ce2983e07daf

Fix for broken ComboBox CSS that was introduced when ColorPicker was added. CSS should hopefully revert the ComboBox style without impacting on the ColorPicker style.
author jgiles
date Wed, 16 May 2012 11:06:12 +1200
parents 2bfebdcec3b3
children ba15de29d459
files javafx-ui-controls/src/com/sun/javafx/scene/control/skin/caspian/caspian.css
diffstat 1 files changed, 18 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/caspian/caspian.css	Wed May 16 10:26:49 2012 +1200
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/caspian/caspian.css	Wed May 16 11:06:12 2012 +1200
@@ -3039,11 +3039,16 @@
 
 /* ------- OPEN BUTTON ------- */
 .combo-box-base .arrow-button {
-    -fx-background-color: null;
+    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
     -fx-background-insets: 0, 1, 2;
     -fx-background-radius: 0 5 5 0, 0 4 4 0, 0 3 3 0;
-    -fx-padding: 0.5em 0.416667em 0.5em 0.416667em; /* 6 5 6 5 */
-}
+    -fx-padding: 0.5em 0.416667em 0.5em 0.416667em; /* 6 5 6 5  */
+}
+/*    -fx-background-color: null;
+    -fx-background-insets: 0, 1, 2;
+    -fx-background-radius: 0 5 5 0, 0 4 4 0, 0 3 3 0;
+    -fx-padding: 0.5em 0.416667em 0.5em 0.416667em;  6 5 6 5 
+}*/
 /*.combo-box-base.split-button .arrow-button {
     -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
     -fx-background-insets: 0, 1, 2;
@@ -3133,11 +3138,18 @@
     -fx-skin: "com.sun.javafx.scene.control.skin.ColorPickerSkin";
 }
 
+.color-picker .arrow-button {
+    -fx-background-color: null;
+    -fx-background-insets: 0, 1, 2;
+    -fx-background-radius: 0 5 5 0, 0 4 4 0, 0 3 3 0;
+    -fx-padding: 0.5em 0.416667em 0.5em 0.416667em; /* 6 5 6 5 */
+}
+
 .color-picker .color-picker-label .text {
     -fx-padding: 0.0em 0.833333em 0.0em 0.0em;  /* 0 10 0 0 */
 }
 
-.color-picker.split-button .arrow-button {
+.color-picker .split-button .arrow-button {
     -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
     -fx-background-insets: 0, 1, 2;
     -fx-background-radius: 0 5 5 0, 0 4 4 0, 0 3 3 0;
@@ -3148,11 +3160,11 @@
     -fx-color: -fx-base;
 }
 
-.color-picker.split-button .arrow-button:hover {
+.color-picker .split-button .arrow-button:hover {
     -fx-color: -fx-hover-base;
 }
 
-.color-picker.split-button .color-picker-label:hover {
+.color-picker .split-button .color-picker-label:hover {
      -fx-color: -fx-hover-base;
 }