Mercurial > libervia-templates

changeset 1:b13a26d55c64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
base: updated CSS handling to follow changes in backend, moved CSS file to /static with splitted files
author Goffi <goffi@goffi.org>
date Sun, 05 Mar 2017 23:25:02 +0100
parents 9a31d2c02f47
children abd55d94f82b
files default/base/base.html default/blog/static/style.css default/static/blog.css default/static/styles.css
diffstat 4 files changed, 39 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/default/base/base.html	Tue Feb 21 20:31:01 2017 +0100
+++ b/default/base/base.html	Sun Mar 05 23:25:02 2017 +0100
@@ -3,12 +3,14 @@
 <head>
     <meta charset="utf-8" />
     <title>{% block title %}{{C.APP_NAME}}{% endblock %}</title>
-    {% if css_inline %}
+    {% if css_content is defined %}
         <style type="text/css">
             {{css_content}}
         </style>
     {% else %}
-        <link rel='stylesheet' type="text/css" href='static/style.css'>
+        {% for css_file in css_files %}
+            <link rel='stylesheet' type="text/css" href='{{root_path}}{{css_file}}'>
+        {% endfor %}
     {% endif %}
 </head>
 <body>
--- a/default/blog/static/style.css	Tue Feb 21 20:31:01 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-html {
-    font-family: sans-serif;
-}
-
-header {
-    font-weight: bold;
-    text-align: center;
-}
-
-article {
-    margin: 2% auto;
-    width: 80%;
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 3px;
-    padding: 1%;
-    background: lightgray;
-}
-
-article div.content {
-    text-align: justify;
-    font-size: 0.9em;
-}
-
-article img {
-    max-width: 100%;
-}
-
-footer {
-    width: 100%;
-    text-align: center;
-    font-size: 0.7em;
-    font-weight: bold;
-    position: fixed;
-    bottom: 5px;
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/default/static/blog.css	Sun Mar 05 23:25:02 2017 +0100
@@ -0,0 +1,18 @@
+article {
+    margin: 2% auto;
+    width: 80%;
+    border-style: solid;
+    border-width: 1px;
+    border-radius: 3px;
+    padding: 1%;
+    background: lightgray;
+}
+
+article div.content {
+    text-align: justify;
+    font-size: 0.9em;
+}
+
+article img {
+    max-width: 100%;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/default/static/styles.css	Sun Mar 05 23:25:02 2017 +0100
@@ -0,0 +1,17 @@
+html {
+    font-family: sans-serif;
+}
+
+header {
+    font-weight: bold;
+    text-align: center;
+}
+
+footer {
+    width: 100%;
+    text-align: center;
+    font-size: 0.7em;
+    font-weight: bold;
+    position: fixed;
+    bottom: 5px;
+}