From 060fe0199ff30a06cdbc2ede382e317d6bb88552 Mon Sep 17 00:00:00 2001 From: Ryan Watters Date: Tue, 7 Feb 2017 00:07:34 -0600 Subject: [PATCH] Replace Font Awesome with Fontello --- content/about-hugo/_index.md | 1 + .../why-use-a-static-site-generator.md | 12 +- .../markdown-and-supported-formats.md | 6 +- content/developer-tools/_index.md | 2 +- content/functions/range.md | 2 + content/getting-started/_index.md | 2 +- content/hosting-and-deployment/_index.md | 2 +- content/migrating-to-hugo/_index.md | 2 +- content/news-and-articles/_index.md | 2 +- content/project-organization/_index.md | 2 + content/project-organization/configuration.md | 57 ++ content/site-showcase/_index.md | 2 +- content/templates/_index.md | 2 +- content/themes/_index.md | 3 +- content/troubleshooting/_index.md | 10 +- content/tutorials/_index.md | 11 +- .../tutorials/how-to-contribute-to-hugo.md | 2 + data/sitenavigation.yml | 84 +++ themes/hugodocs/layouts/_default/list.html | 5 - themes/hugodocs/layouts/_default/section.html | 4 +- themes/hugodocs/layouts/_default/single.html | 6 +- .../layouts/partials/head/site-style.html | 2 +- .../layouts/partials/site-navigation.html | 26 +- .../layouts/partials/svg-icons/clipboard.svg | 3 + .../layouts/partials/svg-icons/gitter.svg | 57 ++ .../partials/svg-icons/gopher-small.svg | 15 + .../layouts/partials/svg-icons/gopher.svg | 68 +++ .../layouts/partials/svg-icons/markdown.svg | 7 + .../layouts/partials/svg-icons/sass.svg | 3 + .../layouts/partials/svg-icons/website.svg | 5 + .../layouts/partials/svg-icons/yaml.svg | 1 + themes/hugodocs/layouts/shortcodes/input.html | 21 + .../hugodocs/layouts/shortcodes/output.html | 15 + .../clipboardjs-modified-copy-to-clipboard.js | 219 ++++++++ themes/hugodocs/pipeline/scss/_variables.scss | 25 +- themes/hugodocs/pipeline/scss/base/_base.scss | 6 +- .../pipeline/scss/base/_fontello.scss | 100 ++++ .../pipeline/scss/base/_typography.scss | 15 +- .../pipeline/scss/components/_code.scss | 503 ++++++++++++++++++ .../pipeline/scss/components/_icons.scss | 0 .../pipeline/scss/components/_lists.scss | 2 + .../pipeline/scss/layout/_site-content.scss | 59 +- .../pipeline/scss/pages/_homepage.scss | 1 + themes/hugodocs/pipeline/scss/style.scss | 7 +- .../hugodocs/pipeline/scss/vendor/_prism.scss | 112 ++-- themes/hugodocs/static/css/style.min.css | 2 +- .../static/fonts/fontello/fontello.eot | Bin 0 -> 20344 bytes .../static/fonts/fontello/fontello.svg | 92 ++++ .../static/fonts/fontello/fontello.ttf | Bin 0 -> 20176 bytes .../static/fonts/fontello/fontello.woff | Bin 0 -> 13356 bytes .../static/fonts/fontello/fontello.woff2 | Bin 0 -> 11576 bytes themes/hugodocs/static/js/script.min.js | 7 +- 52 files changed, 1456 insertions(+), 136 deletions(-) create mode 100644 content/project-organization/configuration.md create mode 100644 data/sitenavigation.yml delete mode 100644 themes/hugodocs/layouts/_default/list.html create mode 100644 themes/hugodocs/layouts/partials/svg-icons/clipboard.svg create mode 100644 themes/hugodocs/layouts/partials/svg-icons/gitter.svg create mode 100644 themes/hugodocs/layouts/partials/svg-icons/gopher-small.svg create mode 100644 themes/hugodocs/layouts/partials/svg-icons/gopher.svg create mode 100644 themes/hugodocs/layouts/partials/svg-icons/markdown.svg create mode 100644 themes/hugodocs/layouts/partials/svg-icons/sass.svg create mode 100644 themes/hugodocs/layouts/partials/svg-icons/website.svg create mode 100644 themes/hugodocs/layouts/partials/svg-icons/yaml.svg create mode 100644 themes/hugodocs/layouts/shortcodes/input.html create mode 100644 themes/hugodocs/layouts/shortcodes/output.html create mode 100644 themes/hugodocs/pipeline/js/scripts/clipboardjs-modified-copy-to-clipboard.js create mode 100755 themes/hugodocs/pipeline/scss/base/_fontello.scss create mode 100644 themes/hugodocs/pipeline/scss/components/_code.scss create mode 100644 themes/hugodocs/pipeline/scss/components/_icons.scss create mode 100755 themes/hugodocs/static/fonts/fontello/fontello.eot create mode 100755 themes/hugodocs/static/fonts/fontello/fontello.svg create mode 100755 themes/hugodocs/static/fonts/fontello/fontello.ttf create mode 100755 themes/hugodocs/static/fonts/fontello/fontello.woff create mode 100755 themes/hugodocs/static/fonts/fontello/fontello.woff2 diff --git a/content/about-hugo/_index.md b/content/about-hugo/_index.md index a3dd352c0..9faa11637 100644 --- a/content/about-hugo/_index.md +++ b/content/about-hugo/_index.md @@ -5,6 +5,7 @@ description: Hugo's features, roadmap, license, and motivation. date: 2016-11-01 publishdate: 2016-11-01 lastmod: 2016-11-01 +layout: single weight: 01 draft: false slug: diff --git a/content/about-hugo/why-use-a-static-site-generator.md b/content/about-hugo/why-use-a-static-site-generator.md index 87332f158..0bd2ffffa 100644 --- a/content/about-hugo/why-use-a-static-site-generator.md +++ b/content/about-hugo/why-use-a-static-site-generator.md @@ -12,19 +12,15 @@ aliases: [] notes: --- -Website generators render content into HTML files. Most are "dynamic site generators." That means the HTTP server (ie, the program that communicates with your end user's browser) runs the generator to create a new HTML file every time an end user requests a page. +Website generators render content into HTML files. Most are "dynamic site generators." That means the HTTP server (i.e., the program that communicates with your end user's browser) runs the generator to create a new HTML file every time an end user requests a page. Creating the page dynamically requires the HTTP server have enough memory and CPU to effectively run the generator around the clock. If not, your end user will wait in a queue for the page to be generated. -To prevent unnecessary delays in delivering pages to end users, dynamic site generators programmed their systems to cache the HTML files. A cached page is a copy that is temporarily stored on the computer. Sending a cached copy is faster than generating a new page at the time of request because the majority of the work is already done. +To prevent unnecessary delays in delivering pages to end users, dynamic site generators were programmed to cache their HTML files. A cached page is a copy that is temporarily stored on the computer. Sending a cached copy is faster than generating a new page at the time of request because the majority of the work is already done. -Hugo takes caching a step further. All HTML files are rendered on your -computer. You can review the files before you copy them to the computer -hosting the HTTP server. Since the HTML files aren't generated dynamically, -we say that Hugo is a "static site generator." +Hugo and other static site generators take caching a step further. All HTML files are rendered on your computer. You can review the files before you copy them to the computer hosting the HTTP server. Since the HTML files aren't generated dynamically, we say that Hugo is a "static site generator." -Not running a web site generator on your HTTP server has many benefits. -The most noticeable is performance - HTTP servers are very good at +Not running a web site generator on your HTTP server has many benefits. The most noticeable is performance---HTTP servers are very good at sending files. So good that you can effectively serve the same number of pages with a fraction of the memory and CPU needed for a dynamic site. diff --git a/content/content-management/markdown-and-supported-formats.md b/content/content-management/markdown-and-supported-formats.md index f18d00d3a..d3804edb3 100644 --- a/content/content-management/markdown-and-supported-formats.md +++ b/content/content-management/markdown-and-supported-formats.md @@ -11,4 +11,8 @@ draft: false slug: aliases: [/content/markdown-extras/,/content/supported-formats/] notes: ---- \ No newline at end of file +--- + +{{% note "Deeply Nested Lists" %}} +Hugo uses [BlackFriday](https://github.com/russross/blackfriday), a markdown processor written in Go. A known issue [(#329)](https://github.com/russross/blackfriday/issues/329) in BlackFriday is the handling of deeply nested lists, but there is a workaround. If you write lists in markdown, be sure to include 4 spaces (i.e., tab) rather than 2 to delimit nesting of lists. +{{% /note %}} \ No newline at end of file diff --git a/content/developer-tools/_index.md b/content/developer-tools/_index.md index bbcd27efb..3f8e11a93 100644 --- a/content/developer-tools/_index.md +++ b/content/developer-tools/_index.md @@ -5,7 +5,7 @@ description: Description for the developer tools section. date: 2016-11-01 publishdate: 2016-11-01 lastmod: 2016-11-01 -weight: 40 +weight: 01 draft: false slug: aliases: diff --git a/content/functions/range.md b/content/functions/range.md index 293cd605f..00ba65801 100644 --- a/content/functions/range.md +++ b/content/functions/range.md @@ -7,6 +7,8 @@ qr_returns: date: 2017-02-01 publishdate: 2017-02-01 lastmod: 2017-02-01 +categories: [fundamentals] +tags: [] weight: draft: false type: diff --git a/content/getting-started/_index.md b/content/getting-started/_index.md index 19c014718..5151f6831 100644 --- a/content/getting-started/_index.md +++ b/content/getting-started/_index.md @@ -5,7 +5,7 @@ description: Description for the Getting Started section. date: 2017-02-01 publishdate: 2017-02-01 lastmod: 2017-02-01 -weight: +weight: 01 draft: false slug: aliases: [] diff --git a/content/hosting-and-deployment/_index.md b/content/hosting-and-deployment/_index.md index e46531e4b..b7ecda996 100644 --- a/content/hosting-and-deployment/_index.md +++ b/content/hosting-and-deployment/_index.md @@ -5,7 +5,7 @@ description: Build process, automated deployments, and popular hosting solutions date: 2016-11-01 publishdate: 2016-11-01 lastmod: 2016-11-01 -weight: 1 +weight: 01 draft: false slug: aliases: diff --git a/content/migrating-to-hugo/_index.md b/content/migrating-to-hugo/_index.md index a9e197fd0..876f69f9e 100644 --- a/content/migrating-to-hugo/_index.md +++ b/content/migrating-to-hugo/_index.md @@ -7,7 +7,7 @@ publishdate: 2017-02-01 lastmod: 2017-02-01 tags: [] categories: [] -weight: +weight: 01 draft: false slug: aliases: [] diff --git a/content/news-and-articles/_index.md b/content/news-and-articles/_index.md index 1ea764b58..a95dcebba 100644 --- a/content/news-and-articles/_index.md +++ b/content/news-and-articles/_index.md @@ -7,7 +7,7 @@ publishdate: 2017-02-01 lastmod: 2017-02-01 tags: [] categories: [] -weight: +weight: 01 draft: false slug: aliases: [] diff --git a/content/project-organization/_index.md b/content/project-organization/_index.md index 005e7a8f2..42836b675 100644 --- a/content/project-organization/_index.md +++ b/content/project-organization/_index.md @@ -6,6 +6,8 @@ date: 2016-11-01 publishdate: 2016-11-01 lastmod: 2016-11-01 weight: 01 +tags: [] +categories: [] draft: false slug: aliases: diff --git a/content/project-organization/configuration.md b/content/project-organization/configuration.md new file mode 100644 index 000000000..2cf65d19f --- /dev/null +++ b/content/project-organization/configuration.md @@ -0,0 +1,57 @@ +--- +title: Configuration +linktitle: +description: Scaffolding new projects, configuration, and source organization. +date: 2017-01-02 +publishdate: 2017-01-02 +lastmod: 2017-01-02 +weight: 10 +draft: false +slug: +aliases: +notes: +--- + +Here is `some code` in the body copy. + +{{% input "my-first-template.html" %}} +```go + +``` +{{% /input %}} + +{{% input "first-script.js" %}} +```js +function myFunction(arg){ + console.log(arg); +} +``` +{{% /input %}} + +{{% input "first-data.json" %}} +```json +function myFunction(arg){ + console.log(arg); +} +``` +{{% /input %}} + +{{% output "layouts/_default/list.html" %}} +```go + +``` +{{% /output %}} + +```javascript +function myFunction(val){ + console.log(val); +} +``` diff --git a/content/site-showcase/_index.md b/content/site-showcase/_index.md index dfb02d872..036b43ef2 100644 --- a/content/site-showcase/_index.md +++ b/content/site-showcase/_index.md @@ -7,7 +7,7 @@ publishdate: 2017-02-01 lastmod: 2017-02-01 tags: [] categories: [] -weight: +weight: 01 draft: false slug: aliases: [] diff --git a/content/templates/_index.md b/content/templates/_index.md index 2eae6dfe0..ad3c515ea 100644 --- a/content/templates/_index.md +++ b/content/templates/_index.md @@ -5,7 +5,7 @@ description: Golang templating, template types and lookup order, shortcodes, and date: 2017-02-01 publishdate: 2017-02-01 lastmod: 2017-02-01 -weight: +weight: 01 tags: [] draft: false slug: diff --git a/content/themes/_index.md b/content/themes/_index.md index bc1d5c0d4..024c84ab5 100644 --- a/content/themes/_index.md +++ b/content/themes/_index.md @@ -5,7 +5,8 @@ description: Description of the theming section and its contents. date: 2017-02-01 publishdate: 2017-02-01 lastmod: 2017-02-01 -weight: +weight: 01 +categories: [] tags: [] draft: false slug: diff --git a/content/troubleshooting/_index.md b/content/troubleshooting/_index.md index 8e7c9c9d6..1b01a11bc 100644 --- a/content/troubleshooting/_index.md +++ b/content/troubleshooting/_index.md @@ -1,11 +1,11 @@ --- title: Troubleshooting linktitle: -description: Description for *troubleshooting* section. -date: 2016-11-01 -publishdate: 2016-11-01 -lastmod: 2016-11-01 -weight: +description: Frequently asked questions pulled from the Hugo forum and known issues and workarounds. +date: 2017-02-01 +publishdate: 2017-02-01 +lastmod: 2017-02-01 +weight: 01 draft: false slug: aliases: [] diff --git a/content/tutorials/_index.md b/content/tutorials/_index.md index 8524ba637..21b580e3f 100644 --- a/content/tutorials/_index.md +++ b/content/tutorials/_index.md @@ -1,12 +1,15 @@ --- -title: Tutorials +title: Submitting a Tutorial linktitle: -description: +description: Learn how to submit your tutorial to the Hugo docs. date: 2017-02-01 publishdate: 2017-02-01 lastmod: 2017-02-01 -weight: -tags: [] +categories: [tutorials] +tags: [contribute,tutorials] +author: rdwatters +authorurl: "https://github.com/rdwatters" +weight: 01 draft: false slug: aliases: diff --git a/content/tutorials/how-to-contribute-to-hugo.md b/content/tutorials/how-to-contribute-to-hugo.md index d5de5da28..7d3071316 100644 --- a/content/tutorials/how-to-contribute-to-hugo.md +++ b/content/tutorials/how-to-contribute-to-hugo.md @@ -6,6 +6,8 @@ date: 2017-02-01 publishdate: 2017-02-01 lastmod: 2017-02-01 tags: [contribute,tutorials] +author: +authorprofileurl: weight: draft: false slug: diff --git a/data/sitenavigation.yml b/data/sitenavigation.yml new file mode 100644 index 000000000..df0639534 --- /dev/null +++ b/data/sitenavigation.yml @@ -0,0 +1,84 @@ +about: + order: 1 + title: "About Hugo" + url: "about-hugo" + haschildren: true + sortsubpagesby: "weight" +gettingstarted: + order: 2 + title: "Getting Started" + url: "getting-started" + haschildren: true + sortsubpagesby: "weight" +projectorganization: + order: 3 + title: "Project Organization" + url: "project-organization" + haschildren: true + sortsubpagesby: "weight" +contentmanagement: + order: 4 + title: "Content Management" + url: "content-management" + haschildren: true + sortsubpagesby: "weight" +templates: + order: 5 + title: "Templates" + url: "templates" + haschildren: true + sortsubpagesby: "weight" +functions: + order: 6 + title: "Functions" + url: "functions" + haschildren: true + sortsubpagesby: "title" +variablesandparams: + order: 7 + title: "Variables and Params" + url: "variables-and-params" + haschildren: true + sortsubpagesby: "weight" +themes: + order: 8 + title: "Themes" + url: "themes" + haschildren: true + sortsubpagesby: "weight" +hostinganddeployment: + order: 9 + title: "Hosting and Deployment" + url: "hosting-and-deployment" + haschildren: true + sortsubpagesby: "weight" +migratingtohugo: + order: 10 + title: "Migrating to Hugo" + url: "migrating-to-hugo" + haschildren: true + sortsubpagesby: "weight" +tutorials: + order: 11 + title: "Tutorials" + url: "tutorials" + haschildren: true + sortsubpagesby: "weight" +developertools: + order: 12 + title: "Developer Tools" + url: "developer-tools" + haschildren: true + sortsubpagesby: "weight" +troubleshooting: + order: 13 + title: "Troubleshooting" + url: "troubleshooting" + haschildren: true + sortsubpagesby: "weight" +newsandarticles: + order: 14 + title: "News and Articles" + url: "news-and-articles" + haschildren: true + sortsubpagesby: "weight" \ No newline at end of file diff --git a/themes/hugodocs/layouts/_default/list.html b/themes/hugodocs/layouts/_default/list.html deleted file mode 100644 index f7e593a91..000000000 --- a/themes/hugodocs/layouts/_default/list.html +++ /dev/null @@ -1,5 +0,0 @@ -{{- define "main" -}} -
- -
-{{- end -}} \ No newline at end of file diff --git a/themes/hugodocs/layouts/_default/section.html b/themes/hugodocs/layouts/_default/section.html index 3579f6c04..493783cbd 100644 --- a/themes/hugodocs/layouts/_default/section.html +++ b/themes/hugodocs/layouts/_default/section.html @@ -1,12 +1,12 @@ {{ define "main" }}
-

{{with .LinkTitle}}{{ . |markdownify}}{{else}}{{ .Title }}{{end}}

+

{{with .LinkTitle}}{{ . |markdownify}}{{else}}{{ .Title | markdownify }}{{end}}

+ Last Updated: {{with .Lastmod}}{{.Format "January 2, 2006"}}{{else}}{{.PublishDate.Format "January 2, 2006"}}{{end}} Edit
{{.Content}} - Last Updated: {{with .Lastmod}}{{.Format "January 2, 2006"}}{{else}}{{.PublishDate.Format "January 2, 2006"}}{{end}}
{{ end }} \ No newline at end of file diff --git a/themes/hugodocs/layouts/_default/single.html b/themes/hugodocs/layouts/_default/single.html index 28fd88bb6..8187ac7de 100644 --- a/themes/hugodocs/layouts/_default/single.html +++ b/themes/hugodocs/layouts/_default/single.html @@ -1,12 +1,12 @@ {{ define "main" }}
+ Edit
-

{{with .LinkTitle}}{{ . |markdownify}}{{else}}{{ .Title | markdownify }}{{end}}

- Edit +

{{with .LinkTitle}}{{ . |markdownify}}{{else}}{{ .Title | markdownify }}{{end}}

+ Last Updated: {{with .Lastmod}}{{.Format "January 2, 2006"}}{{else}}{{.PublishDate.Format "January 2, 2006"}}{{end}}
{{.Content}} - Last Updated: {{with .Lastmod}}{{.Format "January 2, 2006"}}{{else}}{{.PublishDate.Format "January 2, 2006"}}{{end}}
{{ end }} \ No newline at end of file diff --git a/themes/hugodocs/layouts/partials/head/site-style.html b/themes/hugodocs/layouts/partials/head/site-style.html index 719226f6c..ff2b8fa4d 100644 --- a/themes/hugodocs/layouts/partials/head/site-style.html +++ b/themes/hugodocs/layouts/partials/head/site-style.html @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/themes/hugodocs/layouts/partials/site-navigation.html b/themes/hugodocs/layouts/partials/site-navigation.html index 4fcf26bfc..74f6627dc 100644 --- a/themes/hugodocs/layouts/partials/site-navigation.html +++ b/themes/hugodocs/layouts/partials/site-navigation.html @@ -6,6 +6,30 @@