From 09484e370dac3cba4a19a08d39ad5f21cdd730d3 Mon Sep 17 00:00:00 2001 From: rxdn <29165304+rxdn@users.noreply.github.com> Date: Fri, 8 Jan 2021 20:39:19 +0000 Subject: [PATCH] Fix bad merge --- public/templates/layouts/main.tmpl | 15 +++++++---- public/templates/views/index.tmpl | 40 ++++++++++++++++++------------ 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/public/templates/layouts/main.tmpl b/public/templates/layouts/main.tmpl index 92e59cc..d4306b9 100644 --- a/public/templates/layouts/main.tmpl +++ b/public/templates/layouts/main.tmpl @@ -4,10 +4,15 @@ {{template "head" .}} - {{template "sidebar" .}} - +
+ {{template "sidebar" .}} + {{template "sidebar" .}} +
+ {{template "loadingscreen" .}} + + {{template "notifymodal" .}} + {{template "content" .}} +
+
diff --git a/public/templates/views/index.tmpl b/public/templates/views/index.tmpl index d15c68e..8a5259b 100644 --- a/public/templates/views/index.tmpl +++ b/public/templates/views/index.tmpl @@ -1,21 +1,29 @@ {{define "content"}} -
-
-

Servers

-
-
-
-
-
- - Invite to your server -
-
+
+
+
+
+
+
+

Servers

+
+
+
+
+
+ + Invite to your server +
+
-
- +
+ +
+
+
+