GrumpyGits · chernjie · Jul 14, 2015 · Jul 14, 2015 · Jul 14, 2015 · Jul 14, 2015
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1 @@
 _site
-.DS_Store
-*.sw?
diff --git a/CNAME b/CNAME
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README.md b/README.md
@@ -1,30 +1,24 @@
-# Grumpy Gits Singapore
+# Grumpy Gits Singapore 
 
 [![Join the chat at https://gitter.im/GrumpyGits/grumpygits.github.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/GrumpyGits/grumpygits.github.io?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-This is the code behind https://grumpygits.github.io . Patches welcome :)
+This is the code behind [grumpygits.github.io][1], pull requests are welcome! :)
 
-https://grumpygits.github.io is hosted using [Github Pages][4] and powered by [Jekyll][1], [Twitter Bootstrap][2], and [Font Awesome][3].
+[grumpygits.github.io][1] is hosted using [Github Pages][2] and powered by [Jekyll][3], [Twitter Bootstrap + Material Design][4], and [Font Awesome][5].
 
 # Contributing
 
-If you already have commit bit to this repo, feel free to push to branches, but
-please send a pull request for code review unless you are fixing something very
-small (like a broken link or typo).
+If you already have commit access to this repo, feel free to push to branches, but please send a pull request for code review unless you are fixing something very small like a broken link or typo. 
 
-If you would like to contribute to this repo, fork and please send a pull request!
-
-If you would like to add a future Grumpy Gits Singapore talk, please send a pull request!
+If you would like to contribute to this repo or add a future Grumpy Gits Singapore talk, please send a pull request!
 
 # License
 
-<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode">
-<img src="http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png">
-</a>
-
-If you would like to use this content under a different license, feel free to contact duke@leto.net .
+See [LICENSE][6].
 
-[1]: http://jekyllrb.com
-[2]: http://twitter.github.com/bootstrap/
-[3]: http://fortawesome.github.com/Font-Awesome/
-[4]: http://pages.github.com
+[1]: http://grumpygits.github.io/
+[2]: https://pages.github.com/
+[3]: http://jekyllrb.com/
+[4]: http://fezvrasta.github.io/bootstrap-material-design/
+[5]: http://fontawesome.io/
+[6]: https://github.com/GrumpyGits/grumpygits.github.io/blob/master/LICENSE
diff --git a/_config.yml b/_config.yml
@@ -1,7 +1,10 @@
-markdown: rdiscount
-highlighter: pygments
-exclude:
-  - config.ru
-  - Gemfile
-  - Gemfile.lock
-  - Procfile
+# Site settings
+title: Grumpy Gits SG
+baseurl: ""
+url: "http://grumpygits.github.io"
+paginate: 5
+
+# Build settings
+markdown: kramdown
+kramdown:
+  smart_quotes: ["apos", "apos", "quot", "quot"]
diff --git a/_includes/_footer.html b/_includes/_footer.html
diff --git a/_includes/_head.html b/_includes/_head.html
diff --git a/_includes/_navbar.html b/_includes/_navbar.html
diff --git a/_includes/_rfp.html b/_includes/_rfp.html
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -0,0 +1,9 @@
+<hr>
+<footer class="row">
+  <div class="col-xs-12 text-center">
+    <a href="/feed.xml"><i class="fa fa-lg fa-rss-square"></i></a>
+    <a href="https://gitter.im/GrumpyGits/grumpygits.github.io"><i class="fa fa-lg fa-comments"></i></a>
+    <a href="https://www.facebook.com/groups/sggrumpygits"><i class="fa fa-lg fa-facebook-official"></i></a>
+    <a href="https://github.com/GrumpyGits"><i class="fa fa-lg fa-github"></i></a>
+  </div>
+</footer>
diff --git a/_includes/head.html b/_includes/head.html
@@ -0,0 +1,17 @@
+<head>
+  <title>
+    {% if page.title %}
+      {{ page.title }} &middot; {{ site.title }}
+    {% else %}
+      {{ site.title }}
+    {% endif %}
+  </title>
+  <link rel="shortcut icon" href="" />
+  <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
+  <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+  <link href="//fonts.googleapis.com/css?family=Roboto:300,400,300italic,400italic" rel="stylesheet">
+  <link href="/css/material.css" rel="stylesheet">
+  <link href="/css/ripples.min.css" rel="stylesheet">
+  <link href="/css/main.css" rel="stylesheet">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+</head>
diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -0,0 +1,13 @@
+<div class="navbar navbar-default">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/">Grumpy Gits SG</a>
+  </div>
+  <div class="navbar-collapse collapse navbar-right navbar-responsive-collapse">
+    <p class="navbar-text">The monthly user group that doesn't lose your data!</p>
+  </div>
+</div>
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -0,0 +1,6 @@
+<script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
+<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.3/moment.min.js"></script>
+<script src="/js/ripples.min.js"></script>
+<script src="/js/material.min.js"></script>
+<script src="/js/main.js"></script>
diff --git a/_layouts/article.html b/_layouts/article.html
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,11 +1,72 @@
-<!DOCTYPE html>
-<html lang='en'>
-  {% include _head.html %}
+<html>
+
+  {% include head.html %}
+
   <body>
-    <section class='container'>
-      {% include _navbar.html %}
-      {{ content }}
-      {% include _footer.html %}
-    </section>
+
+    <!-- Content -->
+    <div class="container">
+
+      {% include navbar.html %}
+
+      <div class="row">
+
+        <div class="col-xs-12 col-md-8">
+          <div class="panel panel-default">
+            {{ content }}
+          </div>
+        </div>
+
+        <div class="col-xs-12 col-md-4">
+          <div class="panel panel-default">
+            <div class="panel-heading">Upcoming Meetups</div>
+            <div class="panel-body" id="upcoming-meetups">
+            Loading... 
+            </div>
+          </div>
+          <div class="panel panel-default">
+            <div class="panel-heading">Past Meetups</div>
+            <div class="panel-body" id="past-meetups">
+            Loading... 
+            </div>
+          </div>
+          <div class="panel panel-warning">
+            <div class="panel-heading">Request for Presenters</div>
+            <div class="panel-body">
+            <p>
+              <strong>Would you like to speak at an upcoming meetup?</strong>
+              We're looking for speakers on - 
+              <ul>
+                <li>How you got over the initial Git learning curve</li>
+                <li>Using Git to track data other than code</li>
+                <li>Your favorite but lesser-known Git utility</li>
+                <li>When to modify history for fun and profit</li>
+                <li>Your newest crazy idea using Git</li>
+                <li>How to <code>stash</code> effectively</li>
+                <li>Demystifying <code>git rebase</code></li>
+                <li>Case studies of unique repos, e.g. the Linux kernel</li>
+                <li>Interesting Git workflows</li>
+                <li>How your community uses Git</li>
+                <li>Git CSI (archaeology/investigation)</li>
+                <li>GitHub alternatives</li>
+                <li>Git hooks</li>
+              </ul>
+            </p>
+            <p>
+              If you're interested in speaking, please get in touch on <a href="https://gitter.im/GrumpyGits/grumpygits.github.io">Gitter</a> or <a href="https://www.facebook.com/groups/sggrumpygits">Facebook</a> chat! 
+            </p>
+            </div>
+          </div>
+        </div>
+
+      </div>
+
+      {% include footer.html %}
+
+    </div>
+
+    {% include scripts.html %}
+
   </body>
+
 </html>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -0,0 +1,14 @@
+---
+layout: default
+---
+<div class="post">
+
+  <header class="post-header">
+    <h1 class="post-title">{{ page.title }}</h1>
+  </header>
+
+  <article class="post-content">
+    {{ content }}
+  </article>
+
+</div>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -0,0 +1,15 @@
+---
+layout: default
+---
+
+<div class="panel-body">
+<p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+   <h1 class="post-title">{{ page.title }}</h1>
+
+
+  <article class="post-content">
+    {{ content }}
+  </article>
+
+</div>
+
diff --git a/_posts/2015-04-08-first-git-meetup.md b/_posts/2015-04-08-first-git-meetup.md
@@ -1,28 +1,24 @@
 ---
-layout: article
+layout: post
 title: The first git together is on!
-tldr: It's Git's 10th anniversary, and we're having our first ever Git user meetup in Singapore! 
 ---
 
-<p>
-	<a class="btn btn-primary" href="https://www.facebook.com/events/1599023443666373/">View on Facebook</a>
-	<a class="btn btn-danger" href="http://www.meetup.com/Grumpy-Gits-SG/events/221519416/">View on Meetup</a>
-</p>
-
-<p>It's Git's 10th anniversary, and we're having our first ever Git user meetup
+It's Git's 10th anniversary, and we're having our first ever Git user meetup
 in Singapore! This meetup is aimed at both beginners and people who have over
-10 years of Git experience (wait a minute…). We hope to stretch your Gitability
-level, and better your understanding of version control systems!</p>
+10 years of Git experience (wait a minute). We hope to stretch your Gitability
+level, and better your understanding of version control systems!
+
+## Programme
+- <a class="glyphicon glyphicon-facetime-video" href="https://youtu.be/NvBMcqW5jEY"></a> **A brief history of Git** - Sahil Bajaj
+- <a class="glyphicon glyphicon-facetime-video" href="http://youtu.be/pmH5MYZDha8"></a> **Git for Teams** - Sayanee Basu 
+- <a class="glyphicon glyphicon-facetime-video" href="http://youtu.be/sDgTD-aIccQ"></a> **Git Internals** - Chow Loong Jin 
+- <a class="glyphicon glyphicon-facetime-video" href="http://youtu.be/jowe2U5vqVQ"></a> **Five random Git tips** - ChernJie 
+- <a class="glyphicon glyphicon-facetime-video" href="https://youtu.be/hMSuELohWKY"></a> The Crowd
 
-<h3>Programme</h3>
-<ul>
-	<li>"A brief history of Git": Sahil Bajaj <a class="glyphicon glyphicon-facetime-video" href="https://youtu.be/NvBMcqW5jEY">[video]</a></li>
-	<li>"Git for Teams": Sayanee Basu <a class="glyphicon glyphicon-facetime-video" href="http://youtu.be/pmH5MYZDha8">[video]</a></li>
-	<li>"Git Internals": Chow Loong Jin <a class="glyphicon glyphicon-facetime-video" href="http://youtu.be/sDgTD-aIccQ">[video]</a></li>
-	<li>Five random Git tips: ChernJie <a class="glyphicon glyphicon-facetime-video" href="http://youtu.be/jowe2U5vqVQ">[video]</a></li>
-	<li>The Crowd <a class="glyphicon glyphicon-facetime-video" href="https://youtu.be/hMSuELohWKY">[video]</a></li>
-</ul>
+Come merge with your fellow Gits!
 
-<p>Come merge with your fellow Gits!</p>
+## Interested in speaking? 
+Please get in touch with [Sahil](https://github.com/spinningarrow), [Valentine](https://github.com/valentine) or [ChernJie](https://github.com/chernjie). We're looking for lightning talks!
 
-<p>Interested in speaking? Please talk to Valentine or ChernJie! (We're looking for lightning talks!)</p>
+<a class="btn btn-primary" href="https://www.facebook.com/events/1599023443666373/">View on Facebook</a>
+<a class="btn btn-danger" href="http://www.meetup.com/Grumpy-Gits-SG/events/221519416/">View on Meetup</a>