Browse Source

Grid sidebar menu design changed. See design document and comments at trac ticket. (#18325)

Change-Id: I6686d131f015cf0b7b9a6b43ce43284218d5dd63
tags/7.6.0.alpha3^2
elmot 8 years ago
parent
commit
9734bc5dfa

+ 6
- 4
WebContent/VAADIN/themes/base/grid/grid.scss View File

outline: none; outline: none;
padding: 0 4px; padding: 0 4px;
text-align: right; text-align: right;
line-height: 1;


&::-moz-focus-inner { &::-moz-focus-inner {
border: 0; border: 0;
&.open { &.open {
.#{$primaryStyleName}-sidebar-button { .#{$primaryStyleName}-sidebar-button {
width: 100%; width: 100%;
&:after { &:after {
content: "\00d7";
font-size: 16px;
content: "\f0c9";
font-size: $v-grid-header-font-size;
line-height: 1; line-height: 1;
} }
} }
} }


.v-ie8 &.open .#{$primaryStyleName}-sidebar-button:after { .v-ie8 &.open .#{$primaryStyleName}-sidebar-button:after {
vertical-align: middle;
text-align: center;
display: inline; display: inline;
} }


.#{$primaryStyleName}-sidebar-content { .#{$primaryStyleName}-sidebar-content {
border-top: $v-grid-border;
padding: 4px 0; padding: 4px 0;


.gwt-MenuBar { .gwt-MenuBar {

+ 2
- 0
WebContent/VAADIN/themes/chameleon/components/components.scss View File

@import "accordion/accordion.scss"; @import "accordion/accordion.scss";
@import "button/button.scss"; @import "button/button.scss";
@import "colorpicker/colorpicker.scss"; @import "colorpicker/colorpicker.scss";
@import "grid/grid.scss";
@import "label/label.scss"; @import "label/label.scss";
@import "menubar/menubar.scss"; @import "menubar/menubar.scss";
@import "notification/notification.scss"; @import "notification/notification.scss";
@include chameleon-accordion; @include chameleon-accordion;
@include chameleon-button; @include chameleon-button;
@include chameleon-colorpicker; @include chameleon-colorpicker;
@include chameleon-grid;
@include chameleon-label; @include chameleon-label;
@include chameleon-menubar; @include chameleon-menubar;
@include chameleon-notification; @include chameleon-notification;

+ 12
- 0
WebContent/VAADIN/themes/chameleon/components/grid/grid.scss View File

@mixin chameleon-grid($primaryStyleName: v-grid) {

// Sidebar
.#{$primaryStyleName}-sidebar.v-contextmenu {

.v-on:before, .v-off:before {
content: none;
font-size: 0;
margin-right: 0;
}
}
}

+ 6
- 0
WebContent/VAADIN/themes/reindeer/grid/grid.scss View File

.#{$primaryStyleName}-sidebar-content { .#{$primaryStyleName}-sidebar-content {
background-color: #f8f8f9; background-color: #f8f8f9;
} }

.v-on:before, .v-off:before {
content: none;
font-size: 0;
margin-right: 0;
}
} }


// Sort indicators // Sort indicators

+ 7
- 8
WebContent/VAADIN/themes/runo/grid/grid.scss View File

// Sidebar // Sidebar
.#{$primaryStyleName}-sidebar.v-contextmenu { .#{$primaryStyleName}-sidebar.v-contextmenu {
&.open {
.#{$primaryStyleName}-sidebar-button {
&:after {
font-size: 22px;
}
}
}

.#{$primaryStyleName}-sidebar-content { .#{$primaryStyleName}-sidebar-content {
background-color: transparent; background-color: transparent;
border: none; border: none;
} }
} }

.v-on:before, .v-off:before {
content: none;
font-size: 0;
margin-right: 0;
}
} }


// Sort indicators // Sort indicators

+ 0
- 3
WebContent/VAADIN/themes/valo/components/_grid.scss View File

// Sidebar // Sidebar
.#{$primary-stylename}-sidebar.v-contextmenu { .#{$primary-stylename}-sidebar.v-contextmenu {
&.open { &.open {
.#{$primary-stylename}-sidebar-button:after {
font-size: 20px;
}


.#{$primary-stylename}-sidebar-content { .#{$primary-stylename}-sidebar-content {
margin: 0 0 2px; margin: 0 0 2px;

+ 0
- 1
client/src/com/vaadin/client/widgets/Grid.java View File

clickOutsideToCloseHandlerRegistration = Event clickOutsideToCloseHandlerRegistration = Event
.addNativePreviewHandler(clickOutsideToCloseHandler); .addNativePreviewHandler(clickOutsideToCloseHandler);
} }
openCloseButton.setHeight("");
} }


/** /**

+ 6
- 6
uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java View File

private void runTestSequence(String theme) throws IOException { private void runTestSequence(String theme) throws IOException {
openTestURL("theme=" + theme); openTestURL("theme=" + theme);


compareScreen(theme + "_SidebarClosed");
compareScreen(theme + "-SidebarClosed");
getSidebarOpenButton().click(); getSidebarOpenButton().click();


compareScreen(theme + "_SidebarOpen");
compareScreen(theme + "-SidebarOpen");


new Actions(getDriver()).moveToElement(getColumnHidingToggle(2), 5, 5) new Actions(getDriver()).moveToElement(getColumnHidingToggle(2), 5, 5)
.perform(); .perform();


compareScreen(theme + "_OnMouseOverNotHiddenToggle");
compareScreen(theme + "-OnMouseOverNotHiddenToggle");


getColumnHidingToggle(2).click(); getColumnHidingToggle(2).click();
getColumnHidingToggle(3).click(); getColumnHidingToggle(3).click();
.perform(); .perform();
; ;


compareScreen(theme + "_TogglesTriggered");
compareScreen(theme + "-TogglesTriggered");


new Actions(getDriver()).moveToElement(getColumnHidingToggle(2)) new Actions(getDriver()).moveToElement(getColumnHidingToggle(2))
.perform(); .perform();
; ;


compareScreen(theme + "_OnMouseOverHiddenToggle");
compareScreen(theme + "-OnMouseOverHiddenToggle");


getSidebarOpenButton().click(); getSidebarOpenButton().click();


compareScreen(theme + "_SidebarClosed2");
compareScreen(theme + "-SidebarClosed2");
} }


@Override @Override

Loading…
Cancel
Save