feat: add key setting for navigation.header and nav_key setting f…

…or page layout, resolve kitian616#127
ZeroneCat · Jan 11, 2019 · 05f3ee7 · 05f3ee7
1 parent 492be40
commit 05f3ee7
Show file tree

Hide file tree

Showing 31 changed files with 73 additions and 32 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -28,10 +28,10 @@
             {%- include snippets/get-nav-url.html path=page.url -%}
             {%- assign _page_url = __return -%}
             {%- include snippets/get-string-from-locale-config.html locale=_item.titles -%}
-            {%- if _nav_url == _page_url -%}
-              <li class="navigation__link navigation__link--active"><a href="{{ _nav_url }}">{%- if _item.title -%}{{ _item.title }}{%- else -%}{{ __return }}{%- endif -%}</a></li>
+            {%- if _nav_url == _page_url or page.nav_key and _item.key and page.nav_key == _item.key -%}
+              <li class="navigation__item navigation__item--active"><a href="{{ _nav_url }}">{%- if _item.title -%}{{ _item.title }}{%- else -%}{{ __return }}{%- endif -%}</a></li>
             {%- else -%}
-              <li class="navigation__link"><a href="{{ _nav_url }}">{%- if _item.title -%}{{ _item.title }}{%- else -%}{{ __return }}{%- endif -%}</a></li>
+              <li class="navigation__item"><a href="{{ _nav_url }}">{%- if _item.title -%}{{ _item.title }}{%- else -%}{{ __return }}{%- endif -%}</a></li>
             {%- endif -%}
           {%- endfor -%}
           {%- if site.search.provider -%}

diff --git a/_sass/components/_header.scss b/_sass/components/_header.scss
@@ -16,11 +16,21 @@
 .header--dark {
   @extend .text--dark;
   background: rgba(#000, .15);
+  .navigation__item--active {
+    &::after {
+      @include split-line(bottom, 4px, $text-color-theme-dark);
+    }
+  }
 }
 
 .header--light {
   @extend .text--light;
   background: rgba(#fff, .15);
+  .navigation__item--active {
+    &::after {
+      @include split-line(bottom, 4px, $text-color-theme-light);
+    }
+  }
 }
 
 .header__title {
@@ -89,21 +99,22 @@
         display: none;
       }
     }
-    .navigation__link {
-      &::after {
-        display: block;
-        margin-bottom: -4px;
-        content: "";
-        @include split-line(bottom, 4px, transparent);
-      }
-    }
-    .navigation__link--active {
-      a {
-        @include link-colors($main-color-1, $main-color-1);
-      }
-      &::after {
-        @include split-line(bottom, 4px, $main-color-1);
-      }
-    }
+  }
+}
+
+.navigation__item {
+  &::after {
+    display: block;
+    margin-bottom: -4px;
+    content: "";
+    @include split-line(bottom, 4px, transparent);
+  }
+}
+.navigation__item--active {
+  a {
+    @include link-colors($main-color-1, $main-color-1);
+  }
+  &::after {
+    @include split-line(bottom, 4px, $main-color-1);
   }
 }
diff --git a/docs/_config.dev.yml b/docs/_config.dev.yml
@@ -204,19 +204,21 @@ collections_dir: docs
 collections:
   docs:
     output: true
-  page:
+  sample_page:
     output: true
-  articles:
+  sample_articles:
     output: true
-  languages:
+  sample_languages:
     output: true
 
 defaults:
+  ## home
   - scope:
       path: "test"
     values:
       articles:
         excerpt_type: html
+  ## posts
   - scope:
       path: ""
       type: posts
@@ -231,20 +233,31 @@ defaults:
       show_subscribe: true
       pageview: true
       lightbox: true
+  ## samples
   - scope:
       path: ""
-      type: articles
+      type: sample_page
     values:
+      nav_key: samples
+  - scope:
+      path: ""
+      type: sample_articles
+    values:
+      nav_key: samples
       show_date: false
   - scope:
       path: ""
-      type: languages
+      type: sample_languages
     values:
       layout: article
+      nav_key: samples
+      show_date: false
+  ## docs
   - scope:
       path: "_docs/en"
     values:
       layout: article
+      nav_key: docs
       sidebar:
         nav: docs-en
       license: true
@@ -257,6 +270,7 @@ defaults:
       path: "_docs/zh"
     values:
       layout: article
+      nav_key: docs
       sidebar:
         nav: docs-zh
       license: true

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -206,19 +206,21 @@ collections_dir: docs
 collections:
   docs:
     output: true
-  page:
+  sample_page:
     output: true
-  articles:
+  sample_articles:
     output: true
-  languages:
+  sample_languages:
     output: true
 
 defaults:
+  ## home
   - scope:
       path: "test"
     values:
       articles:
         excerpt_type: html
+  ## posts
   - scope:
       path: ""
       type: posts
@@ -233,20 +235,31 @@ defaults:
       show_subscribe: true
       pageview: true
       # lightbox: true
+  ## samples
   - scope:
       path: ""
-      type: articles
+      type: sample_page
     values:
+      nav_key: samples
+  - scope:
+      path: ""
+      type: sample_articles
+    values:
+      nav_key: samples
       show_date: false
   - scope:
       path: ""
-      type: languages
+      type: sample_languages
     values:
       layout: article
+      nav_key: samples
+      show_date: false
+  ## docs
   - scope:
       path: "_docs/en"
     values:
       layout: article
+      nav_key: docs
       sidebar:
         nav: docs-en
       license: true
@@ -259,6 +272,7 @@ defaults:
       path: "_docs/zh"
     values:
       layout: article
+      nav_key: docs
       sidebar:
         nav: docs-zh
       license: true

diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml
@@ -3,8 +3,10 @@ header:
     url:        /test/
   - title:      Docs
     url:        /docs/en/quick-start
+    key:        docs
   - title:      Samples
     url:        /samples.html
+    key:        samples
   - title:      Archive
     url:        /archive.html
   - title:      About

diff --git a/docs/_articles/1.1-brief.md → docs/_sample_articles/1.1-brief.md b/docs/_articles/1.1-brief.md → docs/_sample_articles/1.1-brief.md
diff --git a/docs/_articles/1.2-brief-info.md → docs/_sample_articles/1.2-brief-info.md b/docs/_articles/1.2-brief-info.md → docs/_sample_articles/1.2-brief-info.md
diff --git a/...rticles/2.1-item-excerpt-readmore-info.md → ...rticles/2.1-item-excerpt-readmore-info.md b/...rticles/2.1-item-excerpt-readmore-info.md → ...rticles/2.1-item-excerpt-readmore-info.md
diff --git a/docs/_articles/2.2-item-cover.md → docs/_sample_articles/2.2-item-cover.md b/docs/_articles/2.2-item-cover.md → docs/_sample_articles/2.2-item-cover.md
diff --git a/docs/_articles/2.3-item-cover-excerpt.md → ...sample_articles/2.3-item-cover-excerpt.md b/docs/_articles/2.3-item-cover-excerpt.md → ...sample_articles/2.3-item-cover-excerpt.md
diff --git a/...ticles/2.4-item-cover-excerpt-readmore.md → ...ticles/2.4-item-cover-excerpt-readmore.md b/...ticles/2.4-item-cover-excerpt-readmore.md → ...ticles/2.4-item-cover-excerpt-readmore.md
diff --git a/...s/2.5-item-cover-excerpt-readmore-info.md → ...s/2.5-item-cover-excerpt-readmore-info.md b/...s/2.5-item-cover-excerpt-readmore-info.md → ...s/2.5-item-cover-excerpt-readmore-info.md
diff --git a/docs/_articles/3.1-grid.md → docs/_sample_articles/3.1-grid.md b/docs/_articles/3.1-grid.md → docs/_sample_articles/3.1-grid.md
diff --git a/docs/_articles/3.2-grid-small.md → docs/_sample_articles/3.2-grid-small.md b/docs/_articles/3.2-grid-small.md → docs/_sample_articles/3.2-grid-small.md
diff --git a/docs/_languages/1-english.md → docs/_sample_languages/1-english.md b/docs/_languages/1-english.md → docs/_sample_languages/1-english.md
diff --git a/docs/_languages/2-chinese-simplified.md → ..._sample_languages/2-chinese-simplified.md b/docs/_languages/2-chinese-simplified.md → ..._sample_languages/2-chinese-simplified.md
diff --git a/docs/_languages/3-chinese-traditional.md → ...sample_languages/3-chinese-traditional.md b/docs/_languages/3-chinese-traditional.md → ...sample_languages/3-chinese-traditional.md
diff --git a/docs/_languages/4-korean.md → docs/_sample_languages/4-korean.md b/docs/_languages/4-korean.md → docs/_sample_languages/4-korean.md
diff --git a/docs/_page/1.1-single.md → docs/_sample_page/1.1-single.md b/docs/_page/1.1-single.md → docs/_sample_page/1.1-single.md
diff --git a/docs/_page/1.2-aside.md → docs/_sample_page/1.2-aside.md b/docs/_page/1.2-aside.md → docs/_sample_page/1.2-aside.md
diff --git a/docs/_page/1.3-sidebar.md → docs/_sample_page/1.3-sidebar.md b/docs/_page/1.3-sidebar.md → docs/_sample_page/1.3-sidebar.md
diff --git a/docs/_page/1.4-sidebar+asdie.md → docs/_sample_page/1.4-sidebar+asdie.md b/docs/_page/1.4-sidebar+asdie.md → docs/_sample_page/1.4-sidebar+asdie.md
diff --git a/...article-header-overlay-background-fill.md → ...article-header-overlay-background-fill.md b/...article-header-overlay-background-fill.md → ...article-header-overlay-background-fill.md
diff --git a/...rticle-header-overlay-background-image.md → ...rticle-header-overlay-background-image.md b/...rticle-header-overlay-background-image.md → ...rticle-header-overlay-background-image.md
diff --git a/docs/_page/2.5-article-header-cover-image.md → ...le_page/2.5-article-header-cover-image.md b/docs/_page/2.5-article-header-cover-image.md → ...le_page/2.5-article-header-cover-image.md
diff --git a/...lay-background-image-header-background.md → ...lay-background-image-header-background.md b/...lay-background-image-header-background.md → ...lay-background-image-header-background.md
diff --git a/...e-header-cover-image-header-background.md → ...e-header-cover-image-header-background.md b/...e-header-cover-image-header-background.md → ...e-header-cover-image-header-background.md
diff --git a/...ound-fill-immersive-translucent-header.md → ...ound-fill-immersive-translucent-header.md b/...ound-fill-immersive-translucent-header.md → ...ound-fill-immersive-translucent-header.md
diff --git a/...und-image-immersive-translucent-header.md → ...und-image-immersive-translucent-header.md b/...und-image-immersive-translucent-header.md → ...und-image-immersive-translucent-header.md
diff --git a/...ver-image-immersive-translucent-header.md → ...ver-image-immersive-translucent-header.md b/...ver-image-immersive-translucent-header.md → ...ver-image-immersive-translucent-header.md
diff --git a/docs/samples.html b/docs/samples.html
@@ -6,16 +6,16 @@
 <div class="layout--articles">
   <section class="my-5">
     <header><h2 id="page-layout">Page Layout</h2></header>
-    {%- include article-list.html articles=site.page type='grid' -%}
+    {%- include article-list.html articles=site.sample_page type='grid' -%}
   </section>
 
   <section class="my-5">
     <header><h2 id="articles-layout">Articles(Home) Layout</h2></header>
-    {%- include article-list.html articles=site.articles type='grid' -%}
+    {%- include article-list.html articles=site.sample_articles type='grid' -%}
   </section>
 
   <section class="my-5">
     <header><h2 id="languages">Languages</h2></header>
-    {%- include article-list.html articles=site.languages type='grid' size='sm' -%}
+    {%- include article-list.html articles=site.sample_languages type='grid' size='sm' -%}
   </section>
 </div>