Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master: (157 commits)
  Show related posts only when there are 1 or more
  Update _author-bio.html
  mis-aligment of email address (all other items have an leading whitespace)
  added link to XING profile
  Update gems
  Remove http protocol from Google search form
  Remove feature image
  Display custom 404 page - Fixes mmistakes#128
  Move feed footer to an include
  Fix social share buttons overlapping on small screens
  Add optional social sharing buttons - Social share buttons appear at the end of every post and page unless you add share: false to their YAML Front Matter - Fixes mmistakes#42
  Improve table of contents - Replace html snippet with _includes/toc.html - Add FA icon to table of contents header - Display table of contents on small screens - Add hierarchy to toc with indents
  Clean up comments
  Clean up comments in Sass partials
  Remove print styles
  Fix typo
  Remove duplicate author content
  Remove Google Authorship - Fixes mmistakes#120 - Add person microdata in author sidebar
  add Flickr social button to author-bio.html
  add social button in author-bio.html
  ...
  • Loading branch information
elizabrock committed May 13, 2015
2 parents d9f0fc5 + 3d685a1 commit c86bb8e
Show file tree
Hide file tree
Showing 134 changed files with 5,696 additions and 3,108 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
_site
.sass-cache
.DS_Store
*.sublime-project
*.sublime-workspace
Expand Down
10 changes: 4 additions & 6 deletions 404.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
---
layout: page
title: "Page Not Found"
description: "Page not found. Your pixels are in another canvas."
image:
feature: texture-feature-01.jpg
credit: Texture Lovers
creditlink: http://texturelovers.com
excerpt: "Page not found. Your pixels are in another canvas."
sitemap: false
permalink: /404.html
---

Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below.
Expand All @@ -15,5 +13,5 @@ Sorry, but the page you were trying to view does not exist --- perhaps you can t
var GOOG_FIXURL_SITE = '{{ site.url }}'
</script>
<script type="text/javascript"
src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js">
src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js">
</script>
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ GEM
pygments.rb (0.6.1)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.2.0)
rake (10.3.2)
rake (10.4.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
Expand Down
30 changes: 4 additions & 26 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,6 @@ module.exports = function(grunt) {
'!assets/js/scripts.min.js'
]
},
recess: {
dist: {
options: {
compile: true,
compress: true
},
files: {
'assets/css/main.min.css': [
'assets/less/main.less'
],
'assets/css/ie.min.css': [
'assets/less/ie.less'
]
}
}
},
uglify: {
dist: {
files: {
Expand Down Expand Up @@ -64,13 +48,6 @@ module.exports = function(grunt) {
}
},
watch: {
less: {
files: [
'assets/less/*.less',
'assets/less/bootstrap/*.less'
],
tasks: ['recess']
},
js: {
files: [
'<%= jshint.all %>'
Expand All @@ -80,7 +57,6 @@ module.exports = function(grunt) {
},
clean: {
dist: [
'assets/css/main.min.css',
'assets/js/scripts.min.js'
]
}
Expand All @@ -91,20 +67,22 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-recess');
grunt.loadNpmTasks('grunt-contrib-imagemin');
grunt.loadNpmTasks('grunt-svgmin');

// Register tasks
grunt.registerTask('default', [
'clean',
'recess',
'uglify',
'imagemin',
'svgmin'
]);
grunt.registerTask('dev', [
'watch'
]);
grunt.registerTask('images', [
'imagemin',
'svgmin'
]);

};
Loading

0 comments on commit c86bb8e

Please sign in to comment.