Skip to content
GitLab
Commit 8483a58f authored by Wolfgang Wiese's avatar Wolfgang Wiese
Browse files

update 

wie mit jk besprochen
parent bf442dec
Expand all Hide whitespace changes
Inline Side-by-side
helios-server/server_ui/templates/election_tallied.html
View file @ 8483a58f
......@@ -2,7 +2,7 @@
{% block content %}
<h1>Abstimming {{election.name}} beendet</h1>
<h1>Abstimmung {{election.name}} beendet</h1>
<p>
Diese Abstimmung wurde bereits gezählt (oder die Auszählung hat begonnen).
......
helios-server/server_ui/templates/index.html
View file @ 8483a58f
......@@ -34,10 +34,14 @@
{% if user %}
<!--<div class="row right">{{user.display_html_big|safe}}</div>-->
{% if create_p %}
<h2>Administration</h2>
<p>
<p>
<a class="standard-btn" href="{% url "elections@new" %}">Abstimmung erstellen <span class="langtext" lang="en">(create election)</span></a>
</p>
<h2>Administration</h2>
{% if elections_administered %}
<ul>
{% for election in elections_administered %}
......@@ -51,17 +55,27 @@
</p>
{% endif %}
<h2>Meine Abstimmungen <span class="langtext" lang="en">(Recent Votes)</span></h2>
<h2>Meine Abstimmungen <span class="langtext" lang="en">(Recent Votes)</span></h2>
{% if elections_voted %}
<ul>
{% for election in elections_voted %}
<li><a href="{% url "election@view" election.uuid %}">{{election.name}}</a></li>
{% endfor %}
</ul>
{% endif %}
<p>
<a class="standard-btn" href="{% url "elections@voted" %}">Alle abrufen <span class="langtext" lang="en">(See all votes)</span></a>
<p>
<a class="standard-btn" href="{% url "elections@voted" %}">Alle abrufen <span class="langtext" lang="en">(See all votes)</span></a>
</p>
{% else %}
<div class="alert alert-info">
Noch keine.
<span class="langtext" lang="en">
<br>(None yet.)
</span>
</div>
{% endif %}
{% else %}
{% if settings.SHOW_LOGIN_OPTIONS %}
......
package.json
View file @ 8483a58f
{
"name": "fau-helios-customizing",
"version": "1.0.6",
"version": "1.0.7",
"description": "FAU Helios UI Customizing",
"main": "start.html",
"scripts": {
......
src/sass/_button.scss
View file @ 8483a58f
......@@ -104,3 +104,181 @@ a.standard-btn {
transform: scale(.95);
}
}
input#next_button {
@extend .standard-btn;
}
/* Standardbuttons aus foundation.css */
utton, .button {
border-style: solid;
border-width: 1px;
cursor: pointer;
font-family: inherit;
font-weight: bold;
line-height: normal;
margin: 0 0 1.25em;
position: relative;
text-decoration: none;
text-align: center;
display: inline-block;
padding-top: 0.75em;
padding-right: 1.5em;
padding-bottom: 0.8125em;
padding-left: 1.5em;
font-size: 1em;
background-color: #2ba6cb;
border-color: #2284a1;
color: white; }
button:hover, button:focus, .button:hover, .button:focus {
background-color: #2284a1; }
button:hover, button:focus, .button:hover, .button:focus {
color: white; }
button.secondary, .button.secondary {
background-color: #e9e9e9;
border-color: #d0d0d0;
color: #333333; }
button.secondary:hover, button.secondary:focus, .button.secondary:hover, .button.secondary:focus {
background-color: #d0d0d0; }
button.secondary:hover, button.secondary:focus, .button.secondary:hover, .button.secondary:focus {
color: #333333; }
button.success, .button.success {
background-color: #5da423;
border-color: #457a1a;
color: white; }
button.success:hover, button.success:focus, .button.success:hover, .button.success:focus {
background-color: #457a1a; }
button.success:hover, button.success:focus, .button.success:hover, .button.success:focus {
color: white; }
button.alert, .button.alert {
background-color: #c60f13;
border-color: #970b0e;
color: white; }
button.alert:hover, button.alert:focus, .button.alert:hover, .button.alert:focus {
background-color: #970b0e; }
button.alert:hover, button.alert:focus, .button.alert:hover, .button.alert:focus {
color: white; }
button.large, .button.large {
padding-top: 1em;
padding-right: 2em;
padding-bottom: 1.0625em;
padding-left: 2em;
font-size: 1.25em; }
button.small, .button.small {
padding-top: 0.5625em;
padding-right: 1.125em;
padding-bottom: 0.625em;
padding-left: 1.125em;
font-size: 0.8125em; }
button.tiny, .button.tiny {
padding-top: 0.4375em;
padding-right: 0.875em;
padding-bottom: 0.5em;
padding-left: 0.875em;
font-size: 0.6875em; }
button.expand, .button.expand {
padding-right: 0;
padding-left: 0;
width: 100%; }
button.left-align, .button.left-align {
text-align: left;
text-indent: 0.75em; }
button.right-align, .button.right-align {
text-align: right;
padding-right: 0.75em; }
button.disabled, button[disabled], .button.disabled, .button[disabled] {
background-color: #2ba6cb;
border-color: #2284a1;
color: white;
cursor: default;
opacity: 0.6;
-webkit-box-shadow: none;
box-shadow: none; }
button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus {
background-color: #2284a1; }
button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus {
color: white; }
button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus {
background-color: #2ba6cb; }
button.disabled.secondary, button[disabled].secondary, .button.disabled.secondary, .button[disabled].secondary {
background-color: #e9e9e9;
border-color: #d0d0d0;
color: #333333;
cursor: default;
opacity: 0.6;
-webkit-box-shadow: none;
box-shadow: none; }
button.disabled.secondary:hover, button.disabled.secondary:focus, button[disabled].secondary:hover, button[disabled].secondary:focus, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus {
background-color: #d0d0d0; }
button.disabled.secondary:hover, button.disabled.secondary:focus, button[disabled].secondary:hover, button[disabled].secondary:focus, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus {
color: #333333; }
button.disabled.secondary:hover, button.disabled.secondary:focus, button[disabled].secondary:hover, button[disabled].secondary:focus, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus {
background-color: #e9e9e9; }
button.disabled.success, button[disabled].success, .button.disabled.success, .button[disabled].success {
background-color: #5da423;
border-color: #457a1a;
color: white;
cursor: default;
opacity: 0.6;
-webkit-box-shadow: none;
box-shadow: none; }
button.disabled.success:hover, button.disabled.success:focus, button[disabled].success:hover, button[disabled].success:focus, .button.disabled.success:hover, .button.disabled.success:focus, .button[disabled].success:hover, .button[disabled].success:focus {
background-color: #457a1a; }
button.disabled.success:hover, button.disabled.success:focus, button[disabled].success:hover, button[disabled].success:focus, .button.disabled.success:hover, .button.disabled.success:focus, .button[disabled].success:hover, .button[disabled].success:focus {
color: white; }
button.disabled.success:hover, button.disabled.success:focus, button[disabled].success:hover, button[disabled].success:focus, .button.disabled.success:hover, .button.disabled.success:focus, .button[disabled].success:hover, .button[disabled].success:focus {
background-color: #5da423; }
button.disabled.alert, button[disabled].alert, .button.disabled.alert, .button[disabled].alert {
background-color: #c60f13;
border-color: #970b0e;
color: white;
cursor: default;
opacity: 0.6;
-webkit-box-shadow: none;
box-shadow: none; }
button.disabled.alert:hover, button.disabled.alert:focus, button[disabled].alert:hover, button[disabled].alert:focus, .button.disabled.alert:hover, .button.disabled.alert:focus, .button[disabled].alert:hover, .button[disabled].alert:focus {
background-color: #970b0e; }
button.disabled.alert:hover, button.disabled.alert:focus, button[disabled].alert:hover, button[disabled].alert:focus, .button.disabled.alert:hover, .button.disabled.alert:focus, .button[disabled].alert:hover, .button[disabled].alert:focus {
color: white; }
button.disabled.alert:hover, button.disabled.alert:focus, button[disabled].alert:hover, button[disabled].alert:focus, .button.disabled.alert:hover, .button.disabled.alert:focus, .button[disabled].alert:hover, .button[disabled].alert:focus {
background-color: #c60f13; }
button, .button {
padding-top: 0.8125em;
padding-bottom: 0.75em;
-webkit-appearance: none; }
button.tiny, .button.tiny {
padding-top: 0.5em;
padding-bottom: 0.4375em;
-webkit-appearance: none; }
button.small, .button.small {
padding-top: 0.625em;
padding-bottom: 0.5625em;
-webkit-appearance: none; }
button.large, .button.large {
padding-top: 1.03125em;
padding-bottom: 1.03125em;
-webkit-appearance: none; }
@media only screen {
button, .button {
-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5) inset;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5) inset;
-webkit-transition: background-color 300ms ease-out;
-moz-transition: background-color 300ms ease-out;
transition: background-color 300ms ease-out; }
button:active, .button:active {
-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2) inset;
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2) inset; }
button.radius, .button.radius {
-webkit-border-radius: 3px;
border-radius: 3px; }
button.round, .button.round {
-webkit-border-radius: 1000px;
border-radius: 1000px; } }
@media only screen and (min-width: 768px) {
button, .button {
display: inline-block; } }
\ No newline at end of file
src/sass/_forms.scss 0 → 100644
View file @ 8483a58f
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 28.07.2020, 11:28:16
Author : unrz59
*/
form {
input[type="submit"] {
@extend .standard-btn;
}
}
\ No newline at end of file
src/sass/_tables.scss 0 → 100644
View file @ 8483a58f
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 28.07.2020, 10:58:05
Author : unrz59
*/
/* Copy from foundation.css */
/* Tables */
table {
background: white;
margin-bottom: 1.25em;
border: solid 1px #dddddd;
th {
text-align: left;
}
}
table thead,
table tfoot {
background: whitesmoke;
font-weight: bold; }
table thead tr th,
table thead tr td,
table tfoot tr th,
table tfoot tr td {
padding: 0.5em 0.625em 0.625em;
font-size: 0.875em;
color: #222222;
text-align: left; }
table tr th,
table tr td {
padding: 0.5625em 0.625em;
font-size: 0.875em;
color: #222222; }
table tr.even, table tr.alt, table tr:nth-of-type(even) {
background: #f9f9f9; }
table thead tr th,
table tfoot tr th,
table tbody tr td,
table tr td,
table tfoot tr td {
display: table-cell;
line-height: 1.125em; }
/* Image Thumbnails */
.th {
line-height: 0;
display: inline-block;
border: solid 4px white;
-webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2);
-webkit-transition: all 200ms ease-out;
-moz-transition: all 200ms ease-out;
transition: all 200ms ease-out; }
.th:hover, .th:focus {
-webkit-box-shadow: 0 0 6px 1px rgba(43, 166, 203, 0.5);
box-shadow: 0 0 6px 1px rgba(43, 166, 203, 0.5); }
.th.radius {
-webkit-border-radius: 3px;
border-radius: 3px; }
a.th {
display: inline-block;
max-width: 100%; }
/* Tooltips */
.has-tip {
border-bottom: dotted 1px #cccccc;
cursor: help;
font-weight: bold;
color: #333333; }
.has-tip:hover, .has-tip:focus {
border-bottom: dotted 1px #196177;
color: #2ba6cb; }
.has-tip.tip-left, .has-tip.tip-right {
float: none !important; }
src/sass/fau-helios.scss
View file @ 8483a58f
......@@ -16,9 +16,12 @@
// Elements:
@import "alerts";
@import "button";
@import "forms";
@import "optical";
@import "tables";
@import "content";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment