From 583ebcb51ef1a1eddb594a93c8eeddc6d7dd5f06 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 15 May 2018 00:12:32 +0200
Subject: [PATCH] [web] More flexible container usage, switched to sans-serif
fonts.
---
web/layouts/books/single.html | 10 ++++-----
web/layouts/docs/single.html | 8 ++++----
web/layouts/partials/header.html | 6 +++---
web/layouts/section/books.html | 2 ++
web/layouts/section/docs.html | 34 ++++++++++++++++---------------
web/layouts/section/releases.html | 3 ++-
6 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/web/layouts/books/single.html b/web/layouts/books/single.html
index 1a755d6be45..1a02b8ab522 100644
--- a/web/layouts/books/single.html
+++ b/web/layouts/books/single.html
@@ -1,8 +1,8 @@
{{ define "main" }}
+ <div class="container">
+ <h1>{{ .Title }} {{ if .Params.subtitle }}<span class="text-regular text-grey-dark">– {{ .Params.subtitle }}</span>{{ end }}</h1>
- <h1>{{ .Title }} {{ if .Params.subtitle }}<span class="text-regular text-grey-dark">– {{ .Params.subtitle }}</span>{{ end }}</h1>
-
- <img class="w-1/6 float-left mr-4 mb-2 shadow-md" src="../{{ .Params.book_cover }}" alt="">
- {{ .Content }}
-
+ <img class="w-1/6 float-left mr-4 mb-2 shadow-md" src="../{{ .Params.book_cover }}" alt="">
+ {{ .Content }}
+ </div>
{{ end }}
diff --git a/web/layouts/docs/single.html b/web/layouts/docs/single.html
index 8c3ef10c17a..e16bc4d9161 100644
--- a/web/layouts/docs/single.html
+++ b/web/layouts/docs/single.html
@@ -1,9 +1,9 @@
{{ define "main" }}
- <div class="flex">
+ <div class="container flex">
<nav class="w-1/4">
{{ $segments := split .RelPermalink "/" }}
{{ $subsection := index $segments 2 }}
- <div class="text-xs font-serif-caps">
+ <div class="text-xs">
<a href="/docs/">Docs</a> / <span class="text-orange">
{{ if eq $subsection "devguide"}}Developer Guide{{ end }}
{{ if eq $subsection "benchmarks"}}Benchmarks{{ end }}
@@ -16,7 +16,7 @@
{{ $currentMenu := index .Site.Menus $subsection }}
{{ range $currentMenu }}
{{ if .HasChildren }}
- <li class="font-serif-caps tracking-wide mt-4">{{ .Name }}</li>
+ <li class="tracking-wide font-serif mt-4">{{ .Name }}</li>
{{ range .Children }}
<li class="m-1"><a href="{{ .URL }}"{{if $currentPage.IsMenuCurrent $subsection . }} class="active"{{end}}>{{ .Name }}</a></li>
{{ end }}
@@ -25,7 +25,7 @@
</ul>
</nav>
<div class="w-3/4 ml-4">
- <h1 class="font-serif-caps">{{ .Title }}</h1>
+ <h1>{{ .Title }}</h1>
{{ if or (eq $subsection "devguide") (eq $subsection "quickstart") }}
<div class="invisible mb-4" id="os-selector">Select OS:
<a class="btn mx-1" id="btn-win"><i class="fab fa-windows"></i> Windows</a>
diff --git a/web/layouts/partials/header.html b/web/layouts/partials/header.html
index c98322e7cff..99162ad11da 100644
--- a/web/layouts/partials/header.html
+++ b/web/layouts/partials/header.html
@@ -25,10 +25,10 @@
<body class="font-sans leading-normal">
<header class="bg-light">
- <div class="container mx-auto">
+ <div class="container">
<nav class="flex border-b py-4">
<div class="hidden sm:block w-1/4">
- <a href="/" class="font-serif-caps">{{ .Site.Title }}</a>
+ <a href="/">{{ .Site.Title }}</a>
</div>
{{ $currentPage := . }}
{{ $segments := split .RelPermalink "/" }}
@@ -51,4 +51,4 @@
{{ end }}
</div>
</header>
- <div class="container mx-auto py-2">
+ <div class="py-2">
diff --git a/web/layouts/section/books.html b/web/layouts/section/books.html
index 38291087d8f..f313ad1c4ac 100644
--- a/web/layouts/section/books.html
+++ b/web/layouts/section/books.html
@@ -1,4 +1,5 @@
{{ define "main" }}
+ <div class="container">
<h1>{{ .Title }}</h1>
{{ .Content }}
{{ range .Data.Pages }}
@@ -13,4 +14,5 @@
<div style="clear: both; font-size: 0;"> </div>
</div>
{{ end }}
+ </div>
{{ end }}
diff --git a/web/layouts/section/docs.html b/web/layouts/section/docs.html
index 8ab8b8022cc..2866a74f106 100644
--- a/web/layouts/section/docs.html
+++ b/web/layouts/section/docs.html
@@ -1,21 +1,23 @@
{{ define "main" }}
+ <div class="container">
<h1>OpenGeoSys Documentation</h1>
{{ .Content }}
- <div class="flex flex-wrap">
- {{ range .Params.sections }}
- <div class="w-full sm:w-1/2 lg:w-1/3 p-3 my-3">
- <h2 class="mb-2 text-center text-base md:text-lg lg:text-xl xl:text-2xl">
- <a href="{{ .url }}">
- {{ .name }}
- {{ $url_first_char := substr .url 0 1 }}
- {{ if not (eq $url_first_char "/") }}
- <i class="text-xs align-top fas fa-external-link-alt"></i>
- {{ end }}
- </a>
- </h2>
- <hr>
- <p class="text-grey-darker">{{ .text }}</p>
- </div>
- {{ end }}
+ <div class="flex flex-wrap">
+ {{ range .Params.sections }}
+ <div class="w-full sm:w-1/2 lg:w-1/3 p-3 my-3">
+ <h2 class="mb-2 text-center text-base md:text-lg lg:text-xl xl:text-2xl">
+ <a href="{{ .url }}">
+ {{ .name }}
+ {{ $url_first_char := substr .url 0 1 }}
+ {{ if not (eq $url_first_char "/") }}
+ <i class="text-xs align-top fas fa-external-link-alt"></i>
+ {{ end }}
+ </a>
+ </h2>
+ <hr>
+ <p class="text-grey-darker">{{ .text }}</p>
</div>
+ {{ end }}
+ </div>
+ </div>
{{ end }}
diff --git a/web/layouts/section/releases.html b/web/layouts/section/releases.html
index 55622faffb3..7fe64f40437 100644
--- a/web/layouts/section/releases.html
+++ b/web/layouts/section/releases.html
@@ -1,4 +1,5 @@
{{ define "main" }}
+ <div class="container">
<!-- <h1>{{ .Title }}</h1> -->
{{ .Content }}
@@ -75,5 +76,5 @@
{{ end }}
{{ end }}
</ul>
-
+ </div>
{{ end }}
--
GitLab