From 9890a1d018f0728d395430a0570220f91ccfc6f3 Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Fri, 15 Jul 2016 17:39:51 +0200 Subject: [PATCH] Insert space between buttons and window bottom Signed-off-by: Melanie Retter --- .../java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java | 3 +-- .../VAADIN/themes/hawkbit/customstyles/popup-common.scss | 1 + .../VAADIN/themes/hawkbit/customstyles/popup-window.scss | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java index 8e71e7adb..3108455dd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java @@ -378,11 +378,10 @@ public class CommonDialogWindow extends Window implements Serializable { buttonsLayout = new HorizontalLayout(); buttonsLayout.setSizeFull(); buttonsLayout.setSpacing(true); + buttonsLayout.addStyleName("actionButtonsMargin"); createSaveButton(); - createCancelButton(); - buttonsLayout.addStyleName("actionButtonsMargin"); addHelpLink(); diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss index b8e6b1755..297524544 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss @@ -56,4 +56,5 @@ .marginTop { margin-top: 20px !important; } + } diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss index 0a00f463c..f4869665c 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss @@ -164,5 +164,6 @@ .actionButtonsMargin { margin-top: 30px; + margin-bottom: 10px; } }