diff options
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | exampleSite/archetypes/default.md | 6 | ||||
-rw-r--r-- | exampleSite/config.toml | 23 | ||||
-rw-r--r-- | exampleSite/content/post/a-post.md | 7 | ||||
-rw-r--r-- | exampleSite/content/post/another-post.md | 7 | ||||
-rw-r--r-- | exampleSite/content/post/hello-world.md | 7 | ||||
-rw-r--r-- | exampleSite/content/post/theme-reference.md | 110 | ||||
-rw-r--r-- | layouts/index.html | 2 | ||||
-rw-r--r-- | layouts/partials/bottom.html | 2 | ||||
-rw-r--r-- | layouts/partials/top.html | 85 | ||||
-rw-r--r-- | static/css/arvo.css | 20 | ||||
-rw-r--r-- | static/css/fonts.css (renamed from static/css/source-code-pro.css) | 21 | ||||
-rw-r--r-- | theme.toml | 8 |
15 files changed, 71 insertions, 235 deletions
@@ -1,3 +1 @@ -/exampleSite/config -/exampleSite/public -/exampleSite/themes +.vscode diff --git a/Gemfile.lock b/Gemfile.lock index ef2fcb5..ecb3489 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - rake (12.0.0) + rake (12.3.3) sass (3.4.25) scss_lint (0.54.0) rake (>= 0.9, < 13) @@ -6,7 +6,7 @@ It focuses on improving reading experience with high contrast colors and no fanc It also uses [Highlight.js](https://highlightjs.org/) for the syntaxic coloration of code snippets. -Demo is available [here](https://damiencaselli.github.io/hugo-journal-demo/). +Demo is available [here](https://dashdashzako.github.io/hugo-journal-demo/). ## Installation diff --git a/exampleSite/archetypes/default.md b/exampleSite/archetypes/default.md deleted file mode 100644 index f5a9e45..0000000 --- a/exampleSite/archetypes/default.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: "{{ replace .TranslationBaseName "-" " " | title }}" -date: {{ .Date }} -draft: true ---- - diff --git a/exampleSite/config.toml b/exampleSite/config.toml deleted file mode 100644 index c2aaa43..0000000 --- a/exampleSite/config.toml +++ /dev/null @@ -1,23 +0,0 @@ -baseURL = "http://example.org/" -languageCode = "en-us" -title = "My New Hugo Site" -theme = "journal" - -[author] - name = "John Doe" - homepage = "https://your.homepage.com/" - -[params] - useCDN = false - description = "Blog meta description." - githubUsername = "your_gh_username" - twitterUsername = "your_twitter_handle" - tagline = "Blog tagline. Shown under index title." -[params.work] - jobTitle = "occupation" - company = "the company" - companyUrl = "https://the.company.url/" -[params.gpg] - key = "0x1111111111111111" - fingerprint = "0000 0000 0000 0000 0000 0000 0000 0000 0000 0000" - link = "https://pgp.mit.edu/pks/lookup?op=get&search=0x1111111111111111" diff --git a/exampleSite/content/post/a-post.md b/exampleSite/content/post/a-post.md deleted file mode 100644 index e0a9e30..0000000 --- a/exampleSite/content/post/a-post.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: "A Post" -date: 2017-04-23T12:16:16+02:00 -draft: false ---- - -Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. diff --git a/exampleSite/content/post/another-post.md b/exampleSite/content/post/another-post.md deleted file mode 100644 index 1a16e0c..0000000 --- a/exampleSite/content/post/another-post.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: "Another Post" -date: 2017-05-23T12:16:26+02:00 -draft: false ---- - -Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. diff --git a/exampleSite/content/post/hello-world.md b/exampleSite/content/post/hello-world.md deleted file mode 100644 index d86922b..0000000 --- a/exampleSite/content/post/hello-world.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: "Hello, World!" -date: 2016-06-23T11:57:42+02:00 -draft: false ---- - -Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. diff --git a/exampleSite/content/post/theme-reference.md b/exampleSite/content/post/theme-reference.md deleted file mode 100644 index a8905b6..0000000 --- a/exampleSite/content/post/theme-reference.md +++ /dev/null @@ -1,110 +0,0 @@ ---- -title: "Theme Reference" -description: "Description of the post" -date: 2017-07-23T16:20:16+02:00 -draft: false ---- - -This is a post to help showing the _complete_ rules of this theme. - -A **summary** is set, the rest is below a `<!-- more -->;` tag.<!--more--> - ---- - -# Level 1 header - -## Level 2 header - -### Level 3 header - -#### Level 4 header - -##### Level 5 header - -###### Level 6 header - -[Markdown](http://daringfireball.net/projects/markdown/) syntax has multiple advantages over HTML for simple writing. - ---- - -Blockquotes: - -> Introducing Hugo, a new idea around making website creation simple again. Hugo flexibly works with many formats and is ideal for blogs, docs, portfolios and much more. Hugo’s speed fosters creativity and makes building a website fun again. -> <cite>spf13</cite> - ---- - -Unordered lists: - -- an item -- a second item -- a third item -- the first item - ---- - -Ordered lists: - -1. the winner -1. silver medal -1. bronze medal -1. copper medal - 1. an item - 1. another item -1. chocolate medal - ---- - -Mixed list: - -- Paris - 1. Les Invalides - - Ligne 8 - - Ligne 12 - 1. Le Louvre -- Bordeaux - 1. Le Miroir d'eau - 1. Le Grand Théâtre -- New York - - Statue of Liberty - - The Empire State Building - ---- - -Image will not flow out its container. - -![Jolly roger F14 aircraft](https://upload.wikimedia.org/wikipedia/commons/6/68/F-14-vf-84.jpg) - ---- - -A `fig` shortcode can be used to create images figures. - -``` -src="image source" -alt="image alt" -caption="figure caption text" -link="link to the source" -``` - -{{< fig src="https://upload.wikimedia.org/wikipedia/commons/c/c7/YosemitePark2_amk.jpg" alt="Vue de la vallée de Yosemite" caption="Le Parc National de Yosemite" link="https://fr.wikipedia.org/wiki/Parc_national_de_Yosemite" >}} - ---- - -<abbr title="abbreviation">Abbr</abbr> has default styles, so has the `kbd` tag <kbd>Ctrl+f</kbd>. - -Theme uses [Highlight.js](https://highlightjs.org/) for code highlighting. - -```python -from flask import Flask - - -# This is a long comment line. It is just here to prove we can type looooooong lines of texts without breaking the layout. -app = Flask(__name__) - -@app.route("/") -def hello(): - return "Hello World!" - -if __name__ == "__main__": - app.run() -``` diff --git a/layouts/index.html b/layouts/index.html index d453580..fdfde29 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -2,7 +2,7 @@ <article class="posts"> - {{ range (where .Data.Pages "Type" "post").GroupByDate "2006" -}} + {{ range site.RegularPages.GroupByDate "2006" -}} <section> <h2>{{ .Key }}</h2> diff --git a/layouts/partials/bottom.html b/layouts/partials/bottom.html index 2c2a85d..bc84996 100644 --- a/layouts/partials/bottom.html +++ b/layouts/partials/bottom.html @@ -26,7 +26,7 @@ {{- end }} </span> - <!-- {{ .Hugo.BuildDate }} --> + <!-- {{ hugo.BuildDate }} --> </footer> </div> diff --git a/layouts/partials/top.html b/layouts/partials/top.html index 60316ff..1ef2e86 100644 --- a/layouts/partials/top.html +++ b/layouts/partials/top.html @@ -1,50 +1,49 @@ <!DOCTYPE html> <html lang="{{ .Site.LanguageCode }}"> - <head> - <meta charset="utf-8"> - {{ .Hugo.Generator }} - - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="author" content="{{ .Site.Author.name }}"> - <meta property="og:url" content="{{ .Permalink }}"> +<head> + <meta charset="utf-8"> + {{ hugo.Generator }} + + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="author" content="{{ .Site.Author.name }}"> + <meta property="og:url" content="{{ .Permalink }}"> + + {{ if .IsHome -}} + <title>{{ .Site.Title }}</title> + <meta property="og:title" content="{{ .Site.Title }}"> + <meta property="og:type" content="website"> + <meta name="description" content="{{ .Site.Params.description }}"> + {{- else -}} + <title>{{ .Title }} - {{ .Site.Title }}</title> + <meta property="og:title" content="{{ .Title }} - {{ .Site.Title }}"> + <meta property="og:type" content="article"> + <meta name="description" content="{{ .Description }}"> + {{- end }} + + {{- if .Site.Params.useCDN | default false }} + <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro|Arvo:400,700"> + {{- else }} + <link rel="stylesheet" href="{{ "css/fonts.css" | relURL }}"> + {{- end }} + + <link rel="stylesheet" href="{{ "css/highlight.css" | relURL }}"> + <link rel="stylesheet" href="{{ "css/journal.css" | relURL }}"> + <link href="{{ "index.xml" | relURL }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}"> + +</head> + +<body> + <div class="container"> {{ if .IsHome -}} - <title>{{ .Site.Title }}</title> - <meta property="og:title" content="{{ .Site.Title }}"> - <meta property="og:type" content="website"> - <meta name="description" content="{{ .Site.Params.description }}"> + <header class="site-header"> + <h1>{{ .Site.Title }}</h1> + <p>{{ .Site.Params.tagline }}</p> + </header> {{- else -}} - <title>{{ .Title }} - {{ .Site.Title }}</title> - <meta property="og:title" content="{{ .Title }} - {{ .Site.Title }}"> - <meta property="og:type" content="article"> - <meta name="description" content="{{ .Description }}"> - {{- end }} - - {{- if .Site.Params.useCDN | default false }} - <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro|Arvo:400,700"> - {{- else }} - <link rel="stylesheet" href="{{ "css/source-core-pro.css" | relURL }}"> - <link rel="stylesheet" href="{{ "css/arvo.css" | relURL }}"> + <nav class="site-nav"> + <a href="{{ .Site.BaseURL }}">Index</a> + </nav> {{- end }} - - <link rel="stylesheet" href="{{ "css/highlight.css" | relURL }}"> - <link rel="stylesheet" href="{{ "css/journal.css" | relURL }}"> - <link href="{{ "index.xml" | relURL }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}"> - - </head> - - <body> - <div class="container"> - - {{ if .IsHome -}} - <header class="site-header"> - <h1>{{ .Site.Title }}</h1> - <p>{{ .Site.Params.tagline }}</p> - </header> - {{- else -}} - <nav class="site-nav"> - <a href="{{ .Site.BaseURL }}">Index</a> - </nav> - {{- end }} diff --git a/static/css/arvo.css b/static/css/arvo.css deleted file mode 100644 index b48c094..0000000 --- a/static/css/arvo.css +++ /dev/null @@ -1,20 +0,0 @@ -/* arvo-regular - latin */ -@font-face { - font-family: 'Arvo'; - font-style: normal; - font-weight: 400; - src: local('Arvo'), - url('../fonts/arvo-v10-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/arvo-v10-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* arvo-700 - latin */ -@font-face { - font-family: 'Arvo'; - font-style: normal; - font-weight: 700; - src: local('Arvo Bold'), local('Arvo-Bold'), - url('../fonts/arvo-v10-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/arvo-v10-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - diff --git a/static/css/source-code-pro.css b/static/css/fonts.css index 0c299a8..5ec1cd4 100644 --- a/static/css/source-code-pro.css +++ b/static/css/fonts.css @@ -1,3 +1,23 @@ +/* arvo-regular - latin */ +@font-face { + font-family: 'Arvo'; + font-style: normal; + font-weight: 400; + src: local('Arvo'), + url('../fonts/arvo-v10-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/arvo-v10-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* arvo-700 - latin */ +@font-face { + font-family: 'Arvo'; + font-style: normal; + font-weight: 700; + src: local('Arvo Bold'), local('Arvo-Bold'), + url('../fonts/arvo-v10-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/arvo-v10-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + /* source-code-pro-regular - latin */ @font-face { font-family: 'Source Code Pro'; @@ -17,4 +37,3 @@ url('../fonts/source-code-pro-v7-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ url('../fonts/source-code-pro-v7-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } - @@ -1,12 +1,12 @@ name = "Journal" license = "MIT" -licenselink = "https://github.com/damiencaselli/hugo-journal/blob/master/LICENSE.md" +licenselink = "https://github.com/dashdashzako/hugo-journal/blob/master/LICENSE.md" description = "Minimalist theme for Hugo." -homepage = "https://github.com/damiencaselli/hugo-journal" +homepage = "https://github.com/dashdashzako/hugo-journal" tags = ["minimalist", "reading", "blog"] features = ["blog"] -min_version = "0.25.1" +min_version = "0.57.0" [author] name = "Damien Caselli" - homepage = "https://github.com/damiencaselli" + homepage = "https://github.com/dashdashzako" |