nav에 liquid 넣은 거 작동하는지 테스트 / 전반적으로 san-serif 서체로 변경

bgpark82 · Sep 30, 2017 · 49b3e2e · 49b3e2e
1 parent 00d627f
commit 49b3e2e
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 25 deletions.
diff --git a/_config.yml b/_config.yml
@@ -25,7 +25,12 @@ author:
 version:        3.4.1
 github:
   repo:         https://github.com/iamleejihye/work
+nav_home_link:  true
+nav_about_link:  '/about'   # By default, your home page is your blog
+                                # page. If you change your paginate_path,
+                                # set this to the root of the paginate_path
+                                # to enable a separate blog link.
 
 # Gems
-gems:
+plugins:
   - jekyll-paginate
diff --git a/_includes/head.html b/_includes/head.html
@@ -4,13 +4,13 @@
 
   <title>
     {% if page.title == "Home" %}
-      {{ site.title }}
     {% else %}
       {{ page.title }} &middot; {{ site.title }}
     {% endif %}
   </title>
 
-  <!-- CSS -->
-  <link rel="stylesheet" href="{{ site.baseurl }}/styles.css">
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Libre+Baskerville:400,400i,700">
+    <!-- CSS -->
+    <link rel="stylesheet" href="{{ site.baseurl }}/styles.css">
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700" rel="stylesheet">
+    <link href='//spoqa.github.io/spoqa-han-sans/css/SpoqaHanSans-kr.css' rel='stylesheet' type='text/css'>
 </head>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -7,8 +7,17 @@
     <nav class="nav">
       <div class="nav-container">
         <ul>
-          <li><a href="{{ site.baseurl }}/">Work</a></li>
-          <li><a href="{{ '/about' | prepend: site.url }}">About</a></li>
+            <li>
+              {% if site.nav_home_link %}
+                <a class="{% if page.url == '/' %} test{% endif %}" href="{{ site.baseurl }}/">Work</a>
+                {% endif %}
+            </li>
+
+            <li>
+                {% if site.nav_about_link %}
+                    <a class="{% if page.url == site.nav_about_link %} test{% endif %}" href="{{ site.baseurl }}{{ site.nav_about_link }}">About</a>
+                {% endif %}
+            </li>
         </ul>
     </div>
   </nav>

diff --git a/_sass/_base.scss b/_sass/_base.scss
@@ -11,7 +11,7 @@ body {
 }
 
 html {
-  font-family: $serif;
+  font-family: $serif, $source;
   font-size: 14px;
 
   @media (min-width: 600px) {

diff --git a/_sass/_catalogue.scss b/_sass/_catalogue.scss
@@ -1,5 +1,5 @@
 .intro {
-	font-family: SourceSansPro;
+	font-family: $source, $serif;
 	font-size: 36px;
 	font-weight: bold;
 	line-height: 1.17;
@@ -25,7 +25,7 @@
 
   &-time {
     color: $default-tint;
-    font-family: $palatino;
+    font-family: $source;
     letter-spacing: .5px;
   }
 

diff --git a/_sass/_layout.scss b/_sass/_layout.scss
@@ -1,3 +1,6 @@
+.test {
+    color: red;
+}
 .container {
   margin: 0 auto;
   max-width: 800px;
@@ -18,7 +21,7 @@ footer,
 
   &-container {
       margin: 0 auto;
-      padding: 24px 0;
+      padding-bottom: 40px;
       position: relative;
       text-align: center;
   }
@@ -40,7 +43,6 @@ footer,
       list-style-type: none;
       margin: 0;
       padding: 0;
-      text-align: center;
   }
 
   li {
@@ -71,16 +73,11 @@ footer,
     &-container {
       text-align: left;
     }
-
-    ul {
-      bottom: 0;
-      position: absolute;
-    }
   }
 }
 
 footer {
-  font-family: $palatino;
+  font-family: $source;
   padding: 2rem 0;
   text-align: center;
 

diff --git a/_sass/_pagination.scss b/_sass/_pagination.scss
@@ -1,6 +1,6 @@
 .pagination {
   border-top: .5px solid $grey-2;
-  font-family: $palatino;
+  font-family: $source;
   padding-top: 2rem;
   position: relative;
   text-align: center;
@@ -13,7 +13,6 @@
   .top {
     @include transition(all .3s ease-out);
     color: $default-color;
-    font-family: $sans-font;
     font-size: 1.1rem;
     opacity: .6;
 

diff --git a/_sass/_post.scss b/_sass/_post.scss
@@ -3,7 +3,7 @@
 
   &-info {
     color: $default-tint;
-    font-family: $palatino;
+    font-family: $source;
     letter-spacing: .5px;
     text-align: center;
 

diff --git a/_sass/_variables.scss b/_sass/_variables.scss
@@ -1,5 +1,4 @@
-@import url(//spoqa.github.io/spoqa-han-sans/css/SpoqaHanSans-kr.css);
-
+// color 정의
 $default-color: #10171f;
 $default-shade: #10171f;
 $default-tint: #8898aa;
@@ -10,8 +9,9 @@ $white: #fff;
 $blue: #4a9ae1;
 $shadow-color: rgba(0, 0, 0, .2);
 
+// font-family 정의
 $serif: 'APPLE SD Gothic NEO', 'Spoqa Han Sans', Sans-serif;
-$palatino: Palatino, 'Palatino LT STD', 'Palatino Linotype', 'Book Antiqua', 'Georgia', serif;
+$source: 'Source Sans Pro', sans-serif;
 $sans-font: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 
 $monospaced-font: Menlo, Monaco, monospace;

diff --git a/index.html b/index.html
@@ -10,7 +10,7 @@ <h2>‘이지혜’ UI 디자이너입니다. 리디에서 일합니다.</h2>
 
 <div class="catalogue">
   {% for post in paginator.posts %}
-    <a href="{{ post.url | prepend: site.url }}" class="catalogue-item">
+    <a href="{{ post.url | prepend: site.baseurl }}" class="catalogue-item">
       <div>
         <time datetime="{{ post.date }}" class="catalogue-time">{{ post.date | date: "%B %d, %Y" }}</time>
         <h1 class="catalogue-title">{{ post.title }}</h1>