Merge branch 'visual-improvements' into 'master'

Visual improvements

See merge request bestuur/kers!9
This commit is contained in:
flynn 2020-07-28 19:18:01 +02:00
commit 7722acad52
3 changed files with 29 additions and 8 deletions

View file

@ -12,10 +12,12 @@
{% if not user.is_authenticated %} {% if not user.is_authenticated %}
<p>Je moet inloggen voor je je kan inschrijven.</p> <p>Je moet inloggen voor je je kan inschrijven.</p>
{% elif not user.has_ugent_info %} {% elif not user.has_ugent_info %}
<p>Je moet je studentennummer en echte naam invullen in je profiel voor je je kan inschrijven.</p> <p class="text--important">Je moet je studentennummer en echte naam invullen in je profiel voor je je kan inschrijven.</p>
{% elif not my_registration %} {% elif not my_registration %}
<p><input type="submit" value="Ik wil komen"></p> <button type="submit">Ik wil komen</button>
{% else %} {% else %}
<p>Mijn status: {{ my_registration.state_str }} <input type="submit" value="Uitschrijven"></input></p> <p><strong>Mijn status: {{ my_registration.state_str }}</strong></p>
<button class="cancel" type="submit">Uitschrijven</button>
{% endif %} {% endif %}
</form> </form>

View file

@ -5,7 +5,7 @@ body {
font-family: monospace; font-family: monospace;
} }
input, textarea { input, textarea, button {
font-family: inherit; font-family: inherit;
font-size: inherit; font-size: inherit;
} }
@ -78,6 +78,19 @@ h1 a:hover, h1 a:focus, h1 a:active {
background-color: rgba(255, 255, 255, 0.1); background-color: rgba(255, 255, 255, 0.1);
} }
.text--important {
color: #e74c3c;
}
button.cancel {
background-color: #e74c3c;
color: white;
}
button:focus.cancel {
background-color: #c0392b;
}
/*change the layout of the navigation bar for all the screens /*change the layout of the navigation bar for all the screens
that have a width less or equal than 500px*/ that have a width less or equal than 500px*/
@ -175,16 +188,22 @@ textarea {
select:focus, select:focus,
input:focus, input:focus,
textarea:focus, textarea:focus,
button:focus { button:active {
background: hsl(0, 0%, 20%); background: hsl(0, 0%, 20%);
} }
select:focus, select:focus,
input:focus, input:focus,
textarea:focus { textarea:focus
button:active {
transform: scale(1.02); transform: scale(1.02);
} }
/* Hover styling */
button:hover:not([disabled]) {
cursor: pointer;
}
footer { footer {
color: #777777; color: #777777;
padding: 10px; padding: 10px;

View file

@ -10,7 +10,7 @@
<form action="/user/profile" method="post"> <form action="/user/profile" method="post">
{% csrf_token %} {% csrf_token %}
{{ form }} {{ form }}
<input type="submit" value="Bijwerken"> <button type="submit">Bijwerken</button>
</form> </form>
{% else %} {% else %}
<p>Niet ingelogd</p> <p>Niet ingelogd</p>