From 77514eab9ed407b0ccb71c640cb090122da12f03 Mon Sep 17 00:00:00 2001
From: Bud Parr <budparr@gmail.com>
Date: Tue, 11 Apr 2017 03:48:09 +0000
Subject: [PATCH] wip layout mobile
---
/dev/null | 13 ------
layouts/_default/list.html | 4 +-
layouts/_default/single.html | 2
layouts/partials/site-navigation.html | 32 +++++++++-------
layouts/index.html | 4 +-
layouts/article/summary.html | 6 +-
6 files changed, 26 insertions(+), 35 deletions(-)
diff --git a/404.html b/404.html
deleted file mode 100755
index d20fd99..0000000
--- a/404.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
-{{ define "main" }}
-<<<<<<< Updated upstream
-{{ $currentPageUrl := .URL }}
-{{ $currentSection := where .Site.Pages "Section" .Section }}
- <article class="center cf pv5 measure-wide-l">
- <h1>
- This is not the page you were looking for
- </h1>
- </article>
-=======
-
-404 page hee
-{{ .Content }}
-
->>>>>>> Stashed changes
-{{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 7730dcc..fdaa4c4 100755
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,10 +1,10 @@
{{ define "main" }}
- <article class="cf pa3 pa4-m pa4-l nested-copy-line-height nested-img">
+ <article class="cf pa3 pa4-m pa4-l nested-copy-line-height center measure-wide-l nested-img">
<h1>
{{ .Title }}
</h1>
- <div class="{{ .Site.Params.copyClass }}">
+ <div class="nested-copy-line-height nested-links nested-img mid-gray ">
{{ .Content }}
</div>
</article>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5f55cc8..7e157b3 100755
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -22,7 +22,7 @@
{{ humanize .Section | upper }}
</h4>
<h1>
- {{ .Title }}
+ {{ .Title }}
</h1>
<div class="nested-copy-line-height nested-links nested-img mid-gray measure-wide-l">
{{ .Content | markdownify }}
diff --git a/layouts/article/summary.html b/layouts/article/summary.html
index 66d788a..1908aa2 100644
--- a/layouts/article/summary.html
+++ b/layouts/article/summary.html
@@ -1,6 +1,6 @@
-<div class="relative flex-auto w-100 w-40-ns mr4 mb4 bg-white nested-copy-line-height">
+<div class="relative flex-auto w-100 w-40-ns mr4-l mb4 bg-white nested-copy-line-height">
- <div class="bg-white mb3 ph4 pv3 gray">
+ <div class="bg-white mb3 ph4 pv3 gray overflow-hidden">
{{ if .Date }}
<date class="f6">
{{ .Date.Format "January 2, 2006" }}
@@ -8,7 +8,7 @@
{{ end }}
<h1 class="f3 near-black">
- <a href="{{ .URL }}" class="link dim">
+ <a href="{{ .URL }}" class="link black dim">
{{ .Title }}
</a>
</h1>
diff --git a/layouts/index.html b/layouts/index.html
index 6d4fa72..eb1a4c8 100755
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,10 +1,10 @@
{{ define "main" }}
{{ $section := where .Data.Pages "Section" "article" }}
- <main class="cf ph3 ph5-l pv3 pv4-l f4 tc center measure-wide lh-copy gray">
+ <main class="cf ph3 ph5-l pv3 pv4-l f4 tc center measure-wide-l lh-copy mid-gray">
{{ .Content }}
</main>
- <section class="flex-ns flex-wrap justify-between w-100 mt5 v-top">
+ <section class="flex-ns flex-wrap justify-between w-100 mh4-l mt5 v-top">
{{ range sort $section "Date" "desc" }}
{{ .Render "summary" }}
{{ end }}
diff --git a/layouts/partials/section-boxes.html b/layouts/partials/section-boxes.html
deleted file mode 100644
index 040a161..0000000
--- a/layouts/partials/section-boxes.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="relative flex-auto w-100 w-40-ns mr4 mb4 bg-white nested-copy-line-height">
-
- <div class="bg-white mb3 ph4 pv3 gray">
- {{ if .Date }}
- <date class="f6">
- {{ .Date.Format "January 2, 2006" }}
- </date>
- {{ end }}
-
-
-
- </div>
-</div>
diff --git a/layouts/partials/site-navigation.html b/layouts/partials/site-navigation.html
index 4ee4e0b..014e791 100644
--- a/layouts/partials/site-navigation.html
+++ b/layouts/partials/site-navigation.html
@@ -1,16 +1,20 @@
-<nav class="w-100 flex-ns justify-between items-center pv3" role="navigation">
- <a href="/" class="f3 fw8 hover-white no-underline white-90 dib pv2 ph3">
- {{ .Site.Title }}
- </a>
- <div>
- <ul>
- {{ range .Site.Menus.main }}
- <li class="list f5 f4-ns fw4 dib">
- <a class="hover-white no-underline white-70 pv2 ph3" href="{{ .URL }}" >
- {{ .Name }}
- </a>
- </li>
- {{ end }}
- </ul>
+<nav class="pv3 ph3" role="navigation">
+ <div class="flex-ns justify-between items-center">
+
+ <a href="/" class="f3 fw8 hover-white no-underline white-90 dib">
+ {{ .Site.Title }}
+ </a>
+ {{ if .Site.Menus.main }}
+ <ul class="pl0 mr3">
+ {{ range .Site.Menus.main }}
+ <li class="list f5 f4-ns fw4 dib pr3">
+ <a class="hover-white no-underline white-70" href="{{ .URL }}" >
+ {{ .Name }}
+ </a>
+ </li>
+ {{ end }}
+ </ul>
+ {{ end }}
+
</div>
</nav>
--
Gitblit v1.10.0