From b0982f07a63749f5fc1e8c78c3dcab98945a86de Mon Sep 17 00:00:00 2001
From: tomleb <tomlebreux@hotmail.com>
Date: Thu, 11 May 2017 17:54:53 -0400
Subject: [PATCH] Change color for bg-danger and fix night theme flickering
 issue (#370)

* Change color for bg-danger

* Fix annoying flickering with night theme

* use new class instead of overriding bootstrap's
---
 public/css/style-night.css   |  7 ++++++-
 public/css/style.css         |  5 +++++
 public/js/main.js            |  9 ++-------
 templates/_profile_edit.html | 14 +++++++-------
 templates/admin_index.html   | 14 ++++++++++++--
 templates/index.html         | 14 +++++++++++++-
 templates/user/login.html    |  4 ++--
 templates/user/register.html | 10 +++++-----
 8 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/public/css/style-night.css b/public/css/style-night.css
index 4209c410..01e46b5a 100644
--- a/public/css/style-night.css
+++ b/public/css/style-night.css
@@ -143,4 +143,9 @@ a:hover {
 }
 .modal-content .close {
     color: #fff;
-}
\ No newline at end of file
+}
+
+.text-error {
+  background: #29363d;
+  color: #cf9fff;
+}
diff --git a/public/css/style.css b/public/css/style.css
index db605fde..4df26ba4 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -383,3 +383,8 @@ footer {
 	font-size: smaller;
 	width: auto; /* Undo bootstrap's fixed width */
 }
+
+.text-error {
+  background: white;
+  color: #cf9fff;
+}
diff --git a/public/js/main.js b/public/js/main.js
index 1cc1c7b7..5d985acf 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -1,15 +1,10 @@
-// Night mode
 var night = localStorage.getItem("night");
-if (night == "true") {
-    $("head").append('<link id="style-dark" rel="stylesheet" type="text/css" href="/css/style-night.css">');
-}
-
 function toggleNightMode() {
     var night = localStorage.getItem("night");
     if(night == "true") {
-        $("#style-dark")[0].remove()
+        document.getElementById("style-dark").remove()
     } else {
-        $("head").append('<link id="style-dark" rel="stylesheet" type="text/css" href="/css/style-night.css">');
+        document.getElementsByTagName("head")[0].append(darkStyleLink);
     }
     localStorage.setItem("night", (night == "true") ? "false" : "true");
 }
diff --git a/templates/_profile_edit.html b/templates/_profile_edit.html
index fa560084..0493ad72 100644
--- a/templates/_profile_edit.html
+++ b/templates/_profile_edit.html
@@ -14,7 +14,7 @@
             <div class="col-lg-8">
               <input class="form-control" type="text" name="email" id="email" value="{{.Email}}">
 	 			{{ range (index $.FormErrors "email")}}
-					<p class="bg-danger">{{ . }}</p>
+					<p class="text-error">{{ . }}</p>
 				{{end}}
             </div>
           </div>
@@ -30,7 +30,7 @@
                 </select>
               </div>
 	 			{{ range (index $.FormErrors "language")}}
-					<p class="bg-danger">{{ . }}</p>
+					<p class="text-error">{{ . }}</p>
 				{{end}}
             </div>
           </div>
@@ -40,7 +40,7 @@
             <div class="col-md-8">
               <input class="form-control" name="current_password" id="current_password" type="password">
 	 			{{ range (index $.FormErrors "current_password")}}
-					<p class="bg-danger">{{ . }}</p>
+					<p class="text-error">{{ . }}</p>
 				{{end}}
             </div>
           </div>
@@ -50,7 +50,7 @@
             <div class="col-md-8">
               <input class="form-control" name="password" id="password" type="password">
 	 			{{ range (index $.FormErrors "password")}}
-					<p class="bg-danger">{{ . }}</p>
+					<p class="text-error">{{ . }}</p>
 				{{end}}
             </div>
           </div>
@@ -59,7 +59,7 @@
             <div class="col-md-8">
               <input class="form-control" name="password_confirmation" id="password_confirmation" type="password">
 	 			{{ range (index $.FormErrors "password_confirmation")}}
-					<p class="bg-danger">{{ . }}</p>
+					<p class="text-error">{{ . }}</p>
 				{{end}}
             </div>
           </div>
@@ -70,7 +70,7 @@
             <div class="col-md-8">
               <input class="form-control" name="username" id="username" type="text" value="{{.Username}}">
 	 			{{ range (index $.FormErrors "username")}}
-					<p class="bg-danger">{{ . }}</p>
+					<p class="text-error">{{ . }}</p>
 				{{end}}
             </div>
           </div>
@@ -88,7 +88,7 @@
                 </select>
               </div>
 	 			{{ range (index $.FormErrors "status")}}
-					<p class="bg-danger">{{ . }}</p>
+					<p class="text-error">{{ . }}</p>
 				{{end}}
             </div>
           </div>
diff --git a/templates/admin_index.html b/templates/admin_index.html
index 3943f9a3..11cb46c6 100644
--- a/templates/admin_index.html
+++ b/templates/admin_index.html
@@ -26,7 +26,18 @@
 
     <!-- Website CSS -->
     <link rel="stylesheet" id="style" href="{{.URL.Parse "/css/style.css"}}">
-
+    <script type="text/javascript">
+      // Night mode
+      var night = localStorage.getItem("night");
+      var darkStyleLink = document.createElement('link');
+      darkStyleLink.id = "style-dark";
+      darkStyleLink.rel = "stylesheet";
+      darkStyleLink.type = "text/css";
+      darkStyleLink.href = "/css/style-night.css"
+      if (night == "true") {
+          document.getElementsByTagName("head")[0].append(darkStyleLink);
+      }
+    </script>
   </head>
   <body>
       <nav class="navbar navbar-default" id="mainmenu">
@@ -77,7 +88,6 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
     <script type="text/javascript" charset="utf-8" src="{{.URL.Parse "/js/main.js"}}"></script>
 
-
         {{block "js_footer" .}}{{end}}
 </body>
 </html>
diff --git a/templates/index.html b/templates/index.html
index 5360a3ad..2bba8c54 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-	<title>Nyaa Pantsu - {{block "title" .}}{{ T "error_404" }}{{end}}</title>
+	  <title>Nyaa Pantsu - {{block "title" .}}{{ T "error_404" }}{{end}}</title>
     <link rel="icon" type="image/png" href="/img/favicon.png?v=3" />
 
     <!-- RSS Feed with Context -->
@@ -30,6 +30,18 @@
 
     <!-- Website CSS -->
     <link rel="stylesheet" id="style" href="{{.URL.Parse "/css/style.css"}}">
+    <script type="text/javascript">
+      // Night mode
+      var night = localStorage.getItem("night");
+      var darkStyleLink = document.createElement('link');
+      darkStyleLink.id = "style-dark";
+      darkStyleLink.rel = "stylesheet";
+      darkStyleLink.type = "text/css";
+      darkStyleLink.href = "/css/style-night.css"
+      if (night == "true") {
+          document.getElementsByTagName("head")[0].append(darkStyleLink);
+      }
+    </script>
   </head>
   <body>
       <nav class="navbar navbar-default" id="mainmenu">
diff --git a/templates/user/login.html b/templates/user/login.html
index 5523cd0a..1721b96c 100644
--- a/templates/user/login.html
+++ b/templates/user/login.html
@@ -14,13 +14,13 @@
 					<div class="form-group">
 	                    <input type="text" name="username" id="username" class="form-control input-lg" autofocus="" placeholder="{{ T "email_address_or_username"}}">
        	            	{{ range (index $.FormErrors "username")}}
-						<p class="bg-danger">{{ . }}</p>
+						<p class="text-error">{{ . }}</p>
 						{{end}}
 					</div>
 					<div class="form-group">
 	                    <input type="password" name="password" id="password" class="form-control input-lg" placeholder="{{ T "password"}}">
                			{{ range (index $.FormErrors "password")}}
-						<p class="bg-danger">{{ . }}</p>
+						<p class="text-error">{{ . }}</p>
 						{{end}}
 					</div>
 					<span class="button-checkbox">
diff --git a/templates/user/register.html b/templates/user/register.html
index 468fcf03..f5b3f310 100644
--- a/templates/user/register.html
+++ b/templates/user/register.html
@@ -14,13 +14,13 @@
 				<div class="form-group">
 					<input type="text" name="username" id="display_name" class="form-control input-lg" placeholder="{{T "username" }}" tabindex="1" value="{{ .Username }}">
    							{{ range (index $.FormErrors "username")}}
-   							<p class="bg-danger">{{ . }}</p>
+   							<p class="text-error">{{ . }}</p>
    							{{end}}
 				</div>
 				<div class="form-group">
 					<input type="email" name="email" id="email" class="form-control input-lg" placeholder="{{T "email_address" }}" tabindex="2" value="{{ .Email }}">
    							{{ range (index $.FormErrors "email")}}
-   							<p class="bg-danger">{{ . }}</p>
+   							<p class="text-error">{{ . }}</p>
    							{{end}}
 				</div>
 				<div class="row">
@@ -28,7 +28,7 @@
 						<div class="form-group">
 							<input type="password" name="password" id="password" class="form-control input-lg" placeholder="{{T "password" }}" tabindex="3" value="{{ .Password }}">
    							{{ range (index $.FormErrors "password")}}
-   							<p class="bg-danger">{{ . }}</p>
+   							<p class="text-error">{{ . }}</p>
    							{{end}}
    						</div>
 					</div>
@@ -36,7 +36,7 @@
 						<div class="form-group">
 							<input type="password" name="password_confirmation" id="password_confirmation" class="form-control input-lg" placeholder="{{T "confirm_password" }}" tabindex="4">
    							{{ range (index $.FormErrors "password_confirmation")}}
-   							<p class="bg-danger">{{ . }}</p>
+   							<p class="text-error">{{ . }}</p>
    							{{end}}
 						</div>
 					</div>
@@ -47,7 +47,7 @@
 							<button type="button" class="btn hidden" data-color="info" tabindex="5">{{T "i_agree" }}</button>
 	                        <input type="checkbox" name="t_and_c" id="t_and_c" value="1">
    							{{ range (index $.FormErrors "t_and_c")}}
-   							<p class="bg-danger">{{ . }}</p>
+   							<p class="text-error">{{ . }}</p>
    							{{end}}
 						</span>
 					</div>