Merge branch 'master' into translation

Author: reverince

Gemfile.lock

@@ -215,7 +215,7 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
     multipart-post (2.0.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     octokit (4.11.0)
       sawyer (~> 0.8.0, >= 0.5.3)

es.html _articles/es/index.htmles.html renamed to _articles/es/index.html

@@ -1,4 +1,5 @@
 ---
 layout: index
 lang: es
+permalink: /es/
 ---

fr.html _articles/fr/index.htmlfr.html renamed to _articles/fr/index.html

@@ -1,4 +1,5 @@
 ---
 layout: index
 lang: fr
+permalink: /fr/
 ---

id.html _articles/id/index.htmlid.html renamed to _articles/id/index.html

@@ -1,4 +1,5 @@
 ---
 layout: index
 lang: id
+permalink: /id/
 ---

ko.html _articles/ko/index.htmlko.html renamed to _articles/ko/index.html

@@ -1,4 +1,5 @@
 ---
 layout: index
 lang: ko
+permalink: /ko/
 ---

ta.html _articles/ta/index.htmlta.html renamed to _articles/ta/index.html

@@ -1,4 +1,5 @@
 ---
 layout: index
 lang: ta
+permalink: /ta/
 ---

zh-cn.html _articles/zh-cn/index.htmlzh-cn.html renamed to _articles/zh-cn/index.html

@@ -1,4 +1,5 @@
 ---
 layout: index
 lang: zh-cn
+permalink: /zh-cn/
 ---

_includes/nav.html

@@ -18,7 +18,11 @@
     {% if page.layout != 'index' %}
     <div class="float-sm-left pl-3 breadcrumb">
       <p class="my-0 py-3 py-sm-4 text-gray">
+        {% if page.lang != 'en' %}
+        <a href="/{{ page.lang }}/" class="text-gray">{{ site.title }}</a>
+        {% else %}
         <a href="/" class="text-gray">{{ site.title }}</a>
+        {% endif %}
       </p>
     </div>
     {% endif %}

_layouts/index.html

@@ -23,6 +23,7 @@ <h1 class="alt-h1">{{ site.title }}</h1>
     <div class="gutter-sm d-flex flex-wrap flex-items-stretch pb-md-6">
       {% assign articles = site.articles | where: 'lang', page.lang | sort: 'order' %}
       {% for article in articles %}
+      {% if article.layout != 'index' %}
       <div class="col-12 col-sm-9 mx-auto col-md-6 mt-4 mt-lg-5">
         <a href="{{ article.url | relative_url }}" class="guide-cover {{ article.class }} card height-full d-block">
 
@@ -41,6 +42,7 @@ <h3 class="alt-h3 text-bold lh-condensed mb-2 text-black">
 
         </a>
       </div>
+      {% endif %}
       {% endfor %}
     </div>
   </div>

assets/css/custom.scss

@@ -20,6 +20,11 @@ blockquote {
   }
 }
 
+.lead,
+.alt-lead {
+  word-break: keep-all;
+}
+
 .pquote {
   border: $border;
   padding: $spacer-3;
@@ -172,6 +177,7 @@ blockquote {
     font-size: 21px;
     font-weight: $font-weight-light;
     color: $gray;
+    word-break: keep-all;
     @include breakpoint(md) { font-size: 24px; }
     @include breakpoint(lg) { font-size: 26px; }