diff options
| author | edavidaja <enyinnaya.aja@gmail.com> | 2019-05-23 19:55:49 +0300 |
|---|---|---|
| committer | edavidaja <enyinnaya.aja@gmail.com> | 2019-05-23 19:55:49 +0300 |
| commit | 5e99af63358ee59d4084960d49eea1356c5a1432 (patch) | |
| tree | b08abdc41a876975dfb3a5f955f90ed9bc1d10bf | |
| parent | 24a3a690b9d95e631c507b7da6f4114072405ac5 (diff) | |
added divs to baseof
| -rw-r--r-- | archetypes/blogpost.md (renamed from archetypes/default.md) | 0 | ||||
| -rw-r--r-- | archetypes/docpage.md | 7 | ||||
| -rw-r--r-- | layouts/_default/baseof.html | 15 | ||||
| -rw-r--r-- | layouts/blogpost/single.html | 10 | ||||
| -rw-r--r-- | layouts/docpage/single.html | 6 | ||||
| -rw-r--r-- | layouts/page/single.html | 6 | ||||
| -rw-r--r-- | layouts/partials/footer.html | 2 | ||||
| -rw-r--r-- | layouts/partials/head.html | 14 | ||||
| -rw-r--r-- | layouts/partials/header.html | 4 | ||||
| -rw-r--r-- | layouts/partials/sidebar.html | 11 | ||||
| -rw-r--r-- | layouts/post/single.html | 10 |
11 files changed, 46 insertions, 39 deletions
diff --git a/archetypes/default.md b/archetypes/blogpost.md index ac36e06..ac36e06 100644 --- a/archetypes/default.md +++ b/archetypes/blogpost.md diff --git a/archetypes/docpage.md b/archetypes/docpage.md new file mode 100644 index 0000000..d1da513 --- /dev/null +++ b/archetypes/docpage.md @@ -0,0 +1,7 @@ ++++ +title= "" +subtitle= "" +date= "" +draft = false +slug= "" ++++ diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 527f491..15a3bb5 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,9 +2,16 @@ <html> {{- partial "head.html" . -}} <body> - {{- partial "header.html" . -}} - {{- partial "sidebar.html" . -}} - {{- block "main" . }}{{- end }} - {{- partial "footer.html" . -}} + <div class="container"> + + {{- partial "header.html" . -}} + <div class="wrap content"> + {{- partial "sidebar.html" . -}} + <section id="main" class="main-content" role="main"> + {{- block "main" . }}{{- end }} + </section> + </div> + {{- partial "footer.html" . -}} + </div> </body> </html> diff --git a/layouts/blogpost/single.html b/layouts/blogpost/single.html new file mode 100644 index 0000000..5dcafc5 --- /dev/null +++ b/layouts/blogpost/single.html @@ -0,0 +1,10 @@ +{{ define "main" }} +<article> + <h2 class="page-title">{{ .Title }}</h2> + <p class="meta">{{ dateFormat "Sep 21, 1988" .Date }}</p> + + <div class="post"> + {{ .Content }} + </div> +</article> +{{ end }}
\ No newline at end of file diff --git a/layouts/docpage/single.html b/layouts/docpage/single.html new file mode 100644 index 0000000..e52048b --- /dev/null +++ b/layouts/docpage/single.html @@ -0,0 +1,6 @@ +{{ define "main" }} +<h2 class="page-title">{{ .Title }}</h2> + +{{ .Content }} + +{{ end }}
\ No newline at end of file diff --git a/layouts/page/single.html b/layouts/page/single.html deleted file mode 100644 index d21e435..0000000 --- a/layouts/page/single.html +++ /dev/null @@ -1,6 +0,0 @@ -{{ define "main" }} -<h2 class="page-title">{{ page.title }}</h2> - -{{ content }} - -{{ end }}
\ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 4b19c43..199ff60 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,6 +1,6 @@ <footer role="contentinfo"> <div class="wrap"> - <p>This project is maintained by <a href="{{ site.author.url }}">{{ .Site.Params.name }}</a>.</p> + <p>This project is maintained by <a href="{{ .Site.Params.author}}">{{ .Site.Params.name }}</a>.</p> <p>Hosted on <a href="http://pages.github.com/">GitHub Pages</a>.</p> </div><!--/.wrap --> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 7181412..342782e 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -2,19 +2,15 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta charset="utf-8"> <title> - {{ if page.title == null }} - {{ site.name }} - {{ else }} - {{ page.title }} - {{ site.name }} - {{ end }} + {{ .Site.Params.name }} </title> <meta name="viewport" content="width=device-width"> - <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/normalize.css"> - <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/main.css"> - <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/syntax.css"> + <link rel="stylesheet" href="{{ .Site.BaseURL }}/assets/css/normalize.css"> + <link rel="stylesheet" href="{{ .Site.BaseURL }}/assets/css/main.css"> + <link rel="stylesheet" href="{{ .Site.BaseURL }}/assets/css/syntax.css"> <!--[if lt IE 9]> <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> - <script src="{{ site.baseurl }}/js/respond.min.js"></script> + <script src="{{ .Site.BaseURL }}/assets/js/respond.min.js"></script> <![endif]--> </head> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 96bb432..f8f4136 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,8 +1,8 @@ <header role="banner"> <div class="wrap"> {{ if isset .Site.Params "logourl" }} - <img class="logo" src="{{ site.logourl }}" alt="{{ site.logoalt }}"> + <img class="logo" src="{{ .Site.Params.logourl }}" alt="{{ .Site.Params.logoalt }}"> {{ end }} - <h1 class="site-title"><a class="title-link" href="{{ site.baseurl }}/">{{ site.name }}</a></h1> + <h1 class="site-title"><a class="title-link" href="{{ .Site.BaseURL }}/">{{ .Site.Params.name }}</a></h1> </div> </header> diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 0db8b1b..3386121 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,14 +1,11 @@ <aside> - <p class="intro">{{ .Site.subtitle }}</p> + <p class="intro">{{ .Params.subtitle }}</p> <a class="skip-link visuallyhidden focusable" href="#main">Skip to Main Content</a> <nav class="sidebar-nav" role="navigation"> <ul> - {{ range link in site.navigation }} - {{ if link.internal == true }} - <li><a href="{{ .Site.baseurl }}/{{ link.url }}">{{ link.text }}</a></li> - {{ else }} - <li><a href="{{ link.url }}">{{ link.text }}</a></li> - {{ end }} + {{ $section := where $.Site.RegularPages "Section" "docpage"}} + {{ range $section }} + <li><a href="{{ .Page.Permalink }}">{{ .Params.slug }}</a></li> {{ end }} </ul> </nav> diff --git a/layouts/post/single.html b/layouts/post/single.html deleted file mode 100644 index 9bf4856..0000000 --- a/layouts/post/single.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "main" }} -<article> - <h2 class="page-title">{{ page.title }}</h2> - <p class="meta">{{ page.date | date_to_string }}</p> - - <div class="post"> - {{ content }} - </div> -</article> -{{ end }}
\ No newline at end of file |