diff options
author | Sascha Brendel <code@lednerb.de> | 2018-09-15 10:52:06 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-15 10:52:06 +0300 |
commit | 329686101150be8d058e2f30012f117394db4b4e (patch) | |
tree | 65ab514b47c31b4277b7c1f965c303a9055dd9cc | |
parent | c1438a31b42785366a8a21b40ffda329098137c1 (diff) | |
parent | 10e4a60b96740389422d784085aa904b3014db9a (diff) |
Merge pull request #119 from Lednerb/development1.11.1
Added configuration options to the style. Fixed font path issues. Fix…
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | assets/sass/_variables.scss | 4 | ||||
-rw-r--r-- | assets/sass/theme.scss | 3 | ||||
-rw-r--r-- | exampleSite/config.toml | 4 | ||||
-rw-r--r-- | layouts/_default/baseof.html | 9 |
5 files changed, 20 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d2f08c3..9d729b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [1.11.1] - 2018-09-15 +### Fixed +- Broken font path since Version 1.10.0 (#114, #115) + ## [1.11.0] - 2018-09-14 ### Added - Language Brazilian Portuguese, thanks to @marcelocg (#112) - Updated Korean language - ## [1.10.0] - 2018-09-10 ### Fixed - Incorrect rendering of task lists (#108) @@ -161,7 +164,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Some typos -[Unreleased]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.11.0...master +[Unreleased]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.11.1...master +[1.11.1]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.11.0...1.11.1 [1.11.0]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.10.0...1.11.0 [1.10.0]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.9.1...1.10.0 [1.9.1]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.9.0...1.9.1 diff --git a/assets/sass/_variables.scss b/assets/sass/_variables.scss index aeb220d..6e96ef5 100644 --- a/assets/sass/_variables.scss +++ b/assets/sass/_variables.scss @@ -1,8 +1,8 @@ -$fonts-folder: '/bilberry-hugo-theme/dist/fonts/'; +$fonts-folder: '{{ .Site.BaseURL }}/dist/fonts/'; // Set the with of the main content area // Notice that the actual content's width is $site-width - 100px -$site-width: 800px; +$site-width: {{ .Site.Params.SiteWidth | default "800px" }}; // Define your fonts. // If you want to import new fonts, set them in /src/css/fonts.css diff --git a/assets/sass/theme.scss b/assets/sass/theme.scss index 3c2bcfc..00da3fe 100644 --- a/assets/sass/theme.scss +++ b/assets/sass/theme.scss @@ -1,4 +1,4 @@ -@import "_variables"; +// @import "_variables"; @import "externalDependencies"; @import "fontface"; @@ -29,6 +29,7 @@ .container { width: $site-width; + max-width: 100%; } @import "topnav"; diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 413c7c1..8f75d46 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -43,6 +43,10 @@ disqusShortname = "bilberry-hugo-theme" # Set this option to false if you want to search within all articles in all languages at once algolia_currentLanguageOnly = true + # Style configuration + # set the width of your site's content + siteWidth = "800px" + # Header configuration # your subtitle if you want to use any subtitle = "Hello World! This is the most epic subtitle ever." diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index e4c7f32..7f5ea47 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -53,7 +53,10 @@ <link href="{{ .RSSLink }}" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" /> {{ end }} - {{ $style := resources.Get "sass/theme.scss" | toCSS | minify | fingerprint }} + {{ $variables := resources.Get "sass/_variables.scss" | resources.ExecuteAsTemplate "sass/variables.scss" . }} + {{ $theme := resources.Get "sass/theme.scss" }} + {{ $combined := slice $variables $theme | resources.Concat "sass/combined.scss" }} + {{ $style := $combined | toCSS | minify | fingerprint }} <link rel="stylesheet" href="{{ $style.Permalink }}"> {{ partial "twitter-card" . }} @@ -82,11 +85,11 @@ {{ end }} {{ $js := resources.Get "js/externalDependencies.js" }} - {{ $secureJS := $js | resources.Fingerprint "sha512" }} + {{ $secureJS := $js | resources.Fingerprint "md5" }} <script type="text/javascript" src="{{ $secureJS.Permalink }}" integrity="{{ $secureJS.Data.Integrity }}"></script> {{ $jsTemplate := resources.Get "js/theme.js" }} - {{ $secureJS := $jsTemplate | resources.ExecuteAsTemplate "js/theme.js" . | fingerprint }} + {{ $secureJS := $jsTemplate | resources.ExecuteAsTemplate "js/theme.js" . | fingerprint "md5" }} <script type="text/javascript" src="{{ $secureJS.Permalink }}" integrity="{{ $secureJS.Data.Integrity }}"></script> <script> |