From 6aaade8698e94c97629d8408c7c9060871754b21 Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Thu, 22 Dec 2016 09:36:26 +0100 Subject: [PATCH] Change HorizontalLayout of HawkbitUI to Panel and beautify Panel (#400) Signed-off-by: Melanie Retter --- .../src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java | 7 ++++--- .../VAADIN/themes/hawkbit/customstyles/common.scss | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java index 56aa551c6..fa9fa76be 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java @@ -46,6 +46,7 @@ import com.vaadin.ui.CssLayout; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.Panel; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.ValoTheme; @@ -144,10 +145,10 @@ public class HawkbitUI extends DefaultHawkbitUI implements DetachListener { viewHeadercontent.addComponent(notificationUnreadButton); viewHeadercontent.setComponentAlignment(notificationUnreadButton, Alignment.MIDDLE_RIGHT); - final HorizontalLayout content = new HorizontalLayout(); - contentVerticalLayout.addComponent(content); - content.setStyleName("view-content"); + final Panel content = new Panel(); content.setSizeFull(); + content.setStyleName("view-content"); + contentVerticalLayout.addComponent(content); rootLayout.setExpandRatio(contentVerticalLayout, 1.0F); contentVerticalLayout.setStyleName("main-content"); diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss index 7ef9d6a1b..7cddd1063 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss @@ -52,6 +52,9 @@ padding-left: 20px; min-width: 1000px; min-height: 400px; + border: 0px; + background-color: transparent; + box-shadow: none; } //View background styles