Merge pull request #17 from tessel/tachyons-integration

tcr · web-flow · commit b94eff169c8b · 2017-12-07T14:59:09.000-05:00
Tachyons integration
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ db.json
 *.log
 node_modules/
 public/
-.deploy*/
+.deploy*/
+*.swp
diff --git a/source/index.hbs b/source/index.hbs
diff --git a/theme/layout/page.hbs b/theme/layout/page.hbs
@@ -8,7 +8,7 @@
   {{/inline}}
 
   {{#*inline "container" }}
-    <section class="page-content">
+    <section class="ml3">
       {{{page.content}}}
     </section>
   {{/inline}}
diff --git a/theme/layout/partials/head.hbs b/theme/layout/partials/head.hbs
@@ -11,4 +11,5 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="icon" href="{{theme.favicon}}">
 <link rel="stylesheet" href="/css/theme.css">
-<link rel="search" type="application/opensearchdescription/xml" href="/atom.xml" title="{{config.title}}">
+<link rel="stylesheet" href="https://unpkg.com/tachyons@4.9.0/css/tachyons.min.css"/>
+<link rel="search" type="application/opensearchdescription/xml" href="/atom.xml" title="{{config.title}}">
diff --git a/theme/layout/partials/layout.hbs b/theme/layout/partials/layout.hbs
@@ -4,19 +4,19 @@
 <head>{{> head }}</head>
 
 <body>
-  <div class="wrap">
+  <div class="w-100 ph5">
     <header>{{!-- img.logo-image(src=url_for(theme.logo) alt='logo')--}}
-      <h1 class="branding">
+      <h1 class="dib mt2 relative mb0">
         <a href="/" title="{{config.title}}">
           {{#if theme.logo}}
-            <img src="{{theme.logo}}" alt="logo" class="logo-image">
+            <img src="{{theme.logo}}" alt="logo" class="w-40">
           {{/if}}
         </a>
       </h1>
       {{> nav }}
     </header>
-    <main class="container">{{> container }}</main>
+    <main>{{> container }}</main>
     <footer>{{> pagination }}{{> copyright }}</footer>
   </div>{{> scripts }}</body>
 
-</html>
+</html>
diff --git a/theme/layout/partials/nav.hbs b/theme/layout/partials/nav.hbs
@@ -1,7 +1,7 @@
-<ul class="nav nav-list">
+<ul class="ma0 pa0 list fr">
   {{#each theme.menu as |value key|}}
-    <li class="nav-list-item">
-      <a href="{{value}}" class="nav-list-link {{#if act}}active{{/if}}">{{key}}</a>
+    <li class="dib ph2 pv3">
+      <a href="{{value}}" class="{{#if act}}bb bw2 b--green{{/if}}">{{key}}</a>
     </li>
   {{/each}}
-</ul>
+</ul>
diff --git a/theme/source/css/theme.scss b/theme/source/css/theme.scss
@@ -1,7 +1,6 @@
 /* generated with grunt-sass-globbing */
 
 @import "../scss/pages/blog";
-@import "../scss/pages/home";
 @import "../scss/pages/modules";
 @import "../scss/shared/archive-post-list";
 @import "../scss/shared/base";
diff --git a/theme/source/scss/theme.scss b/theme/source/scss/theme.scss
@@ -11,7 +11,6 @@
 @import "shared/highlight";
 
 @import "pages/blog";
-@import "pages/home";
 @import "pages/modules";
 
 @font-face {
diff --git a/themes/tessel/source/css/theme.css b/themes/tessel/source/css/theme.css
