Gitlab CSE Unil

Commit 9c41ed37 authored by Julien Furrer's avatar Julien Furrer
Browse files

Merge branch 'dev' into django-18

Conflicts:
	adim_app/static/css/adim.css
parents a417cded 61501766
......@@ -197,6 +197,10 @@ body {
#page-loader div:first-child {
padding-top: 33%;
}
body,
#page-loader {
background: repeating-linear-gradient(-45deg, #424242, #424242 19px, #5c5c5c 20px, #4a4a4a 21px, #4a4a4a 20px, #4a4a4a 36px, #353535 38px, #4a4a4a 40px);
}
.theme-light #page-loader {
background-color: #f2f2f2;
}
......
......@@ -56,6 +56,7 @@
// ===== Global ===========================================
body {
background-color: @x-bodyBg;
overflow: hidden;
font-family: OpenSans, "Helvetica Neue", Helvetica, Arial, sans-serif;
......@@ -90,6 +91,26 @@ html, body {
}
}
// ============================================================================
// ============================================================================
// DEV DEV DEV
body, #page-loader {
background: repeating-linear-gradient(
-45deg,
@x-bodyBg,
@x-bodyBg 19px,
lighten(@x-bodyBg, 10%) 20px,
lighten(@x-bodyBg, 3%) 21px,
lighten(@x-bodyBg, 3%) 20px,
lighten(@x-bodyBg, 3%) 36px,
darken(@x-bodyBg, 5%) 38px,
lighten(@x-bodyBg, 3%) 40px
);
}
// ============================================================================
// ============================================================================
.theme-light #page-loader {
background-color: @x-bodyBg-light;
}
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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