ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Change login mask style

This commit is contained in:
Ramon Wenger 2018-09-20 16:02:25 +02:00
parent 753a4ac1fd
commit 83ebaa94b9
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/core/static/styles/main.scss
View File

@ -19,8 +19,10 @@ $red-shadow: darken($red, 20%);
$blue: #EDF7FA; $blue: #EDF7FA;
$blue-shadow: #B6CCD4; $blue-shadow: #B6CCD4;
$brand: #17a887;
$text-color: $grey-9; $text-color: $grey-9;
$font-family: 'Arimo', Arial, sans-serif; $font-family: 'Montserrat', Arial, sans-serif;
$base-font-size: 15px; $base-font-size: 15px;
$space: 10px; $space: 10px;
@ -85,7 +87,7 @@ input[type=text], input[type=password], select {
border-radius: 2px; border-radius: 2px;
box-sizing: border-box; box-sizing: border-box;
background-color: $light-white; background-color: $light-white;
color: $white; color: $grey-9;
} }
.mt-1 { .mt-1 {
@ -94,4 +96,11 @@ input[type=text], input[type=password], select {
.mb-1 { .mb-1 {
margin-bottom: $space; margin-bottom: $space;
}
.logo {
color: $brand;
font-size: 36px;
font-weight: 800;
font-family: Montserrat, Arial, sans-serif;
} }

3
server/core/templates/base.html
View File

@ -12,7 +12,8 @@
<meta name="author" content="skillBox"> <meta name="author" content="skillBox">
<link href='https://fonts.googleapis.com/css?family=Material+Icons' rel="stylesheet" type="text/css"> <link href='https://fonts.googleapis.com/css?family=Material+Icons' rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Arimo" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,800" rel="stylesheet">
<link href="https://use.typekit.net/tck7ptw.css" rel="stylesheet">
{% compress css %} {% compress css %}
<link href="{% static "styles/main.scss" %}" rel="stylesheet" type="text/x-scss" <link href="{% static "styles/main.scss" %}" rel="stylesheet" type="text/x-scss"

6
server/core/templates/registration/login.html
View File

@ -1,10 +1,8 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block body_class %}dark-bg{% endblock %}
{% block body %} {% block body %}
<h1>skillBox</h1> <h1 class="logo">skillbox</h1>
{% if next %} {% if next %}
<div class="h4">Melde dich jetzt an.</div> <div class="h4">Melde dich jetzt an.</div>
@ -28,7 +26,7 @@
{{ form.password }} {{ form.password }}
</div> </div>
<button class="btn btn-orange mt-1" type="submit" name="action">Anmelden</button> <button class="btn mt-1" type="submit" name="action">Anmelden</button>
<input type="hidden" name="next" value="{{ next }}"/> <input type="hidden" name="next" value="{{ next }}"/>
</form> </form>