From 46c7b3be110a6f5ee77837ae4cbbccb1a15ab313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= <j.wielicki@sotecware.net>
Date: Thu, 28 Jan 2021 17:52:54 +0100
Subject: [PATCH] Relayout the "welcome" screens again

Grouping the buttons together with the text for easier grasping
what they relate to and moving them to the bottom.
---
 snikket_web/scss/app.scss             |  8 ++++++++
 snikket_web/templates/admin_home.html | 16 ++++++++--------
 snikket_web/templates/user_home.html  | 16 ++++++++--------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/snikket_web/scss/app.scss b/snikket_web/scss/app.scss
index 9dcb127..b15b34d 100644
--- a/snikket_web/scss/app.scss
+++ b/snikket_web/scss/app.scss
@@ -1168,14 +1168,22 @@ nav.welcome {
 		padding: 0;
 
 		> li {
+			@extend .el-3;
+			background-color: white;
+
 			flex: 1 0 $w-l7;
 			margin: $w-s1;
 			padding: $w-s1 $w-l1;
 			text-align: center;
 			max-width: $w-l8;
 
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+
 			.button {
 				display: block;
+				margin: $w-l1 0;
 			}
 
 			img {
diff --git a/snikket_web/templates/admin_home.html b/snikket_web/templates/admin_home.html
index 4f49081..a39d674 100644
--- a/snikket_web/templates/admin_home.html
+++ b/snikket_web/templates/admin_home.html
@@ -6,33 +6,33 @@
 	<ul>
 		<li>
 			{#- -#}
-			<div><a class="button primary" href="{{ url_for(".users") }}">{% trans %}Users{% endtrans %}</a></div>
+			<p>{% trans %}Create password reset links or delete users.{% endtrans %}</p>
 			{#- -#}
 			{# <img aria-hidden="true" src="{{ url_for("static", filename="img/illus-profile.svg") }}"> #}
 			{#- -#}
-			<p>{% trans %}Create password reset links or delete users.{% endtrans %}</p>
+			<div><a class="button primary" href="{{ url_for(".users") }}">{% trans %}Users{% endtrans %}</a></div>
 			{#- -#}
 		</li>
 		<li>
-			{#- -#}
-			<div><a class="button primary" href="{{ url_for(".circles") }}">{% trans %}Circles{% endtrans %}</a></div>
 			{#- -#}
 			<p>{% trans %}Create and manage social circles represented on your service.{% endtrans %}</p>
 			{#- -#}
+			<div><a class="button primary" href="{{ url_for(".circles") }}">{% trans %}Circles{% endtrans %}</a></div>
+			{#- -#}
 		</li>
 		<li>
-			{#- -#}
-			<div><a class="button primary" href="{{ url_for(".invitations") }}">{% trans %}Invitations{% endtrans %}</a></div>
 			{#- -#}
 			<p>{% trans %}Create, revoke or copy invitations.{% endtrans %}</p>
 			{#- -#}
+			<div><a class="button primary" href="{{ url_for(".invitations") }}">{% trans %}Invitations{% endtrans %}</a></div>
+			{#- -#}
 		</li>
 		<li>
-			{#- -#}
-			<div><a class="button secondary" href="{{ url_for("user.index") }}">{% trans %}Exit Admin Panel{% endtrans %}</a></div>
 			{#- -#}
 			<p>{% trans %}Go back to your user’s web portal page.{% endtrans %}</p>
 			{#- -#}
+			<div><a class="button secondary" href="{{ url_for("user.index") }}">{% trans %}Exit Admin Panel{% endtrans %}</a></div>
+			{#- -#}
 		</li>
 	</ul>
 </nav>
diff --git a/snikket_web/templates/user_home.html b/snikket_web/templates/user_home.html
index 32b7ae7..b45d736 100644
--- a/snikket_web/templates/user_home.html
+++ b/snikket_web/templates/user_home.html
@@ -6,35 +6,35 @@
 	<ul>
 		<li>
 			{#- -#}
-			<div><a class="button primary" href="{{ url_for(".profile") }}">{% trans %}Settings{% endtrans %}</a></div>
+			<p>{% trans %}Change your display name, set a profile picture and control visibility of your personal data to others.{% endtrans %}</p>
 			{#- -#}
 			{# <img aria-hidden="true" src="{{ url_for("static", filename="img/illus-profile.svg") }}"> #}
 			{#- -#}
-			<p>{% trans %}Change your display name, set a profile picture and control visibility of your personal data to others.{% endtrans %}</p>
+			<div><a class="button primary" href="{{ url_for(".profile") }}">{% trans %}Settings{% endtrans %}</a></div>
 			{#- -#}
 		</li>
 		<li>
-			{#- -#}
-			<div><a class="button primary" href="{{ url_for(".profile") }}">{% trans %}Change password{% endtrans %}</a></div>
 			{#- -#}
 			<p>{% trans %}If need be, you can change your password here.{% endtrans %}</p>
 			{#- -#}
+			<div><a class="button primary" href="{{ url_for(".profile") }}">{% trans %}Change password{% endtrans %}</a></div>
+			{#- -#}
 		</li>
 {% if user_info.is_admin %}
 		<li>
-			{#- -#}
-			<div><a class="button primary" href="{{ url_for("admin.index") }}">{% trans %}Admin panel{% endtrans %}</a></div>
 			{#- -#}
 			<p>{% trans %}Manage users, invitations and circles of your Snikket service.{% endtrans %}</p>
 			{#- -#}
+			<div><a class="button primary" href="{{ url_for("admin.index") }}">{% trans %}Admin panel{% endtrans %}</a></div>
+			{#- -#}
 		</li>
 {% endif %}
 		<li>
-			{#- -#}
-			<div><a class="button secondary" href="{{ url_for(".logout") }}">{% trans %}Log out{% endtrans %}</a></div>
 			{#- -#}
 			<p>{% trans %}Exit the Snikket Web Portal, without logging out your other devices.{% endtrans %}</p>
 			{#- -#}
+			<div><a class="button secondary" href="{{ url_for(".logout") }}">{% trans %}Log out{% endtrans %}</a></div>
+			{#- -#}
 		</li>
 	</ul>
 </nav>