Mercurial > wikked

changeset 410:c93ac92aef5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
web: Move Jouvence CSS to a file.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 12 Jan 2017 09:19:21 -0800
parents 7981f2140c14
children ba977a547daa
files Gruntfile.js wikked/assets/css/jouvence.less wikked/wiki.py
diffstat 3 files changed, 16 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Gruntfile.js	Thu Jan 12 08:54:09 2017 -0800
+++ b/Gruntfile.js	Thu Jan 12 09:19:21 2017 -0800
@@ -10,7 +10,8 @@
           paths: ["wikked/assets"]
         },
         files: {
-          "wikked/static/css/wikked.min.css": "wikked/assets/css/wikked.less"
+          "wikked/static/css/wikked.min.css": "wikked/assets/css/wikked.less",
+          "wikked/static/css/jouvence.min.css": "wikked/assets/css/jouvence.less"
         }
       },
       production: {
@@ -19,7 +20,8 @@
           compress: true
         },
         files: {
-          "wikked/static/css/wikked.min.css": "wikked/assets/css/wikked.less"
+          "wikked/static/css/wikked.min.css": "wikked/assets/css/wikked.less",
+          "wikked/static/css/jouvence.min.css": "wikked/assets/css/jouvence.less"
         }
       }
     },
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wikked/assets/css/jouvence.less	Thu Jan 12 09:19:21 2017 -0800
@@ -0,0 +1,10 @@
+body {
+    background-color: #ccc;
+}
+footer {
+    border-top: none;
+}
+.jouvence-doc {
+    box-shadow: #111 0px 0.5em 2em;
+    margin-bottom: 2em;
+}
--- a/wikked/wiki.py	Thu Jan 12 08:54:09 2017 -0800
+++ b/wikked/wiki.py	Thu Jan 12 09:19:21 2017 -0800
@@ -122,15 +122,8 @@
 
         self.formatters[_jouvence_to_html] = ['fountain']
 
-        head_css = """<style>
-body {
-    background-color: #666;
-}
-.jouvence-doc {
-    box-shadow: #111 0px 0.5em 2em;
-}
-</style>
-"""
+        head_css = ('<link rel="stylesheet" type="text/css" '
+                    'href="/static/css/jouvence.min.css" />\n')
         head_css += '<style>%s</style>' % get_css()
         self.custom_heads = {'fountain': head_css}