Skip to content

Commit

Permalink
updated footer and added local sass render task
Browse files Browse the repository at this point in the history
  • Loading branch information
joernroeder committed Sep 11, 2014
1 parent 5591f00 commit fa30006
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 34 deletions.
24 changes: 22 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,32 @@ module.exports = function (grunt) {
]
}
}
}
},
compass: {
dist: {
options: {
sassDir: '_sass',
cssDir: 'assets/stylesheets',
specify: '_sass/main.scss',
environment: 'production',
outputStyle: 'compressed'
}
},
dev: {
options: {
sassDir: '_sass',
cssDir: 'assets/stylesheets',
specify: '_sass/main.scss',
}
}
},
});

grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-compass');

grunt.registerTask('default', [
'uglify:dist'
'uglify:dist',
'compass:dist'
]);
};
22 changes: 1 addition & 21 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,4 @@
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=true; g.src=u+'piwik.js';
s.parentNode.insertBefore(g,s); })();
</script>
<noscript><p><img src="{{ site.piwikUrl }}/piwik.php?idsite={{ site.piwikSiteId }}" style="border:0;" alt="" /></p></noscript>

{% comment %} ------------- Sharing --------------- {% endcomment %}

<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) { return; }
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>

<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>

<script type="text/javascript">
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
</script>
<noscript><p><img src="{{ site.piwikUrl }}/piwik.php?idsite={{ site.piwikSiteId }}" style="border:0;" alt="" /></p></noscript>
2 changes: 1 addition & 1 deletion _includes/head/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</script>
{% endif %}

<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.url }}">
<link rel="stylesheet" href="{{ "assets/stylesheets/main.css" | prepend: site.baseurl }}">

<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
Expand Down
19 changes: 19 additions & 0 deletions _includes/share/share-scripts.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{% comment %} ------------- Sharing --------------- {% endcomment %}

<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) { return; }
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>

<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>

<script type="text/javascript">
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
</script>
2 changes: 1 addition & 1 deletion _layouts/donate.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>PayPal</h2>

<hr />

<h2>BitCoin</h2>
<h2>Bitcoin</h2>

{{ page.bitcoinTitle }}

Expand Down
1 change: 1 addition & 0 deletions _layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ <h1>
{% include home/newsletter/newsletter.html %}

{% include footer.html %}
{% include share/share-scripts.html %}

</body>
</html>
4 changes: 0 additions & 4 deletions assets/stylesheets/main.scss → _sass/main.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
---
# hello world
---

@import "../bower_components/bourbon/dist/bourbon";

@import "variables";
Expand Down
22 changes: 22 additions & 0 deletions assets/stylesheets/main.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions assets/stylesheets/main.css.map

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"devDependencies": {
"grunt": "^0.4.5",
"grunt-contrib-uglify": "^0.5.1"
}
}
"devDependencies": {
"grunt": "^0.4.5",
"grunt-contrib-compass": "^1.0.1",
"grunt-contrib-uglify": "^0.5.1"
}
}

0 comments on commit fa30006

Please sign in to comment.