Merge pull request barryclark#56 from joariasl/master

Complete refactorization for css/grayscale.scss and sorted sections in index.html Fixes barryclark#40 barryclark#48 barryclark#57
tonymaibox · Nov 14, 2015 · 4ba5b71 · 4ba5b71
2 parents 0822013 + d7e043f
commit 4ba5b71
Show file tree

Hide file tree

Showing 18 changed files with 149 additions and 229 deletions.
diff --git a/_config.yml b/_config.yml
@@ -118,7 +118,7 @@ social:
 
 pages_list:
   About: 'about'
-  Blog: 'blog'
+  Blog: 'latest-post'
   Career: 'career'
   Contact: 'contact'
 
@@ -130,6 +130,6 @@ sass:
   style: compressed
 
 # Exclusion list from the generated _site
-exclude: ["Rakefile", "LICENSE", "readme.markdown", "vendor"]
+exclude: ["LICENSE", "README", "CONTRIBUTORS", "scripts"]
 
 gems: [jekyll-paginate]
diff --git a/_includes/about.html b/_includes/about.html
@@ -1,7 +1,7 @@
 
 <!-- About Start -->
 
-<section id="{{ page.title }}" class="container content-section text-center">
+<section id="{{ page.section-type }}" class="container content-section text-center">
   <div class="row">
       <div class="col-lg-10 col-lg-offset-1">
         {{ page.content | markdownify }}

diff --git a/_includes/career.html b/_includes/career.html
@@ -1,7 +1,7 @@
 
 <!-- Career Start -->
 
-<section id="{{ page.title }}" class="container content-section text-center">
+<section id="{{ page.section-type }}" class="container content-section text-center">
     <div class="row">
         <div class="col-lg-10 col-lg-offset-1">
 

diff --git a/_includes/contact.html b/_includes/contact.html
@@ -1,7 +1,7 @@
 
 <!-- Contact Start -->
 
-<section id="{{ page.title }}" class="container content-section text-center">
+<section id="{{ page.section-type }}" class="container content-section text-center">
     <div class="row">
         <div class="col-lg-10 col-lg-offset-1">
 

diff --git a/_includes/head.html b/_includes/head.html
@@ -27,7 +27,9 @@
 
   <!-- Custom CSS -->
   <link href="{{site.baseurl}}/css/grayscale.css" rel="stylesheet">
+  {% if page.section-type == "index" %}
   <link href="{{site.baseurl}}/css/timeline.css" rel="stylesheet">
+  {% endif %}
 
   <!-- Custom Fonts -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">

diff --git a/_includes/js.html b/_includes/js.html
@@ -14,7 +14,11 @@
 <!--* Start Bootstrap - Grayscale Bootstrap Theme (http://startbootstrap.com)
 * Code licensed under the Apache License v2.0.
 * For details, see http://www.apache.org/licenses/LICENSE-2.0.-->
-<script>$(window).scroll(function(){50<$(".navbar").offset().top?$(".navbar-fixed-top").addClass("top-nav-collapse"):$(".navbar-fixed-top").removeClass("top-nav-collapse")});$(function(){$("a.page-scroll").bind("click",function(b){var a=$(this);$("html, body").stop().animate({scrollTop:$(a.attr("href")).offset().top},1500,"easeInOutExpo",function(){a.blur()});b.preventDefault()})});$(".navbar-collapse ul li a").click(function(){$(".navbar-toggle:visible").click()});</script>
+<script>
+function toggleNavCollapse(){50<$(".navbar").offset().top?$(".navbar-fixed-top").addClass("top-nav-collapse"):$(".navbar-fixed-top").removeClass("top-nav-collapse");}
+$(document).ready(toggleNavCollapse);
+$(window).scroll(toggleNavCollapse);$(function(){$("a.page-scroll").bind("click",function(b){var a=$(this);$("html, body").stop().animate({scrollTop:$(a.attr("href")).offset().top-50},1500,"easeInOutExpo",function(){a.blur()});b.preventDefault()})});$(".navbar-collapse ul li a").click(function(){$(".navbar-toggle:visible").click()});
+</script>
 
 {% if site.google-tracking-id %}
 

diff --git a/_includes/latest-post.html b/_includes/latest-post.html
@@ -1,7 +1,7 @@
 
 <!-- Latest Post Preview Start -->
 
-<section id="{{ page.title }}" class="container content-section text-center">
+<section id="{{ page.section-type }}" class="container content-section text-center">
     <div class="row">
       <div class="col-lg-10 col-lg-offset-1">
 

diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -13,42 +13,31 @@
               <a class="navbar-brand page-scroll" href="{{site.baseurl}}/index.html#page-top">
             {% endif %}
             <div>{% if site.black-favicon %}<img src="{{site.baseurl}}{{ site.black-favicon }}" alt="">  {% endif %}{{ site.title }}</div>
-          </a>
+            </a>
         </div>
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse navbar-right navbar-main-collapse">
             <ul class="nav navbar-nav">
-                <!-- Hidden li included to remove active class from about link when scrolled up past about section -->
-                <li class="hidden">
-                    <a href="#page-top"></a>
-                </li>
-
                 {% if page.section-type == "index" %}
 
                   <!-- Scroll to section for each page in index -->
                   {% for p in site.pages_list %}
                     <li>
-                      <a class="page-scroll" href="#{{ p[1] }}"> {{ p[0] }} </a>
+                      <a class="page-scroll" href="#{{ p[1] }}"> {{ p[0] }}</a>
                     </li>
                   {% endfor %}
 
                 {% else %}
                   <!-- Blog, Post, Tag pages-->
                   {% for p in site.pages_list %}
-                    {% if page.section-type == "blog" and p[0] == "Blog" %}
-                      <!-- Blog button in blog.html doesn't refresh the page -->
-                      <li>
-                        <a class="page-scroll" href="#blog"> {{ p[0] }} </a>
-                      </li>
-                    {% elsif p[0] == "Blog" %}
-                      <li>
-                        <a class="page-scroll" href="{{site.baseurl}}/blog/index.html"> {{ p[0] }} </a>
-                      </li>
+                    <li>
+                    {% comment %} If are blog, redirect to index.html of Blog {% endcomment %}
+                    {% if p[1] == "latest-post" %}
+                        <a class="page-scroll" href="{{site.baseurl}}/blog/index.html"> {{ p[0] }}</a>
                     {% else %}
-                      <li>
-                        <a class="page-scroll" href="{{site.baseurl}}/index.html#{{ p[1] }}"> {{ p[0] }} </a>
-                      </li>
+                        <a class="page-scroll" href="{{site.baseurl}}/index.html#{{ p[1] }}"> {{ p[0] }}</a>
                     {% endif %}
+                    </li>
                   {% endfor %}
                 {% endif %}
             </ul>

diff --git a/_includes/pagination.html b/_includes/pagination.html
@@ -4,17 +4,21 @@
 <div class="pagination">
 
   <h4>
- 
+
   {% if paginator.previous_page %}
     <a href="{{site.baseurl}}{{ paginator.previous_page_path }}" class="previous">Newer Posts</a>
   {% endif %}
 
+  {% if paginator.previous_page and paginator.next_page %}
+    |
+  {% endif %}
+
   {% if paginator.next_page %}
     <a href="{{site.baseurl}}{{ paginator.next_page_path }}" class="next">Older Posts</a>
   {% endif %}
-  
+
   </h4>
-  
+
 </div>
 
 <!-- Pagination Links End -->
diff --git a/_layouts/blog.html b/_layouts/blog.html
@@ -6,18 +6,18 @@
 
   {% include head.html %}
 
-  <body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
+  <body>
 
     {% include navigation.html %}
 
-    <section id="{{ page.title }}" class="container content-section text-center">
+    <section class="container content-section text-center">
       <div class="row">
-        <div class="col-lg-8 col-lg-offset-2">
+        <div class="col-lg-10 col-lg-offset-1">
 
         {{ page.content | markdownify }}
 
         {% for post in paginator.posts %}
-          <h4 align="left"><strong>{{ post.date | date_to_string }}</strong> <small>. {{ post.category }} .</small> <a href="{{site.baseurl}}{{post.url}}"> <strong>{{ post.title }} </strong> </a> <small><a href="{{site.baseurl}}{{post.url}}#disqus_thread">Comments</a></small></h4>
+          <h4 align="left"><strong>{{ post.date | date_to_string }}</strong> <small>. {{ post.category }} .</small> <a href="{{site.baseurl}}{{post.url}}"> <strong>{{ post.title }}</strong> </a> <small><a href="{{site.baseurl}}{{post.url}}#disqus_thread">Comments</a></small></h4>
         {% endfor %}
 
         {% include pagination.html %}
@@ -26,9 +26,9 @@ <h4 align="left"><strong>{{ post.date | date_to_string }}</strong> <small>. {{ p
       </div>
     </section>
 
-    <section id="{{ page.title }}" class="container content-section text-center">
+    <section class="container content-section text-center">
       <div class="row">
-        <div class="col-lg-8 col-lg-offset-2">
+        <div class="col-lg-10 col-lg-offset-1">
           {% include social-buttons.html %}
         </div>
       </div>

diff --git a/_layouts/error.html b/_layouts/error.html
@@ -6,22 +6,28 @@
 
   {% include head.html %}
 
-  <body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
+  <body>
 
     {% include navigation.html %}
 
-    <section id="{{ page.title }}" class="container content-section text-center">
+    <section class="container content-section text-center">
       <div class="row">
-        <div class="col-lg-8 col-lg-offset-2">
+        <div class="col-lg-10 col-lg-offset-1">
 
           <h1><strong>{{ page.title }}</strong></h1>
 
           {{ page.content | markdownify }}
 
           <img class="img-responsive center-block" src="{{site.baseurl}}{{ site.404-img }}" alt="">
 
-          {% include social-buttons.html %}
+        </div>
+      </div>
+    </section>
 
+    <section class="container content-section text-center">
+      <div class="row">
+        <div class="col-lg-10 col-lg-offset-1">
+          {% include social-buttons.html %}
         </div>
       </div>
     </section>

diff --git a/_layouts/index.html b/_layouts/index.html
@@ -6,32 +6,18 @@
 
   {% include head.html %}
 
-  <body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
+  <body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top"  data-offset="51">
 
     {% include navigation.html %}
 
     {% include header.html %}
 
-    {% for page in site.pages %}
-
-      {% if page.section-type == "about" %}
-
-        {% include about.html %}
-
-      {% elsif page.section-type == "latest-post" %}
-
-        {% include latest-post.html %}
-
-      {% elsif page.section-type == "career" %}
-
-        {% include career.html %}
-
-      {% elsif page.section-type == "contact" %}
-
-        {% include contact.html %}
-
-      {% endif %}
-
+    {% for p in site.pages_list %}
+      {% for page in site.pages %}
+        {% if p[1] == page.section-type%}
+          {% include {{ page.path }} %}
+        {% endif %}
+      {% endfor %}
     {% endfor %}
 
     {% include footer.html %}

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -6,13 +6,13 @@
 
   {% include head.html %}
 
-  <body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
+  <body>
 
     {% include navigation.html %}
 
-    <section id="{{ page.title }}" class="container content-section text-center">
+    <section class="container content-section text-center">
       <div class="row">
-        <div class="col-lg-8 col-lg-offset-2">
+        <div class="col-lg-10 col-lg-offset-1">
 
           <h1><strong>{{ page.title }}</strong></h1>
           <h4><strong>{{ page.date | date_to_string }}</strong>
@@ -33,9 +33,9 @@ <h4><strong>{{ page.date | date_to_string }}</strong>
       </div>
     </section>
 
-    <section id="{{ page.title }}" class="container content-section text-center">
+    <section class="container content-section text-center">
       <div class="row">
-        <div class="col-lg-8 col-lg-offset-2">
+        <div class="col-lg-10 col-lg-offset-1">
           {% include social-buttons.html %}
         </div>
       </div>

diff --git a/_layouts/tag.html b/_layouts/tag.html
@@ -6,13 +6,13 @@
 
   {% include head.html %}
 
-  <body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
+  <body>
 
     {% include navigation.html %}
 
-    <section id="{{ page.title }}" class="container content-section text-center">
+    <section class="container content-section text-center">
       <div class="row">
-        <div class="col-lg-8 col-lg-offset-2">
+        <div class="col-lg-10 col-lg-offset-1">
 
           <div id="archives">
             <div>
@@ -33,9 +33,9 @@ <h4 align="left"><strong>{{ post.date | date_to_string }}</strong> <small>. {{ p
       </div>
     </section>
 
-    <section id="{{ page.title }}" class="container content-section text-center">
+    <section class="container content-section text-center">
       <div class="row">
-        <div class="col-lg-8 col-lg-offset-2">
+        <div class="col-lg-10 col-lg-offset-1">
           {% include social-buttons.html %}
         </div>
       </div>

diff --git a/_sass/_variables.scss b/_sass/_variables.scss
@@ -3,3 +3,13 @@
 $primary: #fed136;
 $dark: #000;
 $light: #fff;
+
+$header-text-shadow: true;
+$header-background-color: $dark;
+$intro-text-color: $light;
+$navbar-color: $light;
+$navbar-lg-collapse-background-color: $header-background-color;
+$navbar-lg-background: transparent;
+$navbar-sm-background-color: $navbar-lg-collapse-background-color;
+
+$social-buttons-color: $primary;