Merge pull request #1033 from dotKom/wiki-bootstrap

Fix wiki-bootstrap messing up our own bootstrap css.
dotkom · Jan 21, 2015 · bf5c4ae · bf5c4ae
2 parents 8ad1fcd + 6cb9c06
commit bf5c4ae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/files/static/less/wiki.less b/files/static/less/wiki.less
@@ -1,4 +1,9 @@
 #wiki {
+    @import "wiki/bootstrap/less/wiki/wiki-bootstrap.less";
+    // Hardcoded for now
+    // Note: change to @fa-font-path when upgrading to Font Awesome 4
+    @FontAwesomePath: "/static/wiki/font-awesome/font";
+
     padding: 87px 0 0;
     .page-header {
         margin-top: 0px;

diff --git a/onlineweb4/settings/base.py b/onlineweb4/settings/base.py
@@ -1,5 +1,6 @@
 import os
 import sys
+import wiki
 from django.contrib.messages import constants as messages
 
 # Directory that contains this file.
@@ -82,10 +83,13 @@
     'compressor.finders.CompressorFinder',
 )
 
+# Including django-wiki static files so we can import the less files.
+DJANGO_WIKI_STATIC = os.path.join(os.path.dirname(wiki.__file__), 'static')
+
 COMPRESS_FILES = True
 COMPRESS_OUTPUT_DIR = 'cache'
 COMPRESS_PRECOMPILERS = (
-    ('text/less', 'lessc {infile} {outfile}'),
+    ('text/less', 'lessc --include-path=%s {infile} {outfile}' % DJANGO_WIKI_STATIC),
 )
 
 COMPRESS_CSS_FILTERS = [

diff --git a/templates/wiki/base.html b/templates/wiki/base.html
@@ -18,7 +18,6 @@
 {% endblock %}
 
 {% block styles %}
-    <link href="{{ STATIC_URL }}wiki/bootstrap/css/wiki-bootstrap.min.css" rel="stylesheet">
     <link rel="stylesheet" media="all" href="/static/wiki/markitup/skins/simple/style.css" />
     <link rel="stylesheet" media="all" href="/static/wiki/markitup/sets/frontend/style.css" />
     {{ block.super }}