mirror of
				https://github.com/KevinMidboe/zoff.git
				synced 2025-10-29 18:00:23 +00:00 
			
		
		
		
	Merge branch 'master' of github.com:zoff-music/zoff
This commit is contained in:
		| @@ -83,5 +83,5 @@ Zoff is licensed under a | |||||||
| <a href="http://creativecommons.org/licenses/by-nc-nd/3.0/no/">Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Norway License.</a>. | <a href="http://creativecommons.org/licenses/by-nc-nd/3.0/no/">Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Norway License.</a>. | ||||||
| Do not redistribute without permission from the developers. | Do not redistribute without permission from the developers. | ||||||
|  |  | ||||||
| Copyright © 2018 | Copyright © 2019 | ||||||
| Kasper Rynning-Tønnesen and Nicolas Almagro Tonne | Kasper Rynning-Tønnesen and Nicolas Almagro Tonne | ||||||
|   | |||||||
| @@ -48,6 +48,10 @@ nav ul li.active { | |||||||
|   background-color: rgba(0, 0, 0, 0.1); |   background-color: rgba(0, 0, 0, 0.1); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | .full-height { | ||||||
|  |   height:100vh; | ||||||
|  | } | ||||||
|  |  | ||||||
| * { | * { | ||||||
|   -webkit-tap-highlight-color: rgba(0, 0, 0, 0); |   -webkit-tap-highlight-color: rgba(0, 0, 0, 0); | ||||||
|   -moz-tap-highlight-color: rgba(0, 0, 0, 0); |   -moz-tap-highlight-color: rgba(0, 0, 0, 0); | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ | |||||||
|     <!-- Compiled and minified JavaScript --> |     <!-- Compiled and minified JavaScript --> | ||||||
|     <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script> |     <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script> | ||||||
|  |  | ||||||
|     <link rel="stylesheet" type="text/css" href="https://zoff.me/assets/css/style.css" title="Default" /> |     <link rel="stylesheet" type="text/css" href="https://zoff.me/assets/dist/style.css" title="Default" /> | ||||||
|     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> |     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> | ||||||
|     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.1.0/socket.io.slim.js"></script> |     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.1.0/socket.io.slim.js"></script> | ||||||
|     <style> |     <style> | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| <main class="container valign-wrapper row"> | <main class="container valign-wrapper row full-height"> | ||||||
|       <div class="center-align col m6 offset-m3"> |       <div class="center-align col m6 offset-m3"> | ||||||
|         <img src="https://zoff.me/assets/images/favicon.png" width="100" height="100" alt="image" /> |         <img src="https://zoff.me/assets/images/favicon.png" width="100" height="100" alt="image" /> | ||||||
|         <form action="/login" id="login_form" method="POST"> |         <form action="/login" id="login_form" method="POST"> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user