diff options
author | Teppo Kurki <teppo.kurki@vaadin.com> | 2014-12-15 15:53:03 +0200 |
---|---|---|
committer | Sauli Tähkäpää <sauli@vaadin.com> | 2015-01-05 12:12:30 +0200 |
commit | 0d401a70d1615a4440ce14e440e49ef37db8df86 (patch) | |
tree | 046fb30a837d536a1231ab59f6d9b43660269510 /uitest | |
parent | 2dc2955eef14d9fcb4a03035a84000ae001f5dad (diff) | |
download | vaadin-framework-0d401a70d1615a4440ce14e440e49ef37db8df86.tar.gz vaadin-framework-0d401a70d1615a4440ce14e440e49ef37db8df86.zip |
Fixes unnecessary padding-top added to all responsive UIs (#14679)
When using Valo theme and Responsive extension, all responsive UIs get a padding-top even though it should be only added when a Valo Menu is present in the UI. Added a stylename which has to be added to any responsive UIs containing a Valo Menu.
Change-Id: Ib3e3c5341bef03c174accb01401b4a90c1deb29e
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java | 79 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java | 47 |
2 files changed, 126 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java new file mode 100644 index 0000000000..e80686f6f3 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java @@ -0,0 +1,79 @@ +/* + * Copyright 2000-2014 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.components.ui; + +import com.vaadin.annotations.Theme; +import com.vaadin.server.Responsive; +import com.vaadin.server.VaadinRequest; +import com.vaadin.ui.Button; +import com.vaadin.ui.CssLayout; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.UI; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.ValoTheme; + +/** + * + * @since + * @author Vaadin Ltd + */ +@Theme("valo") +public class UnnecessaryPaddingInResponsiveUI extends UI { + + @Override + protected void init(VaadinRequest request) { + Responsive.makeResponsive(this); + + HorizontalLayout root = new HorizontalLayout(); + root.setSpacing(true); + + MenuLayout menu = new MenuLayout(); + + root.addComponent(menu); + + setContent(root); + + setWidth(799, Unit.PIXELS); + setId("UI"); + + // Uncomment this to enable responsive features in Valo Menu and + // introduce a padding-top to the UI. When this is commented the + // padding-top should be 0 and the related test should pass. + + // addStyleName(ValoTheme.UI_WITH_MENU); + } + + class MenuLayout extends VerticalLayout { + public MenuLayout() { + setSizeFull(); + setPrimaryStyleName(ValoTheme.MENU_ROOT); + + CssLayout titleLo = new CssLayout(); + titleLo.addStyleName(ValoTheme.MENU_TITLE); + titleLo.addComponent(new Label("menu-title")); + + addComponent(titleLo); + + for (int i = 1; i <= 5; i++) { + Button button = new Button("Menu Item " + i); + button.setPrimaryStyleName(ValoTheme.MENU_ITEM); + addComponent(button); + } + } + + } +}
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java new file mode 100644 index 0000000000..661db179e7 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java @@ -0,0 +1,47 @@ +/* + * Copyright 2000-2014 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.components.ui; + +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertThat; + +import org.junit.Test; +import org.openqa.selenium.WebElement; + +import com.vaadin.tests.tb3.SingleBrowserTest; + +/** + * + * @since + * @author Vaadin Ltd + */ +public class UnnecessaryPaddingInResponsiveUITest extends SingleBrowserTest { + + @Test + public void testUIShouldHaveNoPaddingTop() { + openTestURL(); + + WebElement ui = vaadinElementById("UI"); + + String paddingTop = ui.getCssValue("padding-top"); + + Integer paddingHeight = Integer.parseInt(paddingTop.substring(0, + paddingTop.length() - 2)); + + assertThat(paddingHeight, equalTo(0)); + + } +} |