Merge branch 'develop' into 'master'

Develop

See merge request !33
This commit is contained in:
Jan Tuomi
2017-05-27 14:32:55 +03:00
5 changed files with 136 additions and 116 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ test:
pep8:
stage: lint
script:
- pip install -r requirements.txt
- pip install pep8
- pep8 --config=setup.cfg --count .
eslint:
+14
View File
@@ -0,0 +1,14 @@
html {
width: 100%;
height: 100%;
font-size: 16px;
}
body {
background-color: #fcfcfc;
max-width: 750px;
margin: auto;
text-align: center;
color: #100;
font-family: sans-serif;
}
+119 -110
View File
@@ -1,110 +1,115 @@
html, body {
font-size: 14px;
width: 100%;
font-size: 14px;
width: 100%;
}
div {
padding: 0.5rem;
padding: 0.5rem;
}
input {
padding: 0.5rem;
margin-top: 0.5rem;
margin-bottom: 0.5rem;
padding: 0.5rem;
margin-top: 0.5rem;
margin-bottom: 0.5rem;
}
#header {
display: block;
display: block;
}
#wrapper {
padding-right: 0;
padding-top: 0;
padding-bottom: 0;
padding-right: 0;
padding-top: 0;
padding-bottom: 0;
}
/* fixes for the sidebar layout */
#sidebar-wrapper {
background: #202020;
top: 0;
padding: 0;
-webkit-transition: width 0.01s height 0.01s linear;
-moz-transition: width 0.01s height 0.01s linear;
-o-transition: width 0.01s height 0.01s linear;
transition: width 0.01s, height 0.01s, transform 0.01s;
background: #202020;
top: 0;
padding: 0;
-webkit-transition: width 0.01s height 0.01s linear;
-moz-transition: width 0.01s height 0.01s linear;
-o-transition: width 0.01s height 0.01s linear;
transition: width 0.01s, height 0.01s, transform 0.01s;
}
.sidebar-nav {
width: initial;
left: 0;
width: 100%;
padding-top: 0.5rem;
height: 100%;
position: relative;
width: initial;
left: 0;
width: 100%;
padding-top: 0.5rem;
height: 100%;
position: relative;
}
.sidebar-nav li ul {
padding-left: 0px;
padding-left: 0px;
}
.sidebar-nav li span {
user-select: none;
cursor: default;
user-select: none;
cursor: default;
}
#sidebar-collapse {
display: none;
/* Override bootstrap default margin-bottom */
.navbar {
margin-bottom: 0;
}
@media (max-width: 767px) {
table {
table-layout: fixed;
}
table {
table-layout: fixed;
}
#sidebar-wrapper {
position: initial;
width: 100%;
margin-left: 0;
text-align: center;
}
#sidebar-wrapper {
position: initial;
width: 100%;
margin-left: 0;
text-align: center;
}
#sidebar-wrapper ul li {
text-align: center;
}
#sidebar-wrapper ul li {
text-align: center;
}
#header {
display: none;
}
#header {
display: none;
}
.sidebar-nav {
display: none;
}
.sidebar-nav {
display: none;
}
#sidebar-collapse {
display: block;
}
#sidebar-collapse {
display: block;
}
.logout-container {
position: initial;
margin-bottom: 1rem;
}
.logout-container {
position: initial;
margin-bottom: 1rem;
}
#wrapper {
width: 100%;
}
#wrapper {
width: 100%;
}
.page-content-container {
padding: 0;
}
/* Force table to not be like tables anymore */
/* Force table to not be like tables anymore */
table, thead, tbody, th, td, tr {
display: block;
}
thead tr {
background-color: #CCCCCC;
background-color: #CCCCCC;
}
tr { border: 1px solid #ccc; }
tr {
border: 1px solid #ccc;
}
td {
/* Behave like a "row" */
@@ -127,113 +132,117 @@ input {
}
@media (min-width: 769px) {
.logout-container {
bottom: 1rem;
position: absolute;
width: 100%;
}
.logout-container {
bottom: 1rem;
position: absolute;
width: 100%;
}
.logout-container input {
width: 80%;
}
.logout-container input {
width: 80%;
}
#settings-button {
position: absolute;
bottom: 0;
}
#settings-button {
position: absolute;
bottom: 0;
}
#sidebar-collapse {
display: none;
}
}
#download-csv {
margin-left: 20px;
margin-left: 20px;
}
#header h1 {
margin-bottom: 5rem;
margin-top: 2rem;
text-align: center;
margin-bottom: 5rem;
margin-top: 2rem;
text-align: center;
}
.table-button {
margin-left: 5px;
margin-right: 5px;
margin-bottom: 5px;
margin-left: 5px;
margin-right: 5px;
margin-bottom: 5px;
}
.table-button-column {
text-align: right;
text-align: right;
}
.pagination li {
padding: 0.5rem;
margin: 0.5rem;
padding: 0.5rem;
margin: 0.5rem;
}
#filter-collapser {
float: right;
margin-left: 1rem;
float: right;
margin-left: 1rem;
}
.filter-form {
}
.filter-row {
float: right;
display: table;
background-color: rgba(122, 164, 232, 0.5);
float: right;
display: table;
background-color: rgba(122, 164, 232, 0.5);
}
.filter-group {
display: inline-block;
float: left;
height: 100%;
display: inline-block;
float: left;
height: 100%;
}
.filter-field {
display: table;
clear: both;
width: 100%;
margin-left: 0;
margin-right: 0;
display: table;
clear: both;
width: 100%;
margin-left: 0;
margin-right: 0;
}
.filter-field h5 {
display: inline;
display: inline;
}
.filter-field input[type="datetime-local"] {
display: inline;
width: 50%;
float: right;
display: inline;
width: 50%;
float: right;
}
.filter-button {
margin: 0.5rem;
display: block;
width: 100%;
margin: 0.5rem;
display: block;
width: 100%;
}
.filter-field #search-filter {
width: 100%;
width: 100%;
}
.inline-title {
display: inline;
display: inline;
}
.ellipsis-menu {
height: 2rem;
height: 2rem;
}
.data-table-button {
width: 100%;
width: 100%;
}
.readonly {
pointer-events: none;
pointer-events: none;
}
.large-textarea {
width: 100%;
max-width: 100%;
height: 10rem !important;
width: 100%;
max-width: 100%;
height: 10rem !important;
}
+1 -1
View File
@@ -39,12 +39,12 @@
<div id="sidebar-wrapper">
<nav class="navbar navbar-inverse" id="sidebar-collapse">
<div class="navbar-header">
<span class="navbar-brand hidden-lg hidden-md">{% trans "Member register of SIK ry" %}</span>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-nav">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<span class="navbar-brand hidden-lg hidden-md">{% trans "Member register of SIK ry" %}</span>
</div>
</nav>
<ul class="sidebar-nav">
+1 -4
View File
@@ -3,13 +3,10 @@
{% load static %}
<html>
<head>
<link rel="stylesheet" href="{% static "css/base.css" %}">
<link rel="stylesheet" href="{% static "css/about.css" %}">
</head>
<body>
<h1>SIKWEB 2.0</h1>
<h2>Git revision</h2>
{{ REVISION }}
<h2>Git tag</h2>
{{ TAG }}
</body>
</html>