Added font-awomse. Buttons with icons. Text changes. Merge conflicts.

Author: DNZ\darius

Gruntfile.js

@@ -37,7 +37,7 @@ module.exports = function(grunt) {
 						atrules: true
 					}),
 					// add vendor prefixes
-					require('autoprefixer')({ browsers: 'iOS >= 7, last 2 versions, ie > 7' }), 
+					require('autoprefixer')({ browsers: 'iOS >= 7, last 2 versions, ie > 7' }),
 					// minify the result
 					require('cssnano')()
 					]
@@ -84,15 +84,15 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-nunjucks-2-html');
 
 /*
-*	Grunt tasks	
+*	Grunt tasks
 *	Run with grunt or grunt <command> in terminal
 */
 grunt.registerTask('default', 'run');
 grunt.registerTask('run',
 	[
 	'nunjucks',
-	'sass', 
-	'postcss', 
+	'sass',
+	'postcss',
 	'watch'
 	]
 	);
@@ -107,4 +107,4 @@ grunt.registerTask('create_html',
 	'nunjucks'
 	]
 	);
-};
+};

dist/about.html

@@ -92,12 +92,10 @@ <h2>What makes CastleCSS different?</h2>
 
 						<p>Our philosophy is mobile first, easy to update, self explanatory code. We want to be able to keep you up to date with the latest version of CastleCSS, which is only possible if you follow the installation instructions.</p>
 							<div>
-								<a class="btn mb" href="installation.html">Installation instructions</a>
-							</div>
-							<div>
-								<a class="github-button" href="https://github.com/castlecss/castlecss-boilerplate" aria-label="Watch castlecss/castlecss-boilerplate on GitHub">Watch</a>
-								<a class="github-button" href="https://github.com/castlecss/castlecss-boilerplate" aria-label="Star castlecss/castlecss-boilerplate on GitHub">Star</a>
-								<a class="github-button" href="https://github.com/castlecss/castlecss-boilerplate/archive/master.zip" aria-label="Download castlecss/castlecss on GitHub">Download</a>
+								<a class="btn-theme04 mb" href="installation.html"><i class="fa fa-book"></i> Installation instructions</a>
+
+								<a href="https://github.com/castlecss/castlecss-boilerplate" class="btn-theme02" aria-label="Watch castlecss/castlecss-boilerplate on GitHub" target="_blank"><i class="fa fa-github"></i> Watch on github</a>
+						<a href="https://github.com/castlecss/castlecss-boilerplate/archive/master.zip" class="btn" aria-label="Download castlecss/castlecss-boilerplate on GitHub" target="_blank"><i class="fa fa-cloud-download"></i> Download boilerplate</a>
 							</div>
 						</div>
 
@@ -121,10 +119,10 @@ <h2>What makes CastleCSS different?</h2>
 
 </script>
 
-<script src="../dist/js/shCore.js"></script>
-<script src="../dist/js/shBrushXml.js"></script>
-<script src="../dist/js/shBrushSass.js"></script>
-<script src="../dist/js/shBrushJScript.js"></script>
+<script src="js/shCore.js"></script>
+<script src="js/shBrushXml.js"></script>
+<script src="js/shBrushSass.js"></script>
+<script src="js/shBrushJScript.js"></script>
 <script type="text/javascript">SyntaxHighlighter.all();</script>
 <script async defer src="https://buttons.github.io/buttons.js"></script>
 

dist/buttons.html

@@ -125,10 +125,10 @@ <h1>Buttons</h1>
 
 </script>
 
-<script src="../dist/js/shCore.js"></script>
-<script src="../dist/js/shBrushXml.js"></script>
-<script src="../dist/js/shBrushSass.js"></script>
-<script src="../dist/js/shBrushJScript.js"></script>
+<script src="js/shCore.js"></script>
+<script src="js/shBrushXml.js"></script>
+<script src="js/shBrushSass.js"></script>
+<script src="js/shBrushJScript.js"></script>
 <script type="text/javascript">SyntaxHighlighter.all();</script>
 <script async defer src="https://buttons.github.io/buttons.js"></script>