fmartingr
/
fmartingr.com-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added bower and finished with django compressor configuration

This commit is contained in:
Felipe Martín 2014-09-02 18:18:57 +02:00
parent d29a7a736d
commit 2466432728
4 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.bowerrc Normal file
View File

@ -0,0 +1,3 @@
{
"directory": "fmartingrcom/themes/v1/static/bower"
}

19
bower.json Normal file
View File

@ -0,0 +1,19 @@
{
"name": "fmartingr.com",
"version": "0.0.0",
"homepage": "https://github.com/fmartingr/fmartingr.com",
"authors": [
"Felipe Martin <fmartingr@me.com>"
],
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"font-awesome": "~4.2.0"
}
}

1
fmartingrcom/settings/base.py
View File

@ -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'),
)

30
fmartingrcom/themes/v1/templates/_layout.jinja
View File

@ -3,10 +3,11 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="//fonts.googleapis.com/css?family=Open+Sans:400|Antic+Slab" rel="stylesheet" type="text/css">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="/static/css/style.css" />
{% compress css %}
{% block stylesheets %}
<link rel="stylesheet" href="{{ STATIC_URL }}bower/font-awesome/css/font-awesome.css" type="text/css" />
<link rel="stylesheet" href="{{ STATIC_URL }}sass/style.sass" type="text/x-sass" />
{% endblock %}
{% endcompress %}
{% block head %}{% endblock %}
<!-- Mobile -->
@ -14,7 +15,6 @@
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<meta http-equiv="cleartype" content="on">
<script type="text/javascript" src="/static/js/mobile.js"></script>
<title>Felipe Martin | {% block page_title %} Homepage{% endblock %}</title>
</head>
<body class="{{ section }}">
@ -47,9 +47,9 @@
<div class="menu buttons">
{% block sections %}
{% if section != 'blog' %}
<a href="">
<a href="{{ url('blog:list') }}">
<button class="blog">
<i class="icon icon-comment-alt"></i> Blog
<i class="fa fa-comment"></i> Blog
</button>
</a>
{% endif %}
@ -57,7 +57,7 @@
{% if section != 'projects' %}
<a href="#">
<button class="projects">
<i class="icon icon-folder-open"></i> Projects
<i class="fa fa-folder-open"></i> Projects
</button>
</a>
{% endif %}
@ -68,17 +68,17 @@
<div class="social buttons">
<a href="//twitter.com/fmartingr">
<button class="twitter">
<span class="icon icon-twitter"></span> Twitter
<span class="fa fa-twitter"></span> Twitter
</button>
</a>
<a href="//github.com/fmartingr">
<button class="github">
<span class="icon icon-github"></span> Github
<span class="fa fa-github"></span> Github
</button>
</a>
<a href="mailto:fmartingr@me.com">
<button class="email">
<span class="icon icon-envelope"></span> Email
<span class="fa fa-envelope"></span> Email
</button>
</a>
</div>
@ -89,15 +89,21 @@
</section>
{% block footer %}
{% endblock %}
{% if config.GOOGLE_ANALYTICS %}
<script>
{% compress js %}
<script type="text/javascript" src="{{ STATIC_URL }}js/mobile.js"></script>
{% block javascript %}{% endblock %}
{% if config.google_analytics %}
<script type="text/javascript">
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '{{ config.GOOGLE_ANALYTICS }}', '{{ config.GOOGLE_ANALYTICS_DOMAIN }}');
ga('create', '{{ config.google_analytics }}', '{{ config.google_analytics_domain }}');
ga('send', 'pageview');
</script>
{% endif %}
{% endcompress %}
</body>
</html>