Switch font, table row include

grantmcconnaughey · Nov 28, 2017 · acb30d1 · acb30d1
1 parent 9446287
commit acb30d1
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 62 deletions.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -9,26 +9,24 @@ <h2 class="footer-heading">{{ site.title | escape }}</h2>
         <ul class="social-media-list">
           <li>
             <a href="https://github.com/LintlyCI/Flake8Rules">
-              <span class="icon icon--github">{% include icon-github.svg %}</span>View on GitHub
+              <span class="icon icon--github">{% include icon-github.svg %}</span><span class="username">View on GitHub</span>
             </a>
           </li>
+          {% if site.github_username %}
+            <li>
+              {% include icon-github.html username=site.github_username %}
+            </li>
+            {% endif %}
+
+            {% if site.twitter_username %}
+            <li>
+              {% include icon-twitter.html username=site.twitter_username %}
+            </li>
+            {% endif %}
         </ul>
       </div>
 
       <div class="footer-col footer-col-2">
-        <ul class="social-media-list">
-          {% if site.github_username %}
-          <li>
-            {% include icon-github.html username=site.github_username %}
-          </li>
-          {% endif %}
-
-          {% if site.twitter_username %}
-          <li>
-            {% include icon-twitter.html username=site.twitter_username %}
-          </li>
-          {% endif %}
-        </ul>
       </div>
 
       <div class="footer-col footer-col-3">

diff --git a/_includes/head.html b/_includes/head.html
@@ -9,7 +9,9 @@
   <link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | relative_url }}">
-
+
+  <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
+
   {% if jekyll.environment == 'production' and site.google_analytics %}
   {% include google-analytics.html %}
   {% endif %}

diff --git a/_includes/header.html b/_includes/header.html
@@ -1,33 +1,6 @@
 <header class="site-header" role="banner">
-
   <div class="wrapper">
-    {% assign default_paths = site.pages | map: "path" %}
-    {% assign page_paths = site.header_pages | default: default_paths %}
     <a class="site-title" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
-
-    {% if page_paths %}
-      <nav class="site-nav">
-        <input type="checkbox" id="nav-trigger" class="nav-trigger" />
-        <label for="nav-trigger">
-          <span class="menu-icon">
-            <svg viewBox="0 0 18 15" width="18px" height="15px">
-              <path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
-              <path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
-              <path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
-            </svg>
-          </span>
-        </label>
-
-        <div class="trigger">
-          {% for path in page_paths %}
-            {% assign my_page = site.pages | where: "path", path | first %}
-            {% if my_page.title %}
-            <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
-            {% endif %}
-          {% endfor %}
-        </div>
-      </nav>
-    {% endif %}
   </div>
 </header>
 

diff --git a/_includes/rule-row.html b/_includes/rule-row.html
@@ -0,0 +1,4 @@
+<tr>
+    <td><a href="{{ rule.url | relative_url }}">{{ rule.code }}</a></td>
+    <td><a href="{{ rule.url | relative_url }}">{{ rule.message }}</a></td>
+</tr>
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -6,46 +6,37 @@
 
   <h1 class="page-heading">The Big Ol' List of Rules</h1>
 
-  <h2>pycodestyle</h2>
+  <h2 id="pycodestyle">pycodestyle</h2>
 
-  <table>
+  <table class="rules-table">
     <tbody>
       {% for rule in site.rules %}
         {% if rule.code contains 'E' or rule.code contains 'W' %}
-          <tr>
-            <td><a href="{{ rule.url | relative_url }}">{{ rule.code }}</a></td>
-            <td><a href="{{ rule.url | relative_url }}">{{ rule.message }}</a></td>
-          </tr>
+          {% include rule-row.html rule=rule %}
         {% endif %}
       {% endfor %}
     </tbody>
   </table>
 
-  <h2>pyflakes</h2>
+  <h2 id="pyflakes">pyflakes</h2>
 
-  <table>
+  <table class="rules-table">
     <tbody>
       {% for rule in site.rules %}
         {% if rule.code contains 'F' %}
-          <tr>
-            <td><a href="{{ rule.url | relative_url }}">{{ rule.code }}</a></td>
-            <td><a href="{{ rule.url | relative_url }}">{{ rule.message }}</a></td>
-          </tr>
+          {% include rule-row.html rule=rule %}
         {% endif %}
       {% endfor %}
     </tbody>
   </table>
 
-  <h2>mccabe</h2>
+  <h2 id="mccabe">mccabe</h2>
 
-  <table>
+  <table class="rules-table">
     <tbody>
       {% for rule in site.rules %}
         {% if rule.code contains 'C' %}
-          <tr>
-            <td><a href="{{ rule.url | relative_url }}">{{ rule.code }}</a></td>
-            <td><a href="{{ rule.url | relative_url }}">{{ rule.message }}</a></td>
-          </tr>
+          {% include rule-row.html rule=rule %}
         {% endif %}
       {% endfor %}
     </tbody>

diff --git a/_sass/minima.scss b/_sass/minima.scss
@@ -2,7 +2,7 @@
 
 // Define defaults for each variable.
 
-$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$base-font-family: Lato, "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 $base-font-size:   17px !default;
 $base-font-weight: 400 !default;
 $small-font-size:  $base-font-size * 0.875 !default;

diff --git a/_sass/minima/_layout.scss b/_sass/minima/_layout.scss
@@ -12,7 +12,6 @@
 
 .site-title {
   @include relative-font-size(1.625);
-  font-weight: 300;
   line-height: $base-line-height * $base-font-size * 2.25;
   letter-spacing: -1px;
   margin-bottom: 0;

diff --git a/assets/main.scss b/assets/main.scss
@@ -3,3 +3,8 @@
 ---
 
 @import "minima";
+
+.rules-table {
+    margin-bottom: 1.5em;
+    width: 100%;
+}