From e62cca886cecd87c90d4157ecb5dc7b6a6b9c0d6 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Tue, 6 Nov 2018 14:54:22 +0100
Subject: [PATCH] fix login & setup page

---
 src/views/login.ejs | 68 +++++++++++++++++++++------------------------
 src/views/setup.ejs |  4 +--
 2 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/src/views/login.ejs b/src/views/login.ejs
index 59684efa2..a6d0931f1 100644
--- a/src/views/login.ejs
+++ b/src/views/login.ejs
@@ -5,48 +5,44 @@
     <title>Login</title>
   </head>
   <body>
-    <div class="container">
-        <div class="row">
-            <div class="col-md-4 col-md-offset-4">
-                <h1>Trilium login</h1>
+    <div style="width: 400px; margin: auto; padding-top: 30px;">
+        <h1>Trilium login</h1>
 
-                <% if (failedAuth) { %>
-                <div class="alert alert-warning">
-                    Username and / or password are incorrect. Please try again.
-                </div>
-                <% } %>
-
-                <form action="login" method="POST">
-                    <div class="form-group">
-                        <label for="username">Username</label>
-                        <div class="controls">
-                            <input id="username" name="username" placeholder="" class="form-control" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="password">Password</label>
-                        <div class="controls">
-                            <input id="password" name="password" placeholder="" class="form-control" type="password">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="checkbox">
-                            <label>
-                                <input id="remember-me" name="remember_me" value="1" type="checkbox"> Remember me
-                            </label>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <button class="btn btn-success">Login</button>
-                    </div>
-                </form>
-            </div>
+        <% if (failedAuth) { %>
+        <div class="alert alert-warning">
+            Username and / or password are incorrect. Please try again.
         </div>
+        <% } %>
+
+        <form action="login" method="POST">
+            <div class="form-group">
+                <label for="username">Username</label>
+                <div class="controls">
+                    <input id="username" name="username" placeholder="" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="password">Password</label>
+                <div class="controls">
+                    <input id="password" name="password" placeholder="" class="form-control" type="password">
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        <input id="remember-me" name="remember_me" value="1" type="checkbox"> Remember me
+                    </label>
+                </div>
+            </div>
+            <div class="form-group">
+                <button class="btn btn-success">Login</button>
+            </div>
+        </form>
     </div>
 
     <!-- Required for correct loading of scripts in Electron -->
     <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
 
-    <link href="libraries/bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
   </body>
 </html>
\ No newline at end of file
diff --git a/src/views/setup.ejs b/src/views/setup.ejs
index b5379c321..86646475e 100644
--- a/src/views/setup.ejs
+++ b/src/views/setup.ejs
@@ -124,8 +124,8 @@
 
 <script src="libraries/jquery.min.js"></script>
 
-<link href="libraries/bootstrap/css/bootstrap.css" rel="stylesheet">
-<script src="libraries/bootstrap/js/bootstrap.js"></script>
+<link href="libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+<script src="libraries/bootstrap/js/bootstrap.min.js"></script>
 
 <script src="/libraries/knockout.min.js"></script>
 
