From a2f0ba1984dac3acce7ce7345b0d9582646bc324 Mon Sep 17 00:00:00 2001 From: f43nd1r Date: Fri, 16 Nov 2018 02:09:56 +0100 Subject: [PATCH] replace footer with about & logo credits --- README.md | 10 ++++++++- .../com/faendir/acra/ui/base/popup/Popup.java | 1 + .../com/faendir/acra/ui/view/MainView.java | 22 ++++++++++++------- .../com/faendir/acra/messages_de.properties | 5 +++-- .../com/faendir/acra/messages_en.properties | 5 +++-- 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 9c51d70..264526e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ [![Build Status](https://travis-ci.org/F43nd1r/Acrarium.svg?branch=master)](https://travis-ci.org/F43nd1r/Acrarium) -# Acrarium (formerly Acra-backend) +

+ +

+ +# Acrarium A Backend for ACRA written in Java using Spring Boot, Vaadin and MySQL # Setup @@ -49,3 +53,7 @@ Binary distributions may contain dependencies licensed under any of the followin - [LGPL 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt) - [EPL 1.0](http://www.eclipse.org/legal/epl-v10.html) - [MPL 1.1](https://www.mozilla.org/en-US/MPL/1.1/) + +# Credits + + Thanks to [Mirza Zulfan](https://github.com/mirzazulfan) for creating the logo. diff --git a/src/main/java/com/faendir/acra/ui/base/popup/Popup.java b/src/main/java/com/faendir/acra/ui/base/popup/Popup.java index ac350dd..4d689d6 100644 --- a/src/main/java/com/faendir/acra/ui/base/popup/Popup.java +++ b/src/main/java/com/faendir/acra/ui/base/popup/Popup.java @@ -141,6 +141,7 @@ public class Popup extends Dialog { } }); FormLayout layout = new FormLayout(); + layout.setResponsiveSteps(new FormLayout.ResponsiveStep("0px", 1)); components.forEach(c -> layout.addFormItem(c, "")); checkValid(); removeAll(); diff --git a/src/main/java/com/faendir/acra/ui/view/MainView.java b/src/main/java/com/faendir/acra/ui/view/MainView.java index e75a79f..287810e 100644 --- a/src/main/java/com/faendir/acra/ui/view/MainView.java +++ b/src/main/java/com/faendir/acra/ui/view/MainView.java @@ -5,6 +5,7 @@ import com.faendir.acra.model.User; import com.faendir.acra.security.SecurityUtils; import com.faendir.acra.ui.base.ParentLayout; import com.faendir.acra.ui.base.Path; +import com.faendir.acra.ui.base.popup.Popup; import com.faendir.acra.ui.component.DropdownMenu; import com.faendir.acra.ui.component.FlexLayout; import com.faendir.acra.ui.component.Translatable; @@ -52,11 +53,11 @@ public class MainView extends ParentLayout { setAlignItems(Alignment.CENTER); setJustifyContentMode(JustifyContentMode.CENTER); setSizeFull(); - getStyle().set("flex-direction","column"); + getStyle().set("flex-direction", "column"); layout = new ParentLayout(); layout.setWidth("100%"); expand(layout); - layout.getStyle().set("overflow","hidden"); + layout.getStyle().set("overflow", "hidden"); setRouterRoot(layout); if (SecurityUtils.isLoggedIn()) { showMain(); @@ -77,7 +78,14 @@ public class MainView extends ParentLayout { Translatable