Albirew/nyaa-pantsu
Albirew/nyaa-pantsu
Archivé
1
0
Bifurcation 0
Code Activité

Change color for bg-danger and fix night theme flickering issue (#370)

Parcourir la source 
* Change color for bg-danger

* Fix annoying flickering with night theme

* use new class instead of overriding bootstrap's
Cette révision appartient à :
tomleb 2017-05-11 17:54:53 -04:00 révisé par Austin
Parent b6b2d836c0
révision b0982f07a6
8 fichiers modifiés avec 52 ajouts et 25 suppressions
Voir les statistiques Télécharger le patch en tant que fichier Télécharger le fichier diff Développer tous les fichiers Réduire tous les fichiers

7
public/css/style-night.css
Voir le fichier

@ -143,4 +143,9 @@ a:hover {
} }
.modal-content .close { .modal-content .close {
color: #fff; color: #fff;
} }
.text-error {
background: #29363d;
color: #cf9fff;
}

5
public/css/style.css
Voir le fichier

@ -383,3 +383,8 @@ footer {
font-size: smaller; font-size: smaller;
width: auto; /* Undo bootstrap's fixed width */ width: auto; /* Undo bootstrap's fixed width */
} }
.text-error {
background: white;
color: #cf9fff;
}

9
public/js/main.js
Voir le fichier

@ -1,15 +1,10 @@
// Night mode
var night = localStorage.getItem("night"); 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() { function toggleNightMode() {
var night = localStorage.getItem("night"); var night = localStorage.getItem("night");
if(night == "true") { if(night == "true") {
$("#style-dark")[0].remove() document.getElementById("style-dark").remove()
} else { } 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"); localStorage.setItem("night", (night == "true") ? "false" : "true");
} }

14
templates/_profile_edit.html
Voir le fichier

@ -14,7 +14,7 @@
<div class="col-lg-8"> <div class="col-lg-8">
<input class="form-control" type="text" name="email" id="email" value="{{.Email}}"> <input class="form-control" type="text" name="email" id="email" value="{{.Email}}">
{{ range (index $.FormErrors "email")}} {{ range (index $.FormErrors "email")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
</div> </div>
@ -30,7 +30,7 @@
</select> </select>
</div> </div>
{{ range (index $.FormErrors "language")}} {{ range (index $.FormErrors "language")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
</div> </div>
@ -40,7 +40,7 @@
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" name="current_password" id="current_password" type="password"> <input class="form-control" name="current_password" id="current_password" type="password">
{{ range (index $.FormErrors "current_password")}} {{ range (index $.FormErrors "current_password")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
</div> </div>
@ -50,7 +50,7 @@
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" name="password" id="password" type="password"> <input class="form-control" name="password" id="password" type="password">
{{ range (index $.FormErrors "password")}} {{ range (index $.FormErrors "password")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
</div> </div>
@ -59,7 +59,7 @@
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" name="password_confirmation" id="password_confirmation" type="password"> <input class="form-control" name="password_confirmation" id="password_confirmation" type="password">
{{ range (index $.FormErrors "password_confirmation")}} {{ range (index $.FormErrors "password_confirmation")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
</div> </div>
@ -70,7 +70,7 @@
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" name="username" id="username" type="text" value="{{.Username}}"> <input class="form-control" name="username" id="username" type="text" value="{{.Username}}">
{{ range (index $.FormErrors "username")}} {{ range (index $.FormErrors "username")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
</div> </div>
@ -88,7 +88,7 @@
</select> </select>
</div> </div>
{{ range (index $.FormErrors "status")}} {{ range (index $.FormErrors "status")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
</div> </div>

14
templates/admin_index.html
Voir le fichier

@ -26,7 +26,18 @@
<!-- Website CSS --> <!-- Website CSS -->
<link rel="stylesheet" id="style" href="{{.URL.Parse "/css/style.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> </head>
<body> <body>
<nav class="navbar navbar-default" id="mainmenu"> <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 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> <script type="text/javascript" charset="utf-8" src="{{.URL.Parse "/js/main.js"}}"></script>
{{block "js_footer" .}}{{end}} {{block "js_footer" .}}{{end}}
</body> </body>
</html> </html>

14
templates/index.html
Voir le fichier

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <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 --> <!-- 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" /> <link rel="icon" type="image/png" href="/img/favicon.png?v=3" />
<!-- RSS Feed with Context --> <!-- RSS Feed with Context -->
@ -30,6 +30,18 @@
<!-- Website CSS --> <!-- Website CSS -->
<link rel="stylesheet" id="style" href="{{.URL.Parse "/css/style.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> </head>
<body> <body>
<nav class="navbar navbar-default" id="mainmenu"> <nav class="navbar navbar-default" id="mainmenu">

4
templates/user/login.html
Voir le fichier

@ -14,13 +14,13 @@
<div class="form-group"> <div class="form-group">
<input type="text" name="username" id="username" class="form-control input-lg" autofocus="" placeholder="{{ T "email_address_or_username"}}"> <input type="text" name="username" id="username" class="form-control input-lg" autofocus="" placeholder="{{ T "email_address_or_username"}}">
{{ range (index $.FormErrors "username")}} {{ range (index $.FormErrors "username")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="password" name="password" id="password" class="form-control input-lg" placeholder="{{ T "password"}}"> <input type="password" name="password" id="password" class="form-control input-lg" placeholder="{{ T "password"}}">
{{ range (index $.FormErrors "password")}} {{ range (index $.FormErrors "password")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
<span class="button-checkbox"> <span class="button-checkbox">

10
templates/user/register.html
Voir le fichier

@ -14,13 +14,13 @@
<div class="form-group"> <div class="form-group">
<input type="text" name="username" id="display_name" class="form-control input-lg" placeholder="{{T "username" }}" tabindex="1" value="{{ .Username }}"> <input type="text" name="username" id="display_name" class="form-control input-lg" placeholder="{{T "username" }}" tabindex="1" value="{{ .Username }}">
{{ range (index $.FormErrors "username")}} {{ range (index $.FormErrors "username")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="email" name="email" id="email" class="form-control input-lg" placeholder="{{T "email_address" }}" tabindex="2" value="{{ .Email }}"> <input type="email" name="email" id="email" class="form-control input-lg" placeholder="{{T "email_address" }}" tabindex="2" value="{{ .Email }}">
{{ range (index $.FormErrors "email")}} {{ range (index $.FormErrors "email")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
<div class="row"> <div class="row">
@ -28,7 +28,7 @@
<div class="form-group"> <div class="form-group">
<input type="password" name="password" id="password" class="form-control input-lg" placeholder="{{T "password" }}" tabindex="3" value="{{ .Password }}"> <input type="password" name="password" id="password" class="form-control input-lg" placeholder="{{T "password" }}" tabindex="3" value="{{ .Password }}">
{{ range (index $.FormErrors "password")}} {{ range (index $.FormErrors "password")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
</div> </div>
@ -36,7 +36,7 @@
<div class="form-group"> <div class="form-group">
<input type="password" name="password_confirmation" id="password_confirmation" class="form-control input-lg" placeholder="{{T "confirm_password" }}" tabindex="4"> <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")}} {{ range (index $.FormErrors "password_confirmation")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</div> </div>
</div> </div>
@ -47,7 +47,7 @@
<button type="button" class="btn hidden" data-color="info" tabindex="5">{{T "i_agree" }}</button> <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"> <input type="checkbox" name="t_and_c" id="t_and_c" value="1">
{{ range (index $.FormErrors "t_and_c")}} {{ range (index $.FormErrors "t_and_c")}}
<p class="bg-danger">{{ . }}</p> <p class="text-error">{{ . }}</p>
{{end}} {{end}}
</span> </span>
</div> </div>