# HG changeset patch # Parent 5c4df3d3ef9cb8d1a9e333d7258a10ef0912b48a RT-38138: -fx-spacing used wrong in .menubar in modena.css diff -r 5c4df3d3ef9c modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css --- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css Mon Aug 04 16:46:27 2014 -0400 +++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css Tue Aug 05 13:50:44 2014 -0400 @@ -861,13 +861,14 @@ .menu-bar { -fx-padding: 0.0em 0.666667em 0.0em 0.666667em; /* 0 8 0 8 */ - -fx-spacing: 0.166667em; /* 2 */ -fx-base: derive(#d0d0d0,-70%); -fx-background-color: linear-gradient(to bottom, derive(-fx-color,50%), derive(-fx-color,-30%)), -fx-body-color; -fx-background-insets: 0, 1 0 1 0; -fx-background-radius: 0, 0 ; } - +.menu-bar > .container { + -fx-spacing: 0.166667em; /* 2 */ +} /* Show nothing for background of normal menu button in a menu bar */ .menu-bar > .container > .menu-button { -fx-background-radius: 0; diff -r 5c4df3d3ef9c modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css --- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css Mon Aug 04 16:46:27 2014 -0400 +++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css Tue Aug 05 13:50:44 2014 -0400 @@ -1487,13 +1487,15 @@ .menu-bar { -fx-padding: 0.0em 0.666667em 0.0em 0.666667em; /* 0 8 0 8 */ - -fx-spacing: 0.166667em; /* 2 */ -fx-background-color: linear-gradient(to bottom, derive(-fx-base,75%) 0%, -fx-outer-border 90%), linear-gradient(to bottom, derive(-fx-base,46.9%) 2%, derive(-fx-base,-2.1%) 95%); -fx-background-insets: 0 0 0 0, 1 0 1 0; -fx-background-radius: 0, 0 ; } +.menu-bar > .container { + -fx-spacing: 0.166667em; /* 2 */ +} /* Show nothing for background of normal menu button in a menu bar */ .menu-bar > .container > .menu-button { -fx-background-radius: 0;