Gitlab CSE Unil

Commit aed42d73 authored by Julien Furrer's avatar Julien Furrer
Browse files

Merge branch 'dev' into django-18

parents 9c41ed37 71f75d30
...@@ -198,8 +198,9 @@ body { ...@@ -198,8 +198,9 @@ body {
padding-top: 33%; padding-top: 33%;
} }
body, body,
#page-loader { #page-loader,
background: repeating-linear-gradient(-45deg, #424242, #424242 19px, #5c5c5c 20px, #4a4a4a 21px, #4a4a4a 20px, #4a4a4a 36px, #353535 38px, #4a4a4a 40px); #home-container {
background: repeating-linear-gradient(-45deg, #424242, #424242 19px, #5c5c5c 20px, #4a4a4a 21px, #4a4a4a 20px, #4a4a4a 36px, #353535 38px, #4a4a4a 40px) !important;
} }
.theme-light #page-loader { .theme-light #page-loader {
background-color: #f2f2f2; background-color: #f2f2f2;
......
...@@ -94,7 +94,7 @@ html, body { ...@@ -94,7 +94,7 @@ html, body {
// ============================================================================ // ============================================================================
// ============================================================================ // ============================================================================
// DEV DEV DEV // DEV DEV DEV
body, #page-loader { body, #page-loader, #home-container {
background: repeating-linear-gradient( background: repeating-linear-gradient(
-45deg, -45deg,
@x-bodyBg, @x-bodyBg,
...@@ -105,7 +105,7 @@ body, #page-loader { ...@@ -105,7 +105,7 @@ body, #page-loader {
lighten(@x-bodyBg, 3%) 36px, lighten(@x-bodyBg, 3%) 36px,
darken(@x-bodyBg, 5%) 38px, darken(@x-bodyBg, 5%) 38px,
lighten(@x-bodyBg, 3%) 40px lighten(@x-bodyBg, 3%) 40px
); ) !important;
} }
// ============================================================================ // ============================================================================
// ============================================================================ // ============================================================================
......
...@@ -60,7 +60,7 @@ window.ADIM_CONFIG = { ...@@ -60,7 +60,7 @@ window.ADIM_CONFIG = {
<span class="glyphicon glyphicon-plus"></span>&nbsp; <span class="glyphicon glyphicon-plus"></span>&nbsp;
<span>Nouvelle image</span> <span>Nouvelle image</span>
<input id="fileupload" type="file" name="image_file" data-url="{% url "adim.app:upload_file" %}" <input id="fileupload" type="file" name="image_file" data-url="{% url "adim.app:upload_file" %}"
accept="image/png,image/jpg"> accept="image/png,image/jpg,image/jpeg">
</span> </span>
</p> </p>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<span class="glyphicon glyphicon-plus"></span>&nbsp; <span class="glyphicon glyphicon-plus"></span>&nbsp;
<span>Nouvelle image</span> <span>Nouvelle image</span>
<form action="{% url "adim.app:upload_file" %}" method="post" enctype="multipart/form-data">{% csrf_token %} <form action="{% url "adim.app:upload_file" %}" method="post" enctype="multipart/form-data">{% csrf_token %}
<input id="fileupload-alt" type="file" name="image_file" data-url="{% url "adim.app:upload_file" %}" accept="image/png,image/jpg"> <input id="fileupload-alt" type="file" name="image_file" data-url="{% url "adim.app:upload_file" %}" accept="image/png,image/jpg,image/jpeg">
</form> </form>
</span> </span>
</li> </li>
......
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