From 42a73592975f721eab52acffab20e42b0487c6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 4 Oct 2015 16:47:46 +0200 Subject: [PATCH] general: change template to directly point to custom css file (#8502) --- static/custom-alfortville/style.css | 2 ++ static/custom-fontenay-sous-bois/style.css | 4 +++- static/custom-imio/style.css | 1 + static/custom-meaux/style.css | 2 ++ static/custom-pratic/style.css | 2 ++ static/custom-prefecture/style.css | 2 ++ static/custom-publik/style.css | 2 ++ templates/theme.html | 9 +++++---- 8 files changed, 19 insertions(+), 5 deletions(-) diff --git a/static/custom-alfortville/style.css b/static/custom-alfortville/style.css index b0d24de..18c8273 100644 --- a/static/custom-alfortville/style.css +++ b/static/custom-alfortville/style.css @@ -1,3 +1,5 @@ +@import url(../style.css); + body { background: #E7E6E1; } diff --git a/static/custom-fontenay-sous-bois/style.css b/static/custom-fontenay-sous-bois/style.css index d76f183..db49396 100644 --- a/static/custom-fontenay-sous-bois/style.css +++ b/static/custom-fontenay-sous-bois/style.css @@ -1,3 +1,5 @@ +@import url(../style.css); + html, body { margin: 0; padding: 0; @@ -279,4 +281,4 @@ div#profile dl dt:after { /* item view style */ #item .issued, #item .paid { display: none; -} \ No newline at end of file +} diff --git a/static/custom-imio/style.css b/static/custom-imio/style.css index 59bc1d8..8db039d 100644 --- a/static/custom-imio/style.css +++ b/static/custom-imio/style.css @@ -1,3 +1,4 @@ +@import url(../style.css); @import url(https://lalouviere-citoyen.lescommunes.be/guichet.css); div#main-content { width: 100%; } #main-content-wrapper #nav ul a { float: none; } diff --git a/static/custom-meaux/style.css b/static/custom-meaux/style.css index 7b30fec..9ff1e48 100644 --- a/static/custom-meaux/style.css +++ b/static/custom-meaux/style.css @@ -1,3 +1,5 @@ +@import url(../style.css); + div#header { max-width: 1205px; margin: auto; diff --git a/static/custom-pratic/style.css b/static/custom-pratic/style.css index ba4148e..8c48222 100644 --- a/static/custom-pratic/style.css +++ b/static/custom-pratic/style.css @@ -1,3 +1,5 @@ +@import url(../style.css); + html, body { background: #E6E7EB; } diff --git a/static/custom-prefecture/style.css b/static/custom-prefecture/style.css index ae7efca..9d1722a 100644 --- a/static/custom-prefecture/style.css +++ b/static/custom-prefecture/style.css @@ -1,3 +1,5 @@ +@import url(../style.css); + html { background: #EDEDED url(bg-container.png) repeat-y scroll center top; } diff --git a/static/custom-publik/style.css b/static/custom-publik/style.css index 9308656..7b69a22 100644 --- a/static/custom-publik/style.css +++ b/static/custom-publik/style.css @@ -1,3 +1,5 @@ +@import url(../style.css); + div#header, body { background: #fcfcfc; diff --git a/templates/theme.html b/templates/theme.html index a266674..9e4f334 100644 --- a/templates/theme.html +++ b/templates/theme.html @@ -11,14 +11,15 @@ {% block extra_top_head %} {% endblock %} {{ media }} - + {% if css_variant %} + + {% else %} + + {% endif %} {% block extra_css %} {% endblock %} {% block extra_scripts %} {% endblock %} - {% if css_variant %} - - {% endif %} -- 2.6.0