diff --git a/themes/solarized/static/css/main.css b/themes/solarized/static/css/main.css index 2b450ed..14f32b9 100644 --- a/themes/solarized/static/css/main.css +++ b/themes/solarized/static/css/main.css @@ -1,6 +1,3 @@ -@import url("reset.css"); -@import url("pygment.css"); -@import url("wordcloud.css"); body { font-family: 'Lato', 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; diff --git a/themes/solarized/templates/base.html b/themes/solarized/templates/base.html index 467b3cc..fa5e715 100644 --- a/themes/solarized/templates/base.html +++ b/themes/solarized/templates/base.html @@ -6,35 +6,34 @@ - {% if FEED_ALL_ATOM %} - + + {% if FEED_ALL_ATOM %} {% endif %} + {% if FEED_ALL_RSS %} {% endif %} + {% if FEED_ATOM %} {% endif %} + {% if FEED_RSS %} {% endif %} - {% if FEED_ALL_RSS %} - - {% endif %} - {% if FEED_ATOM %} - - {% endif %} - {% if FEED_RSS %} - - {% endif %} - {% if CATEGORY_FEED_ATOM and category %} - - {% endif %} - {% if CATEGORY_FEED_RSS and category %} - - {% endif %} - {% if TAG_FEED_ATOM and tag %} - - {% endif %} - {% if TAG_FEED_RSS and tag %} - - {% endif %} - {% endblock head %} - - {% assets filters="libsass", output="css/solarized.css", "css/solarized.scss" %} + {% if CATEGORY_FEED_ATOM and category %} {% endif %} + {% if CATEGORY_FEED_RSS and category %} {% endif %} + {% if TAG_FEED_ATOM and tag %} {% endif %} + {% if TAG_FEED_RSS and tag %} {% endif %} + + {% assets filters="cssmin", output="css/reset.min.css", "css/reset.css" %} {% endassets %} + {% assets filters="cssmin", output="css/pygment.min.css", "css/pygment.css" %} + + {% endassets %} + {% assets filters="cssmin", output="css/wordcloud.min.css", "css/wordcloud.css" %} + + {% endassets %} + {% assets filters="cssmin", output="css/main.min.css", "css/main.css" %} + + {% endassets %} + {% assets filters="libsass,cssmin", output="css/solarized.min.css", "css/solarized.scss" %} + + {% endassets %} + {% endblock head %} +