Adding new features

sylhare · sylhare · commit 6ca105c3b00c · 2017-10-18T03:50:36.000-04:00
diff --git a/_config.yml b/_config.yml
@@ -47,7 +47,6 @@ theme_settings:
   google_analytics: # Tracking ID, e.g. "UA-000000-01"
   disqus_shortname:
   katex: true # Enable if using math markup
-  #bootstrap: true # Enable bootstrap on bootstrap layout
 
   # Localization strings
   str_follow_on: "Follow on"
diff --git a/_development_tool/navbar/_navbar1.scss b/_development_tool/navbar/_navbar1.scss
diff --git a/_development_tool/navbar/_navbar2.scss b/_development_tool/navbar/_navbar2.scss
diff --git a/_development_tool/navbar/_navbar3.scss b/_development_tool/navbar/_navbar3.scss
diff --git a/_development_tool/navbar/_navbar4.scss b/_development_tool/navbar/_navbar4.scss
diff --git a/_development_tool/navbar/navbar1.html b/_development_tool/navbar/navbar1.html
diff --git a/_development_tool/navbar/navbar2.html b/_development_tool/navbar/navbar2.html
diff --git a/_development_tool/navbar/navbar3.html b/_development_tool/navbar/navbar3.html
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -5,20 +5,12 @@
 {% if site.theme_settings.footer_text %}
 <footer class="site-footer">
     <p class="text">{{ site.theme_settings.footer_text }}</p>
-	
-    <div class="bootstrap-iso container">
-        <div class="row">
-            
-        </div>    
-        <div class="row">
-            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-                <ul class="list-inline text-center type">
+            <div class="footer-icons">
+                <ul>
                 <!-- Social icons from Font Awesome, if enabled -->
                 {% include icons.html %}
                 </ul>
             </div>
-        </div>
-    </div>
 </footer>
 {% endif %}
 
diff --git a/_includes/head.html b/_includes/head.html
@@ -4,14 +4,16 @@
     <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.theme_settings.description }}{% endif %}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     
+    <!-- JQuery (used for bootstrap and jekyll search -->
+    <script src="{{ " /assets/js/jquery-3.2.1.min.js " | prepend: site.baseurl }}"></script>
+    
+    {% if page.bootstrap %}
     <!-- Bootstrap-3.3.7 isolation CSS -->
     <link rel="stylesheet" type="text/css" href="{{ " /assets/css/bootstrap-iso.css " | prepend: site.baseurl }}">
-
-    <!-- JQuery -->
-    <script src="{{ " /assets/js/jquery-3.2.1.min.js " | prepend: site.baseurl }}"></script>
-
+    
     <!-- Bootstrap JS -->
     <script src="{{ " /assets/js/bootstrap.min.js " | prepend: site.baseurl }}"></script>
+    {% endif %}
     
     <!-- Navbar JS -->
     <script src="{{ " /assets/js/navbar.js " | prepend: site.baseurl }}"></script>
diff --git a/_includes/tags_list.html b/_includes/tags_list.html
@@ -1,9 +1,14 @@
-{% if include.tag_count > 0 %}
-<footer>
-  <div class="tags">
-    {% for tag in include.tags %}
-    <a class="tag" href="{{site.baseurl}}/tags#{{tag}}">#{{tag}}</a>
-    {% endfor %}
-  </div>
-</footer>
-{% endif %}
+  {% if include.tag_count > 0 %}
+    <footer>
+      {% if include.tag_count == 1 %}
+        <div class="meta">Tag</div>
+      {% elsif include.tag_count > 1 %}
+        <div class="meta">Tags</div>
+      {% endif %}
+      {% for tag in page.tags %}
+        <a class="button" href="{{site.baseurl}}/pages/tags#{{tag}}">
+          <i class="fa fa-tag fa-fw"></i> {{ tag }}
+        </a>
+      {% endfor %}
+    </footer>
+  {% endif %}
diff --git a/_layouts/bootstrap.html b/_layouts/bootstrap.html
@@ -1,5 +1,6 @@
 --- 
 layout: default 
+bootstrap: true
 ---
 
 <article {% if page.feature-img %}class="feature-image" {% endif %}>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -7,4 +7,7 @@ <h1 class="title">{{ page.title }}</h1>
     {% if page.subtitle %}<h2 class="subtitle">{{ page.subtitle }}</h2>{% endif %}
   </header>
   <section class="post-content">{{ content }}</section>
+    
+  <!-- Tag list -->
+  {% include tags_list.html tag_count=page.tags.size %}
 </article>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -10,24 +10,9 @@ <h1 class="title">{{ page.title }}</h1>
     </p>
   </header>
   <section class="post-content">{{ content }}</section>
-    
-  <!-- Post tags -->
-  {% assign val = page.tags | size %}
-  {% if val > 0 %}
-    <footer>
-      {% if val == 1 %}
-        <div class="meta">Tag</div>
-      {% elsif val > 1 %}
-        <div class="meta">Tags</div>
-      {% endif %}
-      {% for tag in page.tags %}
-        <a class="button" href="{{site.baseurl}}/pages/tags#{{tag}}">
-          <i class="fa fa-tag fa-fw"></i> {{ tag }}
-        </a>
-      {% endfor %}
-    </footer>
-  {% endif %}
-    {% include tags_list.html tags=page.tags tag_count=page.tags.size %}
+   
+   <!-- Tag list -->
+   {% include tags_list.html tag_count=page.tags.size %}
 </article>
 
 <!-- Disqus -->
diff --git a/_portfolio/cake.md b/_portfolio/cake.md
@@ -3,7 +3,7 @@ layout: post
 title: Cake
 feature-img: "assets/img/portfolio/cake.png"
 img: "assets/img/portfolio/cake.png"
-date: September 2014
+date: 27 September 2015
 tags: [Lorem, Ipsum, portfolio]
 ---
 
diff --git a/_portfolio/circus.md b/_portfolio/circus.md
@@ -3,7 +3,7 @@ layout: post
 title: Circus
 img: "assets/img/portfolio/circus.png"
 date: September 2014
-tags: [Lorem, Ipsum]
+tags: [Ipsum]
 ---
 
 ![image]({{ site.baseurl }}/{{ page.img }})
diff --git a/_portfolio/gitlecture.md b/_portfolio/gitlecture.md
@@ -2,8 +2,8 @@
 layout: post
 title: Github
 img: "assets/img/portfolio/github.png"
-date: September 2014
-tags: [Lorem, Ipsum, portfolio]
+date: 20-10-2017
+tags: [Lorem, portfolio]
 ---
 
 ![image]({{ site.baseurl }}/{{ page.img }})
diff --git a/_portfolio/hanoi.md b/_portfolio/hanoi.md
@@ -3,7 +3,6 @@ layout: post
 title: Tower of Hanoi
 img: "assets/img/portfolio/toh.png"
 date: September 2014
-tags: [Lorem, Ipsum]
 ---
 
 ![image]({{ site.baseurl }}/{{ page.img }})
diff --git a/_portfolio/jekyllblog.md b/_portfolio/jekyllblog.md
@@ -3,8 +3,8 @@ layout: post
 title: Jekyll
 feature-img: "assets/img/portfolio/cabin.png"
 img: "assets/img/portfolio/cabin.png"
-date: September 2014
-tags: [Lorem, Ipsum]
+date: 2017-05-26
+tags: [Lorem, Test]
 ---
 
 Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem <a>quia voluptas sit aspernatur</a> aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius <a>modi tempora incidunt</a> ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
diff --git a/_portfolio/ninja.md b/_portfolio/ninja.md
@@ -2,8 +2,8 @@
 layout: post
 title: Ninja
 img: "assets/img/portfolio/ninja.png"
-date: September 2014
-tags: [Lorem, Ipsum]
+date: April, 08 2014
+tags: [Lorem]
 ---
 
 ![image]({{ site.baseurl }}/{{ page.img }})
diff --git a/_portfolio/safe.md b/_portfolio/safe.md
@@ -3,8 +3,8 @@ layout: post
 title: Creative
 feature-img: "assets/img/portfolio/safe.png"
 img: "assets/img/portfolio/safe.png"
-date: September 2014
-tags: [Lorem, Ipsum]
+date: August, 16 2014
+tags: [Ipsum]
 ---
 
 Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem <a>quia voluptas sit aspernatur</a> aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius <a>modi tempora incidunt</a> ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
diff --git a/_portfolio/submarine.md b/_portfolio/submarine.md
@@ -4,7 +4,6 @@ title: Lorem Ipsum
 feature-img: "assets/img/portfolio/submarine.png"
 img: "assets/img/portfolio/submarine.png"
 date: 2017-09-03
-tags: [Lorem, Ipsum]
 ---
 
 Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem <a>quia voluptas sit aspernatur</a> aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius <a>modi tempora incidunt</a> ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
diff --git a/_portfolio/tictactoe.md b/_portfolio/tictactoe.md
@@ -4,7 +4,6 @@ title: Tic tac toe
 feature-img: "assets/img/portfolio/ttt.png"
 img: "assets/img/portfolio/ttt.png"
 date: September 2014
-tags: [Lorem, Ipsum]
 ---
 
 Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem <a>quia voluptas sit aspernatur</a> aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius <a>modi tempora incidunt</a> ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
diff --git a/_sass/includes/_footer.scss b/_sass/includes/_footer.scss
@@ -5,4 +5,14 @@
   width: 100%;
   color: lighten($text-color, 30%);
   font-size: 0.9em;
+    
+  .footer-icons {
+      ul {
+        list-style: none;
+        li {
+          display: inline;
+          }
+      }
+   }
 }
+
diff --git a/_sass/includes/_tag_list.scss b/_sass/includes/_tag_list.scss
diff --git a/_sass/layouts/_tags.scss b/_sass/layouts/_tags.scss
@@ -1,12 +1,20 @@
 .tag-list {
+  width: 100%;
   font-size: 0.9em;
+    
   a.button {
     margin: 0.1em;
     padding: 0.2em 0.4em;
   }
+    
+  .tag {
+    margin-right: 0.5em;
+    color: $tags-color;
+  }
 }
-.tag-title {
-  margin-bottom: 0;
+
+.tag-anchor {
+  margin-bottom: $padding-x-small;
   a {
     color: $link-color;
     
@@ -15,9 +23,22 @@
       }
   }
 }
-.tagged-post {
+
+.tag-posts {
+    display: inline-block;
+    width: 100%;
   .title {
     margin-top: 0;
     margin-bottom: 0;
+      a {
+          margin-left: $padding-x-small;
+      }
   }
+    
+.meta {
+    display: inline;
+    float: right;
+    font-size: 0.7em;
+    line-height: normal;
+    }
 }
diff --git a/_sass/type-theme.scss b/_sass/type-theme.scss
@@ -14,8 +14,7 @@
 @import 'layouts/tags';
 @import 'layouts/search';
 
-// Partials
+// Includes
 @import 'includes/footer';
-@import 'includes/tag_list';
 @import 'includes/post_nav';
 @import 'includes/navbar';
diff --git a/pages/search.json b/pages/search.json
@@ -5,7 +5,7 @@
     {
       "title"    : "{{ post.title | escape }}",
       "category" : "{{ post.content | strip_html | strip_newlines | truncatewords: 25 }}",
-      "tags"     : "{{ post.tags | join: ', ' | prepend: "_" }}",
+      "tags"     : "{{ post.tags | join: ', ' | prepend: " " }}",
       "url"      : "{{ site.baseurl }}{{ post.url }}",
       "date"     : "{{ post.date | date: "%B %-d, %Y" }}",
       "content"  : "{{ post.content | strip_html | strip_newlines }}"
@@ -16,7 +16,7 @@
      {% if page.title != nil %}
         "title"    : "{{ page.title | escape }}",
         "category" : "{{ page.content | strip_html | strip_newlines | truncatewords: 25 }}",
-        "tags"     : "{{ page.tags | join: ', ' | prepend: "_" }}",
+        "tags"     : "{{ page.tags | join: ', ' | prepend: " " }}",
         "url"      : "{{ site.baseurl }}{{ page.url }}",
         "date"     : "{{ page.date | date: "%B %-d, %Y" }}",
         "content"  : "{{ page.content | strip_html | strip_newlines }}"
diff --git a/pages/tags.html b/pages/tags.html
@@ -34,39 +34,40 @@
     <!-- Displays the posts and pages that contains the tag-->
     <div class="posts">
         {% for tag in tags %}
-        <h1 id="{{ tag | cgi_escape }}" class="tag-title"><a href="#{{ tag | cgi_escape }}">{{ tag }} <i class="fa fa-tag fa-fw"></i></a></h1>
+        <h3 id="{{ tag | cgi_escape }}" class="tag-anchor"><a href="#{{ tag | cgi_escape }}"><i class="fa fa-tag fa-fw"></i> {{ tag }}</a></h3>
 
-        <div class="tagged-post">
+        <div class="tag-posts">
 
             <!-- Posts -->
             {% for post in site.posts %} 
                 {% if post.tags contains tag %}
-                <h2 class="title">
+                <h5 class="title">
                     <a href="{{ post.url | prepend: site.baseurl }}">
+                        <i class="fa fa-file-text-o" aria-hidden="true"></i>
                         {{ post.title }}
-                      </a>
-                </h2>
-                <div class="meta">
-                    {{ post.date | date: "%B %-d, %Y" }}
-                </div>
-
+                    </a>
+                    
+                    <div class="meta">
+                        {{ post.date | date: "%B %-d, %Y" }}
+                    </div>
+                </h5>
                 {% endif %} 
             {% endfor %} 
             
             <!-- Portfolio -->
             {% for note in site.portfolio %} 
                 {% if note.tags contains tag %}
-
-                <div class="tagged-post">
-                    <h2 class="title">
-                        <a href="{{ site.baseurl }}{{ note.url }}">{{ note.title }}</a>
-                    </h2>
+                <h5 class="title">
+                    <a href="{{ site.baseurl }}{{ note.url }}">
+                        <i class="fa fa-file-o" aria-hidden="true"></i>
+                        {{ note.title }}
+                    </a>
+                
                     <div class="meta">
                         {{ note.date | date: "%B %-d, %Y" }}
                     </div>
-                </div>
-
-            {% endif %} 
+                </h5>
+                {% endif %} 
             {% endfor %}
 
         </div>
