From 543d69d839f1ad103f8ecb3d2c523b81ab18483c Mon Sep 17 00:00:00 2001
From: Karl <kc0bfv@gmail.com>
Date: Tue, 03 Mar 2020 20:11:08 +0000
Subject: [PATCH] Draw text on header image, font update
---
exampleSite/config.toml | 1
exampleSite/static/img/header01.jpg | 0
layouts/_default/baseof.html | 1
header_sources/header03.xcf | 0
exampleSite/config_for_github_pages.toml | 1
static/css/myboth.css | 25 +++++
header_sources/header01.xcf | 0
exampleSite/static/img/header02.jpg | 0
README.md | 5 +
static/font/ubuntu-titling/UbuntuTitling-Bold.ttf | 0
Ubuntu_Titling_Font_License-GNU_LGPL.txt | 165 +++++++++++++++++++++++++++++++++++++++++
header_sources/header02.xcf | 0
layouts/partials/head.html | 3
13 files changed, 199 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index a3f8ebf..f15e67a 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@
* `favicon` - the favicon URL, relative to your site (placed in header meta tag)
* `description` - the description for the header meta tag
* `images` - a list of relative image URLs for the header of each page
+* `headername` - text to place over the header images
* `msvalidate` - MS validation tag
* `googlesiteverification` - Google site verification tag
@@ -49,3 +50,7 @@
## Usage
Put this theme in your site's themes folder, then modify the site config to specify the theme `ticky_tacky_tark`, or use the `-t ticky_tacky_dark` command line switch.
+
+## Licenses
+
+The [Ubuntu Titling font](https://en.wikipedia.org/wiki/Ubuntu_Titling) is used, licensed by the GNU Lesser GPL, license included.
diff --git a/Ubuntu_Titling_Font_License-GNU_LGPL.txt b/Ubuntu_Titling_Font_License-GNU_LGPL.txt
new file mode 100644
index 0000000..4384880
--- /dev/null
+++ b/Ubuntu_Titling_Font_License-GNU_LGPL.txt
@@ -0,0 +1,165 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
\ No newline at end of file
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 4cb9398..ec10528 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -10,6 +10,7 @@
favicon = "favicon.ico"
description = "The demonstration page for the Hugo Ticky Tacky Dark theme."
images = ["img/header01.jpg", "img/header02.jpg"]
+ headername = "tickytackydark"
#msvalidate = ""
#googlesiteverification = ""
diff --git a/exampleSite/config_for_github_pages.toml b/exampleSite/config_for_github_pages.toml
index 4fb2402..29d127d 100644
--- a/exampleSite/config_for_github_pages.toml
+++ b/exampleSite/config_for_github_pages.toml
@@ -10,6 +10,7 @@
favicon = "favicon.ico"
description = "The demonstration page for the Hugo Ticky Tacky Dark theme."
images = ["img/header01.jpg", "img/header02.jpg"]
+ headername = "tickytackydark"
#msvalidate = ""
#googlesiteverification = ""
diff --git a/exampleSite/static/img/header01.jpg b/exampleSite/static/img/header01.jpg
index 3063d77..77184bb 100644
--- a/exampleSite/static/img/header01.jpg
+++ b/exampleSite/static/img/header01.jpg
Binary files differ
diff --git a/exampleSite/static/img/header02.jpg b/exampleSite/static/img/header02.jpg
index 9612da7..0c9d848 100644
--- a/exampleSite/static/img/header02.jpg
+++ b/exampleSite/static/img/header02.jpg
Binary files differ
diff --git a/header_sources/header01.xcf b/header_sources/header01.xcf
new file mode 100644
index 0000000..4971893
--- /dev/null
+++ b/header_sources/header01.xcf
Binary files differ
diff --git a/header_sources/header02.xcf b/header_sources/header02.xcf
new file mode 100644
index 0000000..ae56c56
--- /dev/null
+++ b/header_sources/header02.xcf
Binary files differ
diff --git a/header_sources/header03.xcf b/header_sources/header03.xcf
new file mode 100644
index 0000000..cdd0053
--- /dev/null
+++ b/header_sources/header03.xcf
Binary files differ
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 6016f8f..f15c1ec 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -5,6 +5,7 @@
<div id="full_body">
<header id="header" class="top-section">
{{- partial "body_header.html" . -}}
+ {{ with $.Param "headername" }}<div id="header-text">{{ . }}</div>{{ end -}}
</header>
<div id="content" class="top-section">
<div class="container-fluid">
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 9583807..3579276 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -27,6 +27,9 @@
<meta name="theme-color" content="black">
{{- template "_internal/google_analytics_async.html" . }}
+<link href="https://fonts.googleapis.com/css?family=Ubuntu&display=swap" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css?family=Open+Sans&display=swap" rel="stylesheet">
+
<noscript>
<style>
{{ with .Site.Params.images }}
diff --git a/static/css/myboth.css b/static/css/myboth.css
index 1603bef..755220e 100644
--- a/static/css/myboth.css
+++ b/static/css/myboth.css
@@ -5,7 +5,14 @@
#full_body { max-width: 1024px; margin: auto; }
/* Make my own styles up */
-.top-section { margin: 20px; }
+@font-face {
+ font-family: "Ubuntu-Titling";
+ src: url("/font/ubuntu-titling/UbuntuTitling-Bold.ttf") format("truetype");
+}
+
+.top-section {
+ margin: 20px;
+}
.morerounded { border-radius:15px; }
.veryrounded { border-radius:30px; }
.navbar {
@@ -17,9 +24,23 @@
.abitbigger { font-size:1.3em; }
.verylarge { font-size:2em; }
+#header {
+ position: relative;
+}
+#header-text {
+ font-family: "Ubuntu-Titling", "Ubuntu", Roboto, sans-serif;
+ font-weight: bold;
+ font-size: 6vw;
+ text-shadow: 0px 0px 10px black, 0px 0px 10px black, 0px 0px 10px black, 0px 0px 10px black;
+ color: white;
+ position: absolute;
+ bottom: -1.5vw;
+ left: 0vw;
+}
+
/* Styles mimicing old blueprint */
a:hover { text-decoration: none; }
body {
- font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+ font-family: "Open Sans", Helvetica, Arial, sans-serif;
}
diff --git a/static/font/ubuntu-titling/UbuntuTitling-Bold.ttf b/static/font/ubuntu-titling/UbuntuTitling-Bold.ttf
new file mode 100644
index 0000000..53585e5
--- /dev/null
+++ b/static/font/ubuntu-titling/UbuntuTitling-Bold.ttf
Binary files differ
--
Gitblit v1.10.0