From 6eeaab000f39d058d6c438a45235966f239ddbd7 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 26 Feb 2018 15:09:56 +0100
Subject: [PATCH] [web] Some css, layout and config adjustments.
---
web/config.toml | 28 +++++++++++++++++++++++++++-
web/layouts/docs/single.html | 4 ++--
web/layouts/index.html | 4 +++-
web/layouts/partials/footer-nav.html | 1 +
web/layouts/partials/header.html | 2 +-
web/layouts/partials/page-info.html | 2 +-
web/src/scss/main.scss | 18 +++++++++++++++---
7 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/web/config.toml b/web/config.toml
index 2377dca0e69..1f9e5d3e393 100644
--- a/web/config.toml
+++ b/web/config.toml
@@ -7,7 +7,7 @@ pygmentsstyle = 'friendly'
enableGitInfo = true
[params]
- alert = "Benchmarks only documentation; the Developer Guide can be found at <a href='https://docs.opengeosys.org'>docs.opengeosys.org</a>."
+ # alert = "Benchmarks only documentation; the Developer Guide can be found at <a href='https://docs.opengeosys.org'>docs.opengeosys.org</a>."
[taxonomies]
news = "news"
@@ -28,6 +28,32 @@ news = "news"
[[menu.devguide]]
name = "Getting Started"
identifier = "getting-started"
+ weight = 1
+
+[[menu.devguide]]
+ name = "Development Workflows"
+ identifier = "development-workflows"
+ weight = 2
+
+[[menu.devguide]]
+ name = "Testing"
+ identifier = "testing"
+ weight = 3
+
+[[menu.devguide]]
+ name = "Advanced"
+ identifier = "advanced"
+ weight = 4
+
+[[menu.devguide]]
+ name = "Troubleshooting"
+ identifier = "troubleshooting"
+ weight = 5
+
+[[menu.devguide]]
+ name = "Procedures"
+ identifier = "procedures"
+ weight = 6
# Benchmarks sidebar top-level categories
[[menu.benchmarks]]
diff --git a/web/layouts/docs/single.html b/web/layouts/docs/single.html
index 7c81c252646..f703995a08a 100644
--- a/web/layouts/docs/single.html
+++ b/web/layouts/docs/single.html
@@ -24,16 +24,16 @@
<div class="col-xs-9">
<h1>{{ .Title }}</h1>
{{ if eq $subsection "devguide"}}
- <div id="os-selector">Select OS: <a id="btn-win">Windows</a> <a id="btn-linux">Linux</a> <a id="btn-mac">macOS</a></div>
+ <div id="os-selector">Select OS: <a id="btn-win"><i class="fab fa-windows"></i> Windows</a> <a id="btn-linux"><i class="fab fa-linux"></i> Linux</a> <a id="btn-mac"><i class="fab fa-apple"></i> macOS</a></div>
{{ end }}
{{ .Content }}
+ {{ partial "page-info" . }}
<hr>
{{ partial "footer-nav.html" . }}
</div>
- {{ partial "page-info" . }}
{{ end }}
diff --git a/web/layouts/index.html b/web/layouts/index.html
index dc49f9b2538..69aa117e953 100644
--- a/web/layouts/index.html
+++ b/web/layouts/index.html
@@ -4,7 +4,9 @@
<h2>Content</h2>
<ul>
{{ range .Site.Sections }}
- <li><a href="{{ .Permalink }}">{{ .Title }}</a></li>
+ {{ if not (eq .Title "Internals")}}
+ <li><a href="{{ .Permalink }}">{{ .Title }}</a></li>
+ {{ end }}
{{ end }}
{{ range .Data.Pages }}
{{ if eq .Type "page" }}
diff --git a/web/layouts/partials/footer-nav.html b/web/layouts/partials/footer-nav.html
index 82d550922e7..38ab39181f3 100644
--- a/web/layouts/partials/footer-nav.html
+++ b/web/layouts/partials/footer-nav.html
@@ -35,4 +35,5 @@
</div>
</div>
</div>
+<br>
{{ end }}
diff --git a/web/layouts/partials/header.html b/web/layouts/partials/header.html
index ba4c395eec9..402db717648 100644
--- a/web/layouts/partials/header.html
+++ b/web/layouts/partials/header.html
@@ -20,7 +20,7 @@
<script type="text/javascript" async
src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-MML-AM_CHTML">
</script>
- <script defer src="https://use.fontawesome.com/releases/v5.0.1/js/all.js"></script>
+ <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
<title>{{ .Title }}</title>
</head>
diff --git a/web/layouts/partials/page-info.html b/web/layouts/partials/page-info.html
index 22acb8af6a7..8ed53a9c8e3 100644
--- a/web/layouts/partials/page-info.html
+++ b/web/layouts/partials/page-info.html
@@ -1,4 +1,4 @@
<div class="page-info">
<p>This article was written by {{ .Params.Author }}. If you are missing something or you find an error please <a href="mailto:ogs-devs@googlegroups.com">let us know</a>. <br>
- Last revision: {{ .Lastmod.Format "January 2, 2006" }}{{ if .IsPage }}<em>{{ with .GitInfo }}| {{ .Subject }} | <a href="https://github.com/ufz/ogs/commit/{{ .AbbreviatedHash }}">{{ .AbbreviatedHash }}</a>{{end }}</em>{{ end }}</p>
+ Last revision: {{ .Lastmod.Format "January 2, 2006" }}{{ if .IsPage }}<em>{{ with .GitInfo }}| {{ .Subject }} | <a href="https://github.com/ufz/ogs/commit/{{ .AbbreviatedHash }}">{{ .AbbreviatedHash }}</a>{{ end }}{{if .GitInfo}} | <a href="https://github.com/ufz/ogs/edit/master/web/content/{{ .File.Path }}">Edit this page</a>{{ end }}</em>{{ end }}</p>
</div>
diff --git a/web/src/scss/main.scss b/web/src/scss/main.scss
index ffa49f81b3f..35ecec4cf20 100644
--- a/web/src/scss/main.scss
+++ b/web/src/scss/main.scss
@@ -88,6 +88,10 @@ img {
@extend .pv1;
@extend .ph4;
@extend .bg-washed-yellow;
+
+ h1, h2, h3, h4 {
+ @extend .orange;
+ }
}
// Side nav
@@ -100,13 +104,14 @@ ul.sidenav {
li.category {
@extend .#{$header-font-family};
@extend .small-caps;
- @extend .mt1;
+ @extend .f4;
+ @extend .mt2;
}
a {
@extend .nav-a-style;
@extend .f6;
}
- a.active {
+ a.active, a:hover {
@extend .orange;
}
}
@@ -121,7 +126,14 @@ ul.sidenav {
.page-info {
p {
@extend .f6;
- max-width: 100%;
+ @extend .gray;
+
+ a {
+ @extend .light-blue;
+ }
+ a:hover {
+ @extend .light-red;
+ }
}
}
--
GitLab