diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..cdacb93 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "fmartingrcom/themes/v1/static/bower" +} diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..2ca55d4 --- /dev/null +++ b/bower.json @@ -0,0 +1,19 @@ +{ + "name": "fmartingr.com", + "version": "0.0.0", + "homepage": "https://github.com/fmartingr/fmartingr.com", + "authors": [ + "Felipe Martin " + ], + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "font-awesome": "~4.2.0" + } +} diff --git a/fmartingrcom/settings/base.py b/fmartingrcom/settings/base.py index afb081d..76bacb9 100644 --- a/fmartingrcom/settings/base.py +++ b/fmartingrcom/settings/base.py @@ -115,6 +115,7 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static') COMPRESS_PRECOMPILERS = ( ('text/less', 'lessc {infile} {outfile}'), ('text/x-sass', 'sass {infile} {outfile}'), + ('text/x-scss', 'sass --scss {infile} {outfile}'), ('text/coffeescript', 'coffee --compile --stdio --no-header'), ) diff --git a/fmartingrcom/themes/v1/templates/_layout.jinja b/fmartingrcom/themes/v1/templates/_layout.jinja index fab3d99..42eb8cf 100644 --- a/fmartingrcom/themes/v1/templates/_layout.jinja +++ b/fmartingrcom/themes/v1/templates/_layout.jinja @@ -3,10 +3,11 @@ - - {% compress css %} + {% block stylesheets %} + + {% endblock %} {% endcompress %} {% block head %}{% endblock %} @@ -14,7 +15,6 @@ - Felipe Martin | {% block page_title %} Homepage{% endblock %} @@ -47,9 +47,9 @@
{% block sections %} {% if section != 'blog' %} - + {% endif %} @@ -57,7 +57,7 @@ {% if section != 'projects' %} {% endif %} @@ -68,17 +68,17 @@ @@ -89,15 +89,21 @@ {% block footer %} {% endblock %} - {% if config.GOOGLE_ANALYTICS %} - + {% block javascript %}{% endblock %} + {% if config.google_analytics %} + {% endif %} + {% endcompress %} +