diff options
4 files changed, 114 insertions, 0 deletions
diff --git a/tests/screenshots b/tests/screenshots -Subproject c87c64ec9448df91164efd72cfe62791c148e0c +Subproject f11893e9d3a12945497d47ae0ed0d45d0103ccc diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss index c06d3c2441..6e8204aeb0 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss @@ -53,25 +53,42 @@ $v-component-group-spacing: null !default; @if $v-border-radius > 0 { .v-widget ~ .v-widget:not(:last-child) { border-radius: 0; + &.v-upload .v-button { + border-radius: 0; + } } .v-widget:last-child { border-top-left-radius: 0; border-bottom-left-radius: 0; + &.v-upload .v-button { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } } .v-widget:first-child, .v-caption:first-child + .v-widget { border-top-right-radius: 0; border-bottom-right-radius: 0; + &.v-upload .v-button { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } } .v-widget ~ .v-widget.first.first { border-radius: $v-border-radius 0 0 $v-border-radius; + &.v-upload .v-button { + border-radius: $v-border-radius 0 0 $v-border-radius; + } } .v-widget ~ .v-widget.last.last { border-radius: 0 $v-border-radius $v-border-radius 0; + &.v-upload .v-button { + border-radius: 0 $v-border-radius $v-border-radius 0; + } } } diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/LayoutComponentGroup.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/LayoutComponentGroup.java new file mode 100644 index 0000000000..bbd568962c --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/LayoutComponentGroup.java @@ -0,0 +1,66 @@ +/* + * Copyright 2000-2016 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.themes.valo; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Component; +import com.vaadin.ui.CssLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Upload; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.ValoTheme; + +public class LayoutComponentGroup extends AbstractTestUI { + + private VerticalLayout container; + + @Override + protected void setup(VaadinRequest request) { + + addComponent(new Label( + "Test contains alternating rows with Button and Upload")); + container = new VerticalLayout(); + container.setSizeUndefined(); + container.setSpacing(false); + container.setId("container"); + + createLayout("button", new Button("Upload")); + createLayout("upload", new Upload()); + createLayout("button", new Button("Before"), new Button("Upload")); + createLayout("upload", new Button("Before"), new Upload()); + createLayout("button", new Button("Before"), new Button("Upload"), + new Button("After")); + createLayout("upload", new Button("Before"), new Upload(), + new Button("After")); + + addComponent(container); + + } + + private void createLayout(String info, Component... components) { + CssLayout mainMenuLayout = new CssLayout(); + mainMenuLayout.addStyleName(ValoTheme.LAYOUT_COMPONENT_GROUP); + + for (Component c : components) { + mainMenuLayout.addComponent(c); + } + container.addComponent(mainMenuLayout); + + } + +} diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/LayoutComponentGroupTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/LayoutComponentGroupTest.java new file mode 100644 index 0000000000..8d6bb9cc7c --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/LayoutComponentGroupTest.java @@ -0,0 +1,31 @@ +/* + * Copyright 2000-2016 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.themes.valo; + +import org.junit.Test; + +import com.vaadin.testbench.elements.VerticalLayoutElement; +import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; + +public class LayoutComponentGroupTest extends SingleBrowserTestPhantomJS2 { + + @Test + public void renderedWithoutRoundedBordersInTheMiddle() throws Exception { + openTestURL(); + compareScreen($(VerticalLayoutElement.class).id("container"), + "buttongroups"); + } +} |