Merge branch 'master' of https://github.com/mmistakes/minimal-mistakes

* 'master' of https://github.com/mmistakes/minimal-mistakes: facebook sharing image meta tag added related mmistakes#149 issue 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 Conflicts: _config.yml _includes/_author-bio.html _sass/page.scss
srijanshetty · Jun 11, 2015 · 84d901c · 84d901c
2 parents a101c8e + 09fdd3c
commit 84d901c
Show file tree

Hide file tree

Showing 25 changed files with 768 additions and 486 deletions.
diff --git a/404.md b/404.md
@@ -2,11 +2,8 @@
 layout: page
 title: "Page Not Found"
 excerpt: "Page not found. Your pixels are in another canvas."
-image:
-  feature: texture-feature-01.jpg
-  credit: Texture Lovers
-  creditlink: http://texturelovers.com
 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.
@@ -16,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>
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'jekyll'
-gem "jekyll-sitemap"
+gem 'jekyll-sitemap'
 gem 'octopress', '~> 3.0.0.rc.12'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,20 +4,21 @@ GEM
     blankslate (2.1.2.4)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    classifier-reborn (2.0.2)
+    classifier-reborn (2.0.3)
       fast-stemmer (~> 1.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1)
     colorator (0.1)
-    execjs (2.2.2)
+    execjs (2.3.0)
     fast-stemmer (1.0.2)
     ffi (1.9.6)
     ffi (1.9.6-x64-mingw32)
     ffi (1.9.6-x86-mingw32)
     hitimes (1.2.2)
-    jekyll (2.5.1)
+    hitimes (1.2.2-x86-mingw32)
+    jekyll (2.5.3)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
       jekyll-coffeescript (~> 1.0)
@@ -36,54 +37,49 @@ GEM
       coffee-script (~> 2.2)
     jekyll-gist (1.1.0)
     jekyll-paginate (1.1.0)
-    jekyll-sass-converter (1.2.1)
+    jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-sitemap (0.6.2)
-    jekyll-watch (1.1.2)
+    jekyll-sitemap (0.8.0)
+    jekyll-watch (1.2.1)
       listen (~> 2.7)
-    kramdown (1.5.0)
-    liquid (2.6.1)
-    listen (2.7.11)
+    kramdown (1.6.0)
+    liquid (2.6.2)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    mercenary (0.3.4)
-    octopress (3.0.0.rc.15)
+    mercenary (0.3.5)
+    octopress (3.0.0.rc.34)
       jekyll (~> 2.0)
       mercenary (~> 0.3.2)
       octopress-deploy
-      octopress-docs
+      octopress-escape-code (~> 2.0)
+      octopress-hooks (~> 2.0)
       titlecase
-    octopress-deploy (1.0.0)
+    octopress-deploy (1.1.0)
       colorator
-      octopress-docs
-    octopress-docs (0.0.9)
-      jekyll (~> 2.0)
-      octopress-escape-code (~> 1.0)
-      octopress-hooks (~> 2.0)
-    octopress-escape-code (1.0.2)
+    octopress-escape-code (2.0.6)
       octopress-hooks (~> 2.0)
-    octopress-hooks (2.2.1)
+    octopress-hooks (2.6.0)
       jekyll (~> 2.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    posix-spawn (0.3.9)
-    pygments.rb (0.6.0)
+    posix-spawn (0.3.10)
+    pygments.rb (0.6.2)
       posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
+      yajl-ruby (~> 1.2.0)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.2.0)
+    redcarpet (3.2.2)
     safe_yaml (1.0.4)
-    sass (3.4.7)
+    sass (3.4.13)
     timers (4.0.1)
       hitimes
     titlecase (0.1.1)
     toml (0.1.2)
       parslet (~> 1.5.0)
-    yajl-ruby (1.1.0)
-    yajl-ruby (1.1.0-x86-mingw32)
+    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby

diff --git a/_config.yml b/_config.yml
@@ -53,6 +53,9 @@ owner:
   # steam: #username
   # dribbble: #username
   # weibo: #username
+  # xing: #username
+  # soundcloud: #username
+  # flickr: #username
 
 include: [".htaccess"]
 exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "Gemfile", "Gemfile.lock", "LICENSE", "README.md"]
diff --git a/_includes/_author-bio.html b/_includes/_author-bio.html
@@ -2,6 +2,8 @@
   {% assign author = site.data.authors[page.author] %}{% else %}{% assign author = site.owner %}
 {% endif %}
 
+<div itemscope itemtype="http://schema.org/Person">
+
 {% if author.avatar contains 'http' %}
 	<img src="{{ author.avatar }}" class="bio-photo" alt="{{ author.name }} bio photo">
 {% else %}
@@ -27,3 +29,4 @@ <h3>{{ author.name }}</h3>
 {% if author.soundcloud %}<a href="http://soundcloud.com/{{ author.soundcloud }}" class="author-social" target="_blank"><i class="fa fa-fw fa-soundcloud"></i> Soundcloud</a>{% endif %}
 {% if author.weibo %}<a href="http://www.weibo.com/{{ author.weibo }}" class="author-social" target="_blank"><i class="fa fa-fw fa-weibo"></i> Weibo</a>{% endif %}
 <a href="{{ site.url/feed.xml }}" class="author-social" target="_blank"><i class="fa fa-fw fa-rss"></i> RSS </a>
+</div>
diff --git a/_includes/_feed-footer.html b/_includes/_feed-footer.html
@@ -0,0 +1 @@
+&lt;p&gt;&lt;a href=&quot;{{ site.url }}{{ post.url }}&quot;&gt;{{ post.title | xml_escape }}&lt;/a&gt; was originally published by {{ site.owner.name }} at &lt;a href=&quot;{{ site.url }}&quot;&gt;{{ site.title }}&lt;/a&gt; on {{ post.date | date: "%B %d, %Y" }}.&lt;/p&gt;
diff --git a/_includes/_head.html b/_includes/_head.html
@@ -15,7 +15,6 @@
 {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
 <link rel="canonical" href="{{ canonical }}">
 <link href="{{ site.url }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
-{% if site.owner.google.plus %}<link rel="author" href="http://plus.google.com/+{{ site.owner.google.plus }}?rel=author">{% endif %}
 
 <!-- http://t.co/dKP3o1e -->
 <meta name="HandheldFriendly" content="True">

diff --git a/_includes/_open-graph.html b/_includes/_open-graph.html
@@ -16,4 +16,9 @@
 <meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
 {% if page.excerpt %}<meta property="og:description" content="{{ page.excerpt | strip_html }}">{% endif %}
 <meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.url }}">
-<meta property="og:site_name" content="{{ site.title }}">
+<meta property="og:site_name" content="{{ site.title }}">
+{% if page.image.feature %}
+<meta property="og:image" content="{{ site.url }}/images/{{ page.image.feature }}">
+{% else %}
+<meta property="og:image" content="{% if page.image.thumb %}{{ site.url }}/images/{{ page.image.thumb }}{% else %}{{ site.url }}/images/default-thumb.png{% endif %}">
+{% endif %}
diff --git a/_includes/_social-share.html b/_includes/_social-share.html
@@ -0,0 +1,14 @@
+<div class="social-share">
+  <h4>Share on</h4>
+  <ul>
+    <li>
+      <a href="https://twitter.com/intent/tweet?text={{ site.url }}{{ page.url }}" class="twitter" title="Share on Twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
+    </li>
+    <li>
+      <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ page.url }}" class="facebook" title="Share on Facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
+    </li>
+    <li>
+      <a href="https://plus.google.com/share?url={{ site.url }}{{ page.url }}" class="google-plus" title="Share on Google Plus"><i class="fa fa-google-plus"></i><span> Google+</span></a>
+    </li>
+  </ul>
+</div><!-- /.social-share -->
diff --git a/_includes/_toc.html b/_includes/_toc.html
@@ -0,0 +1,9 @@
+<section id="table-of-contents" class="toc">
+  <header>
+    <h3><i class="fa fa-book"></i> Overview</h3>
+  </header>
+<div id="drawer" markdown="1">
+*  Auto generated table of contents
+{:toc}
+</div>
+</section><!-- /#table-of-contents -->
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -36,6 +36,10 @@
     <h1>{{ page.title }}</h1>
     <div class="article-wrap">
       {{ content }}
+      {% if page.share != false %}
+        <hr />
+        {% include _social-share.html %}
+      {% endif %}
     </div><!-- /.article-wrap -->
     {% if site.owner.disqus-shortname and page.comments == true %}
       <section id="disqus_thread"></section><!-- /#disqus_thread -->

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -44,9 +44,7 @@ <h1><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }
       {{ content }}
       <hr />
       <footer role="contentinfo">
-        <div class="article-author-bottom">
-          {% include _author-bio.html %}
-        </div>
+        {% if page.share != false %}{% include _social-share.html %}{% endif %}
         <p class="byline"><strong>{{ page.title }}</strong> was published on <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time>{% if page.modified %} and last modified on <time datetime="{{ page.modified | date: "%Y-%m-%d" }}">{{ page.modified | date: "%B %d, %Y" }}</time>{% endif %}.</p>
       </footer>
     </div><!-- /.article-wrap -->
@@ -57,6 +55,7 @@ <h1><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }
 </div><!-- /#main -->
 
 <div class="footer-wrap">
+  {% if site.related_posts.size > 0 %}
   <div class="related-articles">
   <h4>You might also enjoy <small class="pull-right">(<a href="{{ site.url }}/posts/">View all posts</a>)</small></h4>
     <ul>
@@ -66,6 +65,7 @@ <h4>You might also enjoy <small class="pull-right">(<a href="{{ site.url }}/post
     </ul>
     <hr />
   </div><!-- /.related-articles -->
+  {% endif %}
   <footer>
     {% include _footer.html %}
   </footer>

diff --git a/_sass/coderay.scss b/_sass/coderay.scss
@@ -1,3 +1,7 @@
+/* ==========================================================================
+   Coderay syntax highlighting
+   ========================================================================== */
+
 .CodeRay {
   background-color: #efefef;
   font-family: $code-font;
@@ -130,4 +134,4 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .insert .insert { color: #080; font-weight:bold }
 .CodeRay .delete .delete { color: #800; font-weight:bold }
 .CodeRay .change .change { color: #66f; }
-.CodeRay .head .head { color: #f4f; }
+.CodeRay .head .head { color: #f4f; }
diff --git a/_sass/elements.scss b/_sass/elements.scss
@@ -1,3 +1,7 @@
+/* 
+   Rules
+   ========================================================================== */
+
 hr { 
 	display: block; 
 	margin: 1em 0; 
@@ -7,20 +11,29 @@ hr {
 	border-top: 1px solid #ccc;
 	border-bottom: 1px solid #fff; 
 }
-/* Figures and images ==================================== */
+
+/* 
+   Figures and images
+   ========================================================================== */
+
 figure {
 	margin-bottom: $indent-var;
 }
+
 article img {
 	max-width: 100%;
 	height: auto;
 	border-width: 0; 
 	vertical-align: middle; 
 	-ms-interpolation-mode: bicubic; 
 }
+
 svg:not(:root) {
 		overflow: hidden; 
 }
+
+/* 2 images of equal dimensions in a row */
+
 .half {
 	@include container;
 	@include clearfix;
@@ -33,6 +46,9 @@ svg:not(:root) {
 		}
 	}
 }
+
+/* 3 images of equal dimensions in a row */
+
 .third {
 	@include container;
 	@include clearfix;
@@ -45,7 +61,13 @@ svg:not(:root) {
 		}
 	}
 }
-/* Buttons ============================================== */
+
+/* 
+   Buttons
+   ========================================================================== */
+
+/* Default button */
+
 .btn {
   display: inline-block;
   margin-bottom: 20px;
@@ -68,6 +90,9 @@ svg:not(:root) {
     color: $primary;
   }
 }
+
+/* Success button */
+
 .btn-success {
   background-color: $success;
   color: $white;
@@ -80,6 +105,9 @@ svg:not(:root) {
     color: $success;
   }
 }
+
+/* Warning button */
+
 .btn-warning {
   background-color: $warning;
   color: $white;
@@ -92,6 +120,9 @@ svg:not(:root) {
     color: $warning;
   }
 }
+
+/* Danger button */
+
 .btn-danger {
   background-color: $danger;
   color: $white;
@@ -104,6 +135,9 @@ svg:not(:root) {
     color: $danger;
   }
 }
+
+/* Information button */
+
 .btn-info {
   background-color: $info;
   color: $white;
@@ -116,7 +150,11 @@ svg:not(:root) {
     color: $info;
   }
 }
-/* Well ================================================= */
+
+/* 
+   Wells
+   ========================================================================== */
+
 .well {
 	min-height: 20px;
 	padding: 19px;