Merge remote-tracking branch 'upstream/master'

* upstream/master: New comment. (mmistakes#751) New comment. (mmistakes#750) Fix typo New comment. (mmistakes#745) New comment. (mmistakes#743) New comment. (mmistakes#729) Bump version to 4.1.1 Update CHANGELOG.md and history Remove hardcoded read time values and make “minute read” values dynamic based off of `site.words_per_minute` - Close mmistakes#703 Fix `author.youtube` conditional in author sidebar Change Jekyll to a runtime dependency Add support for YouTube channel URLs in `/docs` author sidebar Add support for YouTube channel URLs in author sidebar - Close mmistakes#716 Update Font Awesome to v4.7.0 in `/docs` Update Font Awesome to v4.7.0 - Close mmistakes#723 Bump version to 4.1.0 Update CHANGELOG and history Add include for adding custom author profile links to sidebar Fix padding issue with pagination buttons - Close mmistakes#694 Fix link to Discourse.org homepage in noscript section (mmistakes#699)
martinbjeldbak · Feb 1, 2018 · 1af2ec6 · 1af2ec6
2 parents 8e5d905 + 77db91a
commit 1af2ec6
Show file tree

Hide file tree

Showing 16 changed files with 2,954 additions and 783 deletions.
diff --git a/_config.yml b/_config.yml
@@ -88,10 +88,18 @@ author:
   github           : "martinbjeldbak"
   keybase          : # "martinb"
   instagram        :
+  lastfm           :
   linkedin         : "martinbjeldbak"
+  pinterest        :
+  soundcloud       :
   stackoverflow    : # "660936/martin"
+  steam            :
+  tumblr           :
   twitter          : "martinbjeldbak"
-
+  vine             :
+  weibo            :
+  xing             :
+  youtube          : # "https://youtube.com/c/MichaelRoseDesign"
 
 # Reading Files
 include:

diff --git a/_includes/author-profile-custom-links.html b/_includes/author-profile-custom-links.html
@@ -0,0 +1,7 @@
+<!--
+  <li>
+    <a href="http://link-to-whatever-social-network.com/user/" itemprop="sameAs">
+      <i class="fa fa-fw" aria-hidden="true"></i> Custom Social Profile Link
+    </a>
+  </li>
+-->
diff --git a/_includes/author-profile.html b/_includes/author-profile.html
@@ -30,26 +30,23 @@ <h3 class="author__name" itemprop="name">{{ author.name }}</h3>
     <ul class="author__urls social-icons">
       {% if author.location %}
         <li itemprop="homeLocation" itemscope itemtype="http://schema.org/Place">
-          <i class="fa fa-fw fa-map-marker" aria-hidden="true"></i> 
-          <span itemprop="name"> {{ author.location }} </span>
+          <i class="fa fa-fw fa-map-marker" aria-hidden="true"></i> <span itemprop="name">{{ author.location }}</span>
         </li>
       {% endif %}
-      
+
       {% if author.uri %}
         <li>
           <a href="{{ author.uri }}" itemprop="url">
-            <i class="fa fa-fw fa-chain" aria-hidden="true"></i> 
-              {{ site.data.ui-text[site.locale].website_label | default: "Website" }}
+            <i class="fa fa-fw fa-chain" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].website_label | default: "Website" }}
           </a>
         </li>
       {% endif %}
-      
+
       {% if author.email %}
         <li>
           <a href="mailto:{{ author.email }}">
-            <i class="fa fa-fw fa-envelope-square" aria-hidden="true"></i>
             <meta itemprop="email" content="{{ author.email }}" />
-            {{ site.data.ui-text[site.locale].email_label | default: "Email" }}
+            <i class="fa fa-fw fa-envelope-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].email_label | default: "Email" }}
           </a>
         </li>
       {% endif %}
@@ -62,137 +59,197 @@ <h3 class="author__name" itemprop="name">{{ author.name }}</h3>
       {% endif %}
 
       {% if author.keybase %}
-        <li><a href="https://keybase.io/{{ author.keybase }} " itemprop="sameAs">
-          <i class="fa fa-fw fa-key" aria-hidden="true"></i> 
-          Keybase
-        </a></li>
+        <li>
+          <a href="https://keybase.io/{{ author.keybase }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-key" aria-hidden="true"></i> Keybase
+          </a>
+        </li>
       {% endif %}
+
       {% if author.twitter %}
-        <li><a href="https://twitter.com/{{ author.twitter }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> 
-          Twitter
-        </a></li>
+        <li>
+          <a href="https://twitter.com/{{ author.twitter }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter
+          </a>
+        </li>
       {% endif %}
+
       {% if author.facebook %}
-        <li><a href="https://www.facebook.com/{{ author.facebook }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> 
-          Facebook
-        </a></li>
+        <li>
+          <a href="https://www.facebook.com/{{ author.facebook }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook
+          </a>
+        </li>
       {% endif %}
+
       {% if author.google_plus %}
-        <li><a href="https://plus.google.com/+{{ author.google_plus }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-google-plus-square" aria-hidden="true"></i> 
-          Google+
-        </a></li>
+        <li>
+          <a href="https://plus.google.com/+{{ author.google_plus }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-google-plus-square" aria-hidden="true"></i> Google+
+          </a>
+        </li>
       {% endif %}
+
       {% if author.linkedin %}
-        <li><a href="https://www.linkedin.com/in/{{ author.linkedin }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-linkedin-square" aria-hidden="true"></i> 
-          LinkedIn
-        </a></li>
+        <li>
+          <a href="https://www.linkedin.com/in/{{ author.linkedin }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-linkedin-square" aria-hidden="true"></i> LinkedIn
+          </a>
+        </li>
       {% endif %}
+
       {% if author.xing %}
-        <li><a href="https://www.xing.com/profile/{{ author.xing }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-xing-square" aria-hidden="true"></i> 
-          XING
-        </a></li>
+        <li>
+          <a href="https://www.xing.com/profile/{{ author.xing }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-xing-square" aria-hidden="true"></i> XING
+          </a>
+        </li>
       {% endif %}
+
       {% if author.instagram %}
-        <li><a href="https://instagram.com/{{ author.instagram }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-instagram" aria-hidden="true"></i> 
-          Instagram
-        </a></li>
+        <li>
+          <a href="https://instagram.com/{{ author.instagram }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-instagram" aria-hidden="true"></i> Instagram
+          </a>
+        </li>
       {% endif %}
+
       {% if author.tumblr %}
-        <li><a href="https://{{ author.tumblr }}.tumblr.com" itemprop="sameAs">
-          <i class="fa fa-fw fa-tumblr-square" aria-hidden="true"></i> 
-          Tumblr
-        </a></li>
+        <li>
+          <a href="https://{{ author.tumblr }}.tumblr.com" itemprop="sameAs">
+            <i class="fa fa-fw fa-tumblr-square" aria-hidden="true"></i> Tumblr
+          </a>
+        </li>
       {% endif %}
+
       {% if author.bitbucket %}
-        <li><a href="https://bitbucket.org/{{ author.bitbucket }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> 
-          Bitbucket
-        </a></li>
+        <li>
+          <a href="https://bitbucket.org/{{ author.bitbucket }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket
+          </a>
+        </li>
       {% endif %}
+
       {% if author.github %}
+<<<<<<< HEAD
         <li><a href="https://github.com/{{ author.github }}" itemprop="sameAs">
           <i class="fa fa-fw fa-github" aria-hidden="true"></i> 
           GitHub
         </a></li>
+=======
+        <li>
+          <a href="https://github.com/{{ author.github }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub
+          </a>
+        </li>
+>>>>>>> upstream/master
       {% endif %}
+
       {% if author.stackoverflow %}
-        <li><a href="https://www.stackoverflow.com/users/{{ author.stackoverflow }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-stack-overflow" aria-hidden="true"></i> 
-          Stackoverflow
-        </a></li>
+        <li>
+          <a href="https://www.stackoverflow.com/users/{{ author.stackoverflow }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow
+          </a>
+        </li>
       {% endif %}
+
       {% if author.lastfm %}
-        <li><a href="https://last.fm/user/{{ author.lastfm }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-lastfm-square" aria-hidden="true"></i> 
-          Last.fm
-        </a></li>
+        <li>
+          <a href="https://last.fm/user/{{ author.lastfm }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-lastfm-square" aria-hidden="true"></i> Last.fm
+          </a>
+        </li>
       {% endif %}
+
       {% if author.dribbble %}
-        <li><a href="https://dribbble.com/{{ author.dribbble }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-dribbble" aria-hidden="true"></i> 
-          Dribbble
-        </a></li>
+        <li>
+          <a href="https://dribbble.com/{{ author.dribbble }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-dribbble" aria-hidden="true"></i> Dribbble
+          </a>
+        </li>
       {% endif %}
+
       {% if author.pinterest %}
-        <li><a href="https://www.pinterest.com/{{ author.pinterest }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-pinterest" aria-hidden="true"></i> 
-          Pinterest
-        </a></li>
+        <li>
+          <a href="https://www.pinterest.com/{{ author.pinterest }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-pinterest" aria-hidden="true"></i> Pinterest
+          </a>
+        </li>
       {% endif %}
+
       {% if author.foursquare %}
-        <li><a href="https://foursquare.com/{{ author.foursquare }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-foursquare" aria-hidden="true"></i> 
-          Foursquare
-        </a></li>
+        <li>
+          <a href="https://foursquare.com/{{ author.foursquare }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-foursquare" aria-hidden="true"></i> Foursquare
+          </a>
+        </li>
       {% endif %}
+
       {% if author.steam %}
-        <li><a href="https://steamcommunity.com/id/{{ author.steam }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-steam-square" aria-hidden="true"></i> 
-          Steam
-        </a></li>
+        <li>
+          <a href="https://steamcommunity.com/id/{{ author.steam }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-steam-square" aria-hidden="true"></i> Steam
+          </a>
+        </li>
       {% endif %}
+
       {% if author.youtube %}
-        <li><a href="https://www.youtube.com/user/{{ author.youtube }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-youtube-square" aria-hidden="true"></i> 
-          YouTube
-        </a></li>
+        {% if author.youtube contains "://" %}
+          <li>
+            <a href="{{ author.youtube }}" itemprop="sameAs">
+              <i class="fa fa-fw fa-youtube-square" aria-hidden="true"></i> YouTube
+            </a>
+          </li>
+        {% else author.youtube %}
+          <li>
+            <a href="https://www.youtube.com/user/{{ author.youtube }}" itemprop="sameAs">
+              <i class="fa fa-fw fa-youtube-square" aria-hidden="true"></i> YouTube
+            </a>
+          </li>
+        {% endif %}
       {% endif %}
+
       {% if author.soundcloud %}
-        <li><a href="https://soundcloud.com/{{ author.soundcloud }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-soundcloud" aria-hidden="true"></i> 
-          Soundcloud
-        </a></li>
+        <li>
+          <a href="https://soundcloud.com/{{ author.soundcloud }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-soundcloud" aria-hidden="true"></i> Soundcloud
+          </a>
+        </li>
       {% endif %}
+
       {% if author.weibo %}
-        <li><a href="https://www.weibo.com/{{ author.weibo }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-weibo" aria-hidden="true"></i> 
-          Weibo
-        </a></li>
+        <li>
+          <a href="https://www.weibo.com/{{ author.weibo }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-weibo" aria-hidden="true"></i> Weibo
+          </a>
+        </li>
       {% endif %}
+
       {% if author.flickr %}
-        <li><a href="https://www.flickr.com/{{ author.flickr }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-flickr" aria-hidden="true"></i> 
-          Flickr
-        </a></li>
+        <li>
+          <a href="https://www.flickr.com/{{ author.flickr }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-flickr" aria-hidden="true"></i> Flickr
+          </a>
+        </li>
       {% endif %}
+
       {% if author.codepen %}
-        <li><a href="https://codepen.io/{{ author.codepen }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-codepen" aria-hidden="true"></i> 
-          CodePen
-        </a></li>
+        <li>
+          <a href="https://codepen.io/{{ author.codepen }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-codepen" aria-hidden="true"></i> CodePen
+          </a>
+        </li>
       {% endif %}
+
       {% if author.vine %}
-        <li><a href="https://vine.co/u/{{ author.vine }}" itemprop="sameAs">
-          <i class="fa fa-fw fa-vine" aria-hidden="true"></i> 
-          Vine
-        </a></li>
+        <li>
+          <a href="https://vine.co/u/{{ author.vine }}" itemprop="sameAs">
+            <i class="fa fa-fw fa-vine" aria-hidden="true"></i> Vine
+          </a>
+        </li>
       {% endif %}
+
+      {% include author-profile-custom-links.html %}
     </ul>
   </div>
 </div>
diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html
@@ -9,5 +9,5 @@
      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
    })();
 </script>
-<noscript>Please enable JavaScript to view the comments powered by [Discourse](http://forum.beta-europe.org/c/beta/website).</a></noscript>
-{% endif %}
+<noscript>Please enable JavaScript to view the comments powered by <a href="https://www.discourse.org/">Discourse.</a></noscript>
+{% endif %}
diff --git a/_includes/read-time.html b/_includes/read-time.html
@@ -6,9 +6,9 @@
   {% assign words = page.content | strip_html | number_of_words %}
 {% endif %}
 
-{% if words < 180 %}
+{% if words < words_per_minute %}
   {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
-{% elsif words < 360 %}
+{% elsif words == words_per_minute %}
   1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
 {% else %}
   {{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}

diff --git a/_sass/_navigation.scss b/_sass/_navigation.scss
@@ -75,6 +75,7 @@
     margin-left: -1px;
 
     a {
+      display: block;
       margin-bottom: 0.25em;
       padding: 0.5em 1em;
       font-family: $sans-serif;

diff --git a/_sass/vendor/font-awesome/_font-awesome.scss b/_sass/vendor/font-awesome/_font-awesome.scss
@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.6.3 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */