feat: card component, config and some other small changes

lin-yi · Sep 14, 2018 · 7aceb10 · 7aceb10
1 parent 337b743
commit 7aceb10
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 31 deletions.
diff --git a/_config.yml b/_config.yml
@@ -69,7 +69,6 @@ paths:
 ##############################
 ## excerpt
 excerpt_separator: <!--more-->
-excerpt_type: html # text (default), html
 
 ## license
 license: CC-BY-NC-4.0 # "CC-BY-4.0", "CC-BY-SA-4.0", "CC-BY-NC-4.0", "CC-BY-ND-4.0"

diff --git a/_includes/article-footer/author-profile.html b/_includes/article-footer/author-profile.html
@@ -6,8 +6,7 @@
   {%- assign _author_itemtype = 'http://schema.org/Person' -%}
 {%- endif -%}
 
-<div itemscope itemtype="{{ _author_itemtype }}" class="author-profile card card--no-shadow item">
-
+<div itemscope itemtype="{{ _author_itemtype }}" class="author-profile card card--flat item">
   {%- if _author.avatar -%}
     {%- if _author.url -%}
     <a href="{{ _author.url }}" class="item__image">

diff --git a/_includes/article-list.html b/_includes/article-list.html
@@ -13,7 +13,7 @@
   {%- assign _sorted_list = _sorted_list | reverse -%}
 {%- endif -%}
 
-{%- if include.type == 'common' -%}
+{%- if include.type == 'item' -%}
 <div class="article-list items items--divided">
 {%- elsif include.type == 'brief' -%}
 <div class="article-list items">
@@ -31,7 +31,7 @@
       {%- assign _article_cover = __return -%}
     {%- endif -%}
 
-    {%- if include.type == 'common' -%}
+    {%- if include.type == 'item' -%}
       {%- if include.article_type == 'BlogPosting' -%}
         <article class="item" itemscope itemtype="http://schema.org/BlogPosting">
       {%- else -%}
@@ -103,7 +103,7 @@
     {%- elsif include.type == 'grid' -%}
       {%- if include.size == 'sm' -%}
         <div class="cell cell--3 cell--md-4 cell--sm-12">
-          <div class="new-card">
+          <div class="card">
             {%- if _article_cover -%}
               <div class="card__image">
                 <img class="image" src="{{ _article_cover }}" />
@@ -119,7 +119,7 @@
       {%- else -%}
 
         <div class="cell cell--4 cell--md-6 cell--sm-12">
-          <div class="new-card card--flat">
+          <div class="card card--flat">
             {%- if _article_cover -%}
               <div class="card__image"><img src="{{ _article_cover }}" /></div>
             {%- endif -%}

diff --git a/_layouts/articles.html b/_layouts/articles.html
@@ -20,6 +20,9 @@
         {%- assign _articles = layout -%}
       {%- when 'paginator' -%}
         {%- assign _articles = paginator -%}
+      {%- else -%}
+        {%- assign _articles = site[_key] -%}
+      {%- else -%}
     {%- endcase -%}
   {%- else -%}
     {%- assign _articles = _articles[_key] -%}
@@ -72,7 +75,7 @@
       {%- assign _cover_size = page.articles.cover_size | default: layout.articles.cover_size -%}
       {%- assign _excerpt_type = page.articles.excerpt_type | default: layout.articles.excerpt_type -%}
 
-      {%- include article-list.html articles=_articles type='common'
+      {%- include article-list.html articles=_articles type='item'
         article_type=_article_type
         show_cover=_show_cover cover_size=_cover_size
         show_excerpt=_show_excerpt excerpt_type=_excerpt_type

diff --git a/_sass/additional/_alert.scss b/_sass/additional/_alert.scss
@@ -1,25 +1,29 @@
 .article__content {
   p.success {
-    @include card(false);
+    padding: .5rem 1rem;
     background-color: rgba($green, .1);
     border: 1px solid $green;
+    border-radius: map-get($base, border-radius);
   }
 
   p.info {
-    @include card(false);
+    padding: .5rem 1rem;
     background-color: rgba($blue, .1);
     border: 1px solid $blue;
+    border-radius: map-get($base, border-radius);
   }
 
   p.warning {
-    @include card(false);
+    padding: .5rem 1rem;
     background-color: rgba($yellow, .1);
     border: 1px solid $yellow;
+    border-radius: map-get($base, border-radius);
   }
 
   p.error {
-    @include card(false);
+    padding: .5rem 1rem;
     background-color: rgba($red, .1);
     border: 1px solid $red;
+    border-radius: map-get($base, border-radius);
   }
 }
diff --git a/_sass/common/components/_card.scss b/_sass/common/components/_card.scss
@@ -1,20 +1,5 @@
-@mixin card($has-shadow: default) {
-  @if $has-shadow == default {
-    $has-shadow: true;
-  }
-  padding: .5rem 1rem;
-  border-radius: map-get($base, border-radius);
-  @if $has-shadow {
-    @include box-shadow();
-  }
-}
 
 .card {
-  @include card();
-}
-
-
-.new-card {
   max-width: 18rem;
   border-radius: map-get($base, border-radius);
   @include box-shadow();
@@ -30,7 +15,7 @@
 }
 
 .cell {
-  & > .new-card {
+  & > .card {
     max-width: unset;
   }
 }

diff --git a/_sass/components/_author-profile.scss b/_sass/components/_author-profile.scss
@@ -1,5 +1,6 @@
 .author-profile {
   max-width: 25rem;
+  padding: .5rem 1rem;
   margin: map-get($base, vertical-space-lg) 0;
   font-size: map-get($base, font-size-sm);
   background-color: $text-background-color;

diff --git a/docs/_config.dev.yml b/docs/_config.dev.yml
@@ -70,7 +70,6 @@ paths:
 ##############################
 ## excerpt
 excerpt_separator: <!--more-->
-excerpt_type: html # text (default), html
 
 ## license
 license: CC-BY-4.0 # "CC-BY-4.0", "CC-BY-SA-4.0", "CC-BY-NC-4.0", "CC-BY-ND-4.0"

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -71,7 +71,6 @@ paths:
 ##############################
 ## excerpt
 excerpt_separator: <!--more-->
-excerpt_type: html # text (default), html
 
 ## license
 license: CC-BY-4.0 # "CC-BY-4.0", "CC-BY-SA-4.0", "CC-BY-NC-4.0", "CC-BY-ND-4.0"

diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml
@@ -44,12 +44,22 @@ docs-en:
         url:    /docs/en/additional-styles
   - title:      Extra
     children:
+      - title:  Spacing
+        url:    /docs/en/spacing
       - title:  Grid
         url:    /docs/en/grid
       - title:  Icons
         url:    /docs/en/icons
+      - title:  Image
+        url:    /docs/en/image
       - title:  Button
         url:    /docs/en/button
+      - title:  Item
+        url:    /docs/en/item
+      - title:  Card
+        url:    /docs/en/card
+      - title:  Hero
+        url:    /docs/en/hero
   - title:      Languages
     children:
       - title:  中文

diff --git a/index.html b/index.html
@@ -1,3 +1,5 @@
 ---
 layout: home
+# articles:
+#   excerpt_type: html
 ---
diff --git a/test/_config.yml b/test/_config.yml
@@ -69,7 +69,6 @@ paths:
 ##############################
 ## excerpt
 excerpt_separator: <!--more-->
-excerpt_type: html # text (default), html
 
 ## license
 license: CC-BY-NC-4.0 # "CC-BY-4.0", "CC-BY-SA-4.0", "CC-BY-NC-4.0", "CC-BY-ND-4.0"

diff --git a/test/index.html b/test/index.html
@@ -1,3 +1,5 @@
 ---
 layout: home
+# articles:
+#   excerpt_type: html
 ---