diff options
5 files changed, 9 insertions, 9 deletions
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss index ede4ccca0d..21ed1ed8d2 100644 --- a/WebContent/VAADIN/themes/base/grid/grid.scss +++ b/WebContent/VAADIN/themes/base/grid/grid.scss @@ -125,7 +125,7 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co border-radius: 0; } - &.opened { + &.open { .#{$primaryStyleName}-sidebar-button { width: 100%; @@ -137,11 +137,11 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co } } - .v-ie &.opened .#{$primaryStyleName}-sidebar-button { + .v-ie &.open .#{$primaryStyleName}-sidebar-button { vertical-align: middle; } - .v-ie8 &.opened .#{$primaryStyleName}-sidebar-button:after { + .v-ie8 &.open .#{$primaryStyleName}-sidebar-button:after { display: inline; } diff --git a/WebContent/VAADIN/themes/runo/grid/grid.scss b/WebContent/VAADIN/themes/runo/grid/grid.scss index 71ec6e06e0..aca9821c53 100644 --- a/WebContent/VAADIN/themes/runo/grid/grid.scss +++ b/WebContent/VAADIN/themes/runo/grid/grid.scss @@ -30,7 +30,7 @@ // Sidebar .#{$primaryStyleName}-sidebar.v-contextmenu { - &.opened { + &.open { .#{$primaryStyleName}-sidebar-button { &:after { font-size: 22px; diff --git a/WebContent/VAADIN/themes/valo/components/_grid.scss b/WebContent/VAADIN/themes/valo/components/_grid.scss index c07d330410..c7a3def042 100644 --- a/WebContent/VAADIN/themes/valo/components/_grid.scss +++ b/WebContent/VAADIN/themes/valo/components/_grid.scss @@ -190,7 +190,7 @@ $v-grid-details-border-bottom-stripe: $v-grid-cell-horizontal-border !default; // Sidebar .#{$primary-stylename}-sidebar.v-contextmenu { - &.opened { + &.open { .#{$primary-stylename}-sidebar-button:after { font-size: 20px; } diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java index dbf7f98e37..bf0ab5a83b 100644 --- a/client/src/com/vaadin/client/widgets/Grid.java +++ b/client/src/com/vaadin/client/widgets/Grid.java @@ -3175,7 +3175,7 @@ public class Grid<T> extends ResizeComposite implements */ public void open() { if (!isOpen() && isInDOM()) { - addStyleName("opened"); + addStyleName("open"); removeStyleName("closed"); rootContainer.add(content); clickOutsideToCloseHandlerRegistration = Event @@ -3189,7 +3189,7 @@ public class Grid<T> extends ResizeComposite implements */ public void close() { if (isOpen()) { - removeStyleName("opened"); + removeStyleName("open"); addStyleName("closed"); content.removeFromParent(); // adjust open button to header height when closed diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java index bed8db6f47..a307aaca16 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java @@ -1012,12 +1012,12 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { private void verifySidebarOpened() { WebElement sidebar = getSidebar(); - assertTrue(sidebar.getAttribute("class").contains("opened")); + assertTrue(sidebar.getAttribute("class").contains("open")); } private void verifySidebarClosed() { WebElement sidebar = getSidebar(); - assertFalse(sidebar.getAttribute("class").contains("opened")); + assertFalse(sidebar.getAttribute("class").contains("open")); } private void verifySidebarNotVisible() { |