diff --git a/README.md b/README.md index 1e443c0b0ce91425525816b1914a8271e28558eb..083241aa1db15df1927cbe2d3e4e11deeb8268cb 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,14 @@ # The White Cabinet theme for Hugo - + -<!--check "CHECK"--> Furnished with a simple design and numerous features, the White Cabinet theme serves as a versatile basis for your website construction. By making use of the responsive menu styles organized into a classical block-based layout, you and your visitors can obtain the necessary information at ease, just like opening a ***cabinet***. By keeping the base color ***white***, it will match any content, from a daily blog to the introduction of a research institute. ## Key features - + Some of the features that make the White Cabinet unique are: @@ -29,16 +28,16 @@ To see how it looks, check out our **[Demo page](https://www.cns.s.u-tokyo.ac.jp 2. Create the directory for the web source (ex. `/foo/bar`) and clone into our git repository ``` - $ mkdir -p /foo/bar/themes - $ cd /foo/bar/themes - $ git clone ---NEED TO CHECK--- +$ mkdir -p /foo/bar/themes +$ cd /foo/bar/themes +$ git clone https://github.com/cns-netadmin/white-cabinet.git ``` 3. **Quick start:** You can check out the demo page we have prepared by building Hugo locally: ``` - $ cp white_cabinet_themes/demo-page/ /foo/bar/ - $ hugo server +$ cp white_cabinet_themes/exampleSite/ /foo/bar/ +$ hugo server ``` The demo page can be seen at `localhost:1313` in your web browser. @@ -48,8 +47,8 @@ The demo page can be seen at `localhost:1313` in your web browser. Global settings of your website can be customized in the file `config.toml`. At first, edit your server name so that the internal paths are correctly directed: ``` - baseurl = (YOUR_SERVER_NAME) +baseurl = (YOUR_SERVER_NAME) ``` -We have prepared several pages that demonstrate how you can make full use of the functionalities. See the [Features]({{< ref "features" >}}) section for details. +We have prepared several pages that demonstrate how you can make full use of the functionalities. See the [Features](https://www.cns.s.u-tokyo.ac.jp/white_cabinet/en/features/) section for details. diff --git a/archetypes/default.md b/archetypes/default.md index 10b08a1209c846ad8db6339e0ac9b8c8047535d6..1776186490a6405d46dee5e1537d08cd3ce1777c 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -23,6 +23,9 @@ weight = 3 #For main menu contents #mktile false +### When you use shortcodes [textlist, tilelist, postlist], enable next line ### +#layout = "single" + #For Local draft = false +++ diff --git a/example/static/img/2.jpg b/example/static/img/2.jpg deleted file mode 100644 index bccaf8b0e3dbc288a0ed842657f680a74d3477c8..0000000000000000000000000000000000000000 Binary files a/example/static/img/2.jpg and /dev/null differ diff --git a/example/static/img/hugo_logo.png b/example/static/img/hugo_logo.png deleted file mode 100644 index 48acf346c9e87d15ca919141c2b283e7fa8bce4e..0000000000000000000000000000000000000000 Binary files a/example/static/img/hugo_logo.png and /dev/null differ diff --git a/example/static/img/landscape.JPG b/example/static/img/landscape.JPG deleted file mode 100755 index 47e361fa76eb870b8c8f9a643a097b61d957abff..0000000000000000000000000000000000000000 Binary files a/example/static/img/landscape.JPG and /dev/null differ diff --git a/example/static/img/landscape2.JPG b/example/static/img/landscape2.JPG deleted file mode 100755 index 94edca36c61c022763b0df663b2a87dcddc03f6f..0000000000000000000000000000000000000000 Binary files a/example/static/img/landscape2.JPG and /dev/null differ diff --git a/example/static/img/screenshots/fmbanner_fig.png b/example/static/img/screenshots/fmbanner_fig.png deleted file mode 100644 index 7a221ba8454e849b02d8e3110eaf59ceec0b3e38..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/fmbanner_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/fmtags_fig.png b/example/static/img/screenshots/fmtags_fig.png deleted file mode 100644 index b16e6ee237cbe97ba32ae270663634486c19c5bb..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/fmtags_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/fmtitle_fig.png b/example/static/img/screenshots/fmtitle_fig.png deleted file mode 100644 index 44b4dff1e32b13d245464d866c34141ce270d12e..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/fmtitle_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/footer_fig.png b/example/static/img/screenshots/footer_fig.png deleted file mode 100644 index e2b8411dfc8933217c4ce8556455376737fdfe6a..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/footer_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/infobar_fig.png b/example/static/img/screenshots/infobar_fig.png deleted file mode 100644 index e31a0e89c134d0d0142529a4a8132b74b5dfd598..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/infobar_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/links_fig.png b/example/static/img/screenshots/links_fig.png deleted file mode 100644 index c0fcebc7f5b936378cd0d2a9fbd21e6b228baf2a..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/links_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/mainmenu_fig.png b/example/static/img/screenshots/mainmenu_fig.png deleted file mode 100644 index b2b3e0bfc6fd8c86622c9dfe8566bd186b55ec53..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/mainmenu_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/post_fig.png b/example/static/img/screenshots/post_fig.png deleted file mode 100644 index f7fd464eb2a8cfda5ad9bf33c9bd2c560a2df84b..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/post_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/postlist_fig.png b/example/static/img/screenshots/postlist_fig.png deleted file mode 100644 index 12d72c686c83cfd22c77e283105d51c075e542c4..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/postlist_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/textlist_fig.png b/example/static/img/screenshots/textlist_fig.png deleted file mode 100644 index c8357744a69173bbc00da431e1cee02adcc69bb9..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/textlist_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/tilelist_fig.png b/example/static/img/screenshots/tilelist_fig.png deleted file mode 100644 index 03fd54f33fe12d5c7b5f9698f1e2862c1213a3be..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/tilelist_fig.png and /dev/null differ diff --git a/example/static/img/screenshots/topfigures_headermenu_fig.png b/example/static/img/screenshots/topfigures_headermenu_fig.png deleted file mode 100644 index 5eee6d6a8f2577f3caed576c0db8a2696677db65..0000000000000000000000000000000000000000 Binary files a/example/static/img/screenshots/topfigures_headermenu_fig.png and /dev/null differ diff --git a/example/static/img/thumbnail.png b/example/static/img/thumbnail.png deleted file mode 100755 index 94793595ad7fb23c09cbaeba321b0126ee690d0d..0000000000000000000000000000000000000000 Binary files a/example/static/img/thumbnail.png and /dev/null differ diff --git a/example/static/img/topfigure1.jpg b/example/static/img/topfigure1.jpg deleted file mode 100755 index 55dd6c0b92c73cc1e273a8a135fef6d4209b8b1d..0000000000000000000000000000000000000000 Binary files a/example/static/img/topfigure1.jpg and /dev/null differ diff --git a/example/static/img/topfigure2.jpg b/example/static/img/topfigure2.jpg deleted file mode 100755 index 4ebf62ca418a450f0f5224ba8515de043f1e1ffa..0000000000000000000000000000000000000000 Binary files a/example/static/img/topfigure2.jpg and /dev/null differ diff --git a/example/static/img/topfigure3.jpg b/example/static/img/topfigure3.jpg deleted file mode 100755 index 0ff7dcb291b2cf32f2f9564c40d566a5ac7ca31b..0000000000000000000000000000000000000000 Binary files a/example/static/img/topfigure3.jpg and /dev/null differ diff --git a/example/static/img/topfigure4.jpg b/example/static/img/topfigure4.jpg deleted file mode 100755 index 4bc15a68191afcaf4aa38dbfc6e7ae7cb99a7ed0..0000000000000000000000000000000000000000 Binary files a/example/static/img/topfigure4.jpg and /dev/null differ diff --git a/example/static/img/topfigure5.jpg b/example/static/img/topfigure5.jpg deleted file mode 100755 index af9ce73625bcd8865c65870735fa2b0bedfb4ce5..0000000000000000000000000000000000000000 Binary files a/example/static/img/topfigure5.jpg and /dev/null differ diff --git a/example/static/img/white_cabinet_components.png b/example/static/img/white_cabinet_components.png deleted file mode 100755 index 64e129daa46b599aba636e828bb9b2940d45a1a5..0000000000000000000000000000000000000000 Binary files a/example/static/img/white_cabinet_components.png and /dev/null differ diff --git a/example/LICENSE b/exampleSite/LICENSE similarity index 100% rename from example/LICENSE rename to exampleSite/LICENSE diff --git a/example/README.md b/exampleSite/README.md similarity index 100% rename from example/README.md rename to exampleSite/README.md diff --git a/example/config.toml b/exampleSite/config.toml similarity index 90% rename from example/config.toml rename to exampleSite/config.toml index e990f7571b71272c10c2abeb64ecf3e36b916471..e4a0e3e8d63729538f0ddc768919287b5984701b 100644 --- a/example/config.toml +++ b/exampleSite/config.toml @@ -1,4 +1,4 @@ -baseurl = "https://pages.gitlab.io/hugo/" +baseurl = "https://example.com" contentdir = "content" layoutdir = "layouts" @@ -56,11 +56,10 @@ enableEmoji = true # location = "Location" ######################################## - logo = "img/hugo_logo.png" - favicon = "img/favicon.ico" + logo = "img/white_cabinet_logo.png" + faviconDir = "img/favicon" dateFormat = "2006/01/02" - # defaultBannerImage = "/img/ForBanner/book-test.jpg" - defaultBannerImage = "" + defaultBannerImage = "img/banners/WhiteCabinet_defaultBannerImage.PNG" commit = false rss = true comments = true @@ -127,6 +126,13 @@ enableEmoji = true weight = 3 pre = "open" post = "postcard" + +[[menu.main]] + identifier = "basic" + name = "Hugo basic example" + url = "/basic" + weight = 4 + pre = "closed" #### For advance user ###################################### ## in the case using HTML, uncomment following two lines ### diff --git a/example/content/about/README.md b/exampleSite/content/about/README.md similarity index 100% rename from example/content/about/README.md rename to exampleSite/content/about/README.md diff --git a/example/content/about/_index.ja.md b/exampleSite/content/about/_index.ja.md similarity index 100% rename from example/content/about/_index.ja.md rename to exampleSite/content/about/_index.ja.md diff --git a/example/content/about/_index.md b/exampleSite/content/about/_index.md similarity index 94% rename from example/content/about/_index.md rename to exampleSite/content/about/_index.md index a7a48e767aa8b220c8444cd0aa3ebd89251fb66e..bb561e3d9e89387ba3dec1f86f22ce2641351224 100644 --- a/example/content/about/_index.md +++ b/exampleSite/content/about/_index.md @@ -41,13 +41,13 @@ To see how it looks, check out our **[Demo page]({{< ref "/" >}})**! ``` $ mkdir -p /foo/bar/themes $ cd /foo/bar/themes - $ git clone ---NEED TO CHECK--- + $ git clone https://github.com/cns-netadmin/white-cabinet.git ``` 3. **Quick start:** You can check out the demo page we have prepared by building Hugo locally: ``` - $ cp white_cabinet_themes/demo-page/ /foo/bar/ + $ cp -r white_cabinet_themes/exampleSite/ /foo/bar/ $ hugo server ``` diff --git a/example/content/about/_index.zh.md b/exampleSite/content/about/_index.zh.md similarity index 100% rename from example/content/about/_index.zh.md rename to exampleSite/content/about/_index.zh.md diff --git a/example/content/access.en.md b/exampleSite/content/access.en.md similarity index 100% rename from example/content/access.en.md rename to exampleSite/content/access.en.md diff --git a/example/content/access.md b/exampleSite/content/access.md similarity index 100% rename from example/content/access.md rename to exampleSite/content/access.md diff --git a/exampleSite/content/basic/_index.md b/exampleSite/content/basic/_index.md new file mode 100644 index 0000000000000000000000000000000000000000..14ab8726b25742fdf95bd20f8b0dc5a6d302fbd3 --- /dev/null +++ b/exampleSite/content/basic/_index.md @@ -0,0 +1,7 @@ ++++ +author = "Hugo Authors" +title = "Hugo Basic Example" +layout = "single" ++++ + +{{< textlist >}} diff --git a/exampleSite/content/basic/about.md b/exampleSite/content/basic/about.md new file mode 100644 index 0000000000000000000000000000000000000000..a4128062c16799885dfe5c98d807db19d4359d08 --- /dev/null +++ b/exampleSite/content/basic/about.md @@ -0,0 +1,28 @@ ++++ +title = "About" +description = "Hugo, the world窶冱 fastest framework for building websites" +date = "2019-02-28" +aliases = ["about-us","about-hugo","contact"] +author = "Hugo Authors" ++++ + +Written in Go, Hugo is an open source static site generator available under the [Apache Licence 2.0.](https://github.com/gohugoio/hugo/blob/master/LICENSE) Hugo supports TOML, YAML and JSON data file types, Markdown and HTML content files and uses shortcodes to add rich content. Other notable features are taxonomies, multilingual mode, image processing, custom output formats, HTML/CSS/JS minification and support for Sass SCSS workflows. + +Hugo makes use of a variety of open source projects including: + +* https://github.com/yuin/goldmark +* https://github.com/alecthomas/chroma +* https://github.com/muesli/smartcrop +* https://github.com/spf13/cobra +* https://github.com/spf13/viper + +Hugo is ideal for blogs, corporate websites, creative portfolios, online magazines, single page applications or even a website with thousands of pages. + +Hugo is for people who want to hand code their own website without worrying about setting up complicated runtimes, dependencies and databases. + +Websites built with Hugo are extremelly fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider. + +Learn more and contribute on [GitHub](https://github.com/gohugoio). + + + diff --git a/exampleSite/content/basic/archives.md b/exampleSite/content/basic/archives.md new file mode 100644 index 0000000000000000000000000000000000000000..50b4a9adde81be406bc4ffad4791b3ce7bc28323 --- /dev/null +++ b/exampleSite/content/basic/archives.md @@ -0,0 +1,6 @@ +--- +date: 2019-05-28 +type: section +layout: "archives" +title: "archives" +--- diff --git a/exampleSite/content/basic/homepage/about.md b/exampleSite/content/basic/homepage/about.md new file mode 100644 index 0000000000000000000000000000000000000000..c2ba6802c2f6df22f1bd8b38e90a28e1a830ac06 --- /dev/null +++ b/exampleSite/content/basic/homepage/about.md @@ -0,0 +1,7 @@ +--- +title: 'Our Difference' +button: 'About us' +weight: 2 +--- + +Lorem ipsum dolor sit amet, et essent mediocritatem quo, choro volumus oporteat an mei. ipsum dolor sit amet, et essent mediocritatem quo, \ No newline at end of file diff --git a/exampleSite/content/basic/homepage/index.md b/exampleSite/content/basic/homepage/index.md new file mode 100644 index 0000000000000000000000000000000000000000..a4536dae4b158543186258e52f9c6b4564af99c2 --- /dev/null +++ b/exampleSite/content/basic/homepage/index.md @@ -0,0 +1,4 @@ +--- +headless : true +title : "home page" +--- diff --git a/exampleSite/content/basic/homepage/work.md b/exampleSite/content/basic/homepage/work.md new file mode 100644 index 0000000000000000000000000000000000000000..f2fee737dd1f669b2ad11dbd047625fdc4ca2395 --- /dev/null +++ b/exampleSite/content/basic/homepage/work.md @@ -0,0 +1,7 @@ +--- +title: 'We Help Business Grow' +button: 'Our Work' +weight: 1 +--- + +Lorem ipsum dolor sit amet, et essent mediocritatem quo, choro volumus oporteat an mei. Numquam dolores mel eu, mea docendi omittantur et, mea ea duis erat. Elit melius cu ius. Per ex novum tantas putant, ei his nullam aliquam apeirian. Aeterno quaestio constituto sea an, no eum intellegat assueverit. \ No newline at end of file diff --git a/exampleSite/content/basic/post/_index.md b/exampleSite/content/basic/post/_index.md new file mode 100644 index 0000000000000000000000000000000000000000..7c6bd54f58c8f42773585193f9cbc5784e9434b2 --- /dev/null +++ b/exampleSite/content/basic/post/_index.md @@ -0,0 +1,6 @@ ++++ +aliases = ["posts","articles","blog","showcase","docs"] +title = "Posts" +author = "Hugo Authors" +tags = ["index"] ++++ diff --git a/exampleSite/content/basic/post/emoji-support.md b/exampleSite/content/basic/post/emoji-support.md new file mode 100644 index 0000000000000000000000000000000000000000..ecf6c86103c3d54208bfa8e551afa365e17ff5ce --- /dev/null +++ b/exampleSite/content/basic/post/emoji-support.md @@ -0,0 +1,47 @@ ++++ +author = "Hugo Authors" +title = "Emoji Support" +date = "2019-03-05" +description = "Guide to emoji usage in Hugo" +tags = [ + "emoji", +] ++++ + +Emoji can be enabled in a Hugo project in a number of ways. +<!--more--> +The [`emojify`](https://gohugo.io/functions/emojify/) function can be called directly in templates or [Inline Shortcodes](https://gohugo.io/templates/shortcode-templates/#inline-shortcodes). + +To enable emoji globally, set `enableEmoji` to `true` in your site窶冱 [configuration](https://gohugo.io/getting-started/configuration/) and then you can type emoji shorthand codes directly in content files; e.g. + + +<p><span class="nowrap"><span class="emojify">刪</span> <code>:see_no_evil:</code></span> <span class="nowrap"><span class="emojify">刮</span> <code>:hear_no_evil:</code></span> <span class="nowrap"><span class="emojify">刳</span> <code>:speak_no_evil:</code></span></p> +<br> + +The [Emoji cheat sheet](http://www.emoji-cheat-sheet.com/) is a useful reference for emoji shorthand codes. + +*** + +**N.B.** The above steps enable Unicode Standard emoji characters and sequences in Hugo, however the rendering of these glyphs depends on the browser and the platform. To style the emoji you can either use a third party emoji font or a font stack; e.g. + +{{< highlight html >}} +.emoji { +font-family: Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols; +} +{{< /highlight >}} + +{{< css.inline >}} +<style> +.emojify { + font-family: Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols; + font-size: 2rem; + vertical-align: middle; +} +@media screen and (max-width:650px) { + .nowrap { + display: block; + margin: 25px 0; +} +} +</style> +{{< /css.inline >}} \ No newline at end of file diff --git a/exampleSite/content/basic/post/markdown-syntax.md b/exampleSite/content/basic/post/markdown-syntax.md new file mode 100644 index 0000000000000000000000000000000000000000..d60c404ec4102a86fe97dc93e142ee176761899a --- /dev/null +++ b/exampleSite/content/basic/post/markdown-syntax.md @@ -0,0 +1,147 @@ ++++ +author = "Hugo Authors" +title = "Markdown Syntax Guide" +date = "2019-03-11" +description = "Sample article showcasing basic Markdown syntax and formatting for HTML elements." +tags = [ + "markdown", + "css", + "html", + "themes", +] +categories = [ + "themes", + "syntax", +] +series = ["Themes Guide"] +aliases = ["migrate-from-jekyl"] ++++ + +This article offers a sample of basic Markdown syntax that can be used in Hugo content files, also it shows whether basic HTML elements are decorated with CSS in a Hugo theme. +<!--more--> + +## Headings + +The following HTML `<h1>`窶覗<h6>` elements represent six levels of section headings. `<h1>` is the highest section level while `<h6>` is the lowest. + +# H1 +## H2 +### H3 +#### H4 +##### H5 +###### H6 + +## Paragraph + +Xerum, quo qui aut unt expliquam qui dolut labo. Aque venitatiusda cum, voluptionse latur sitiae dolessi aut parist aut dollo enim qui voluptate ma dolestendit peritin re plis aut quas inctum laceat est volestemque commosa as cus endigna tectur, offic to cor sequas etum rerum idem sintibus eiur? Quianimin porecus evelectur, cum que nis nust voloribus ratem aut omnimi, sitatur? Quiatem. Nam, omnis sum am facea corem alique molestrunt et eos evelece arcillit ut aut eos eos nus, sin conecerem erum fuga. Ri oditatquam, ad quibus unda veliamenimin cusam et facea ipsamus es exerum sitate dolores editium rerore eost, temped molorro ratiae volorro te reribus dolorer sperchicium faceata tiustia prat. + +Itatur? Quiatae cullecum rem ent aut odis in re eossequodi nonsequ idebis ne sapicia is sinveli squiatum, core et que aut hariosam ex eat. + +## Blockquotes + +The blockquote element represents content that is quoted from another source, optionally with a citation which must be within a `footer` or `cite` element, and optionally with in-line changes such as annotations and abbreviations. + +#### Blockquote without attribution + +> Tiam, ad mint andaepu dandae nostion secatur sequo quae. +> **Note** that you can use *Markdown syntax* within a blockquote. + +#### Blockquote with attribution + +> Don't communicate by sharing memory, share memory by communicating.</p> +> 窶� <cite>Rob Pike[^1]</cite> + + +[^1]: The above quote is excerpted from Rob Pike's [talk](https://www.youtube.com/watch?v=PAAkCSZUG1c) during Gopherfest, November 18, 2015. + +## Tables + +Tables aren't part of the core Markdown spec, but Hugo supports supports them out-of-the-box. + + Name | Age +--------|------ + Bob | 27 + Alice | 23 + +#### Inline Markdown within tables + +| Inline | Markdown | In | Table | +| ---------- | --------- | ----------------- | ---------- | +| *italics* | **bold** | ~~strikethrough~~ | `code` | + +## Code Blocks + +#### Code block with backticks + +``` +html +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8"> + <title>Example HTML5 Document</title> +</head> +<body> + <p>Test</p> +</body> +</html> +``` +#### Code block indented with four spaces + + <!DOCTYPE html> + <html lang="en"> + <head> + <meta charset="UTF-8"> + <title>Example HTML5 Document</title> + </head> + <body> + <p>Test</p> + </body> + </html> + +#### Code block with Hugo's internal highlight shortcode +{{< highlight html >}} +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8"> + <title>Example HTML5 Document</title> +</head> +<body> + <p>Test</p> +</body> +</html> +{{< /highlight >}} + +## List Types + +#### Ordered List + +1. First item +2. Second item +3. Third item + +#### Unordered List + +* List item +* Another item +* And another item + +#### Nested list + +* Item +1. First Sub-item +2. Second Sub-item + +## Other Elements 窶� abbr, sub, sup, kbd, mark + +<abbr title="Graphics Interchange Format">GIF</abbr> is a bitmap image format. + +H<sub>2</sub>O + +X<sup>n</sup> + Y<sup>n</sup> = Z<sup>n</sup> + +Press <kbd><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>Delete</kbd></kbd> to end the session. + +Most <mark>salamanders</mark> are nocturnal, and hunt for insects, worms, and other small creatures. + diff --git a/exampleSite/content/basic/post/math-typesetting.mmark b/exampleSite/content/basic/post/math-typesetting.mmark new file mode 100644 index 0000000000000000000000000000000000000000..7f421ae12ea40049ad3f8a85477c440bf7f05cd8 --- /dev/null +++ b/exampleSite/content/basic/post/math-typesetting.mmark @@ -0,0 +1,46 @@ +--- +author: Hugo Authors +title: Math Typesetting +date: 2019-03-08 +description: A brief guide to setup KaTeX +markup: mmark +math: true +--- + +Mathematical notation in a Hugo project can be enabled by using third party JavaScript libraries. +<!--more--> + +In this example we will be using [KaTeX](https://katex.org/) + +- Create a partial under `/layouts/partials/math.html` +- Within this partial reference the [Auto-render Extension](https://katex.org/docs/autorender.html) or host these scripts locally. +- Include the partial in your templates like so: + +``` +{{ if or .Params.math .Site.Params.math }} +{{ partial "math.html" . }} +{{ end }} +``` +- To enable KaTex globally set the parameter `math` to `true` in a project's configuration +- To enable KaTex on a per page basis include the parameter `math: true` in content files. + +**Note:** Use the online reference of [Supported TeX Functions](https://katex.org/docs/supported.html) +{{< math.inline >}} +{{ if or .Page.Params.math .Site.Params.math }} +<!-- KaTeX --> +<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.10.1/dist/katex.min.css" integrity="sha384-dbVIfZGuN1Yq7/1Ocstc1lUEm+AT+/rCkibIcC/OmWo5f0EA48Vf8CytHzGrSwbQ" crossorigin="anonymous"> +<script defer src="https://cdn.jsdelivr.net/npm/katex@0.10.1/dist/katex.min.js" integrity="sha384-2BKqo+exmr9su6dir+qCw08N2ZKRucY4PrGQPPWU1A7FtlCGjmEGFqXCv5nyM5Ij" crossorigin="anonymous"></script> +<script defer src="https://cdn.jsdelivr.net/npm/katex@0.10.1/dist/contrib/auto-render.min.js" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" crossorigin="anonymous" onload="renderMathInElement(document.body);"></script> +{{ end }} +{{</ math.inline >}} + +### Examples + +Inline math: $$ \varphi = \dfrac{1+\sqrt5}{2}= 1.6180339887窶ヲ $$ + +Block math: + +$$ + \varphi = 1+\frac{1} {1+\frac{1} {1+\frac{1} {1+\cdots} } } +$$ + diff --git a/exampleSite/content/basic/post/placeholder-text.md b/exampleSite/content/basic/post/placeholder-text.md new file mode 100644 index 0000000000000000000000000000000000000000..378b9954ecc1118b4f6c053836853393b71717e8 --- /dev/null +++ b/exampleSite/content/basic/post/placeholder-text.md @@ -0,0 +1,58 @@ ++++ +author = "Hugo Authors" +title = "Placeholder Text" +date = "2019-03-09" +description = "Lorem Ipsum Dolor Si Amet" +tags = [ + "markdown", + "text", +] ++++ + +Lorem est tota propiore conpellat pectoribus de +pectora summo. <!--more-->Redit teque digerit hominumque toris verebor lumina non cervice +subde tollit usus habet Arctonque, furores quas nec ferunt. Quoque montibus nunc +caluere tempus inhospita parcite confusaque translucet patri vestro qui optatis +lumine cognoscere flos nubis! Fronde ipsamque patulos Dryopen deorum. + +1. Exierant elisi ambit vivere dedere +2. Duce pollice +3. Eris modo +4. Spargitque ferrea quos palude + +Rursus nulli murmur; hastile inridet ut ab gravi sententia! Nomine potitus +silentia flumen, sustinet placuit petis in dilapsa erat sunt. Atria +tractus malis. + +1. Comas hunc haec pietate fetum procerum dixit +2. Post torum vates letum Tiresia +3. Flumen querellas +4. Arcanaque montibus omnes +5. Quidem et + +# Vagus elidunt + +<svg class="canon" xmlns="http://www.w3.org/2000/svg" overflow="visible" viewBox="0 0 496 373" height="373" width="496"><g fill="none"><path stroke="#000" stroke-width=".75" d="M.599 372.348L495.263 1.206M.312.633l494.95 370.853M.312 372.633L247.643.92M248.502.92l246.76 370.566M330.828 123.869V1.134M330.396 1.134L165.104 124.515"></path><path stroke="#ED1C24" stroke-width=".75" d="M275.73 41.616h166.224v249.05H275.73zM54.478 41.616h166.225v249.052H54.478z"></path><path stroke="#000" stroke-width=".75" d="M.479.375h495v372h-495zM247.979.875v372"></path><ellipse cx="498.729" cy="177.625" rx=".75" ry="1.25"></ellipse><ellipse cx="247.229" cy="377.375" rx=".75" ry="1.25"></ellipse></g></svg> + +[The Van de Graaf Canon](https://en.wikipedia.org/wiki/Canons_of_page_construction#Van_de_Graaf_canon) + +## Mane refeci capiebant unda mulcebat + +Victa caducifer, malo vulnere contra +dicere aurato, ludit regale, voca! Retorsit colit est profanae esse virescere +furit nec; iaculi matertera et visa est, viribus. Divesque creatis, tecta novat collumque vulnus est, parvas. **Faces illo pepulere** tempus adest. Tendit flamma, ab opes virum sustinet, sidus sequendo urbis. + +Iubar proles corpore raptos vero auctor imperium; sed et huic: manus caeli +Lelegas tu lux. Verbis obstitit intus oblectamina fixis linguisque ausus sperare +Echionides cornuaque tenent clausit possit. Omnia putatur. Praeteritae refert +ausus; ferebant e primus lora nutat, vici quae mea ipse. Et iter nil spectatae +vulnus haerentia iuste et exercebat, sui et. + +Eurytus Hector, materna ipsumque ut Politen, nec, nate, ignari, vernum cohaesit sequitur. Vel **mitis temploque** vocatus, inque alis, *oculos nomen* non silvis corpore coniunx ne displicet illa. Crescunt non unus, vidit visa quantum inmiti flumina mortis facto sic: undique a alios vincula sunt iactata abdita! Suspenderat ego fuit tendit: luna, ante urbem +Propoetides **parte**. + +{{< css.inline >}} +<style> +.canon { background: white; width: 100%; height: auto;} +</style> +{{< /css.inline >}} diff --git a/exampleSite/content/basic/post/rich-content.md b/exampleSite/content/basic/post/rich-content.md new file mode 100644 index 0000000000000000000000000000000000000000..239879f71da8190f4a0242ec6b0666dd4fc20a8e --- /dev/null +++ b/exampleSite/content/basic/post/rich-content.md @@ -0,0 +1,36 @@ ++++ +author = "Hugo Authors" +title = "Rich Content" +date = "2019-03-10" +description = "A brief description of Hugo Shortcodes" +tags = [ + "shortcodes", + "privacy", +] ++++ + +Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-management/shortcodes/#use-hugo-s-built-in-shortcodes) for rich content, along with a [Privacy Config](https://gohugo.io/about/hugo-and-gdpr/) and a set of Simple Shortcodes that enable static and no-JS versions of various social media embeds. +<!--more--> + + +--- + +## YouTube Privacy Enhanced Shortcode + +{{< youtube ZJthWmvUzzc >}} + +<br> + +--- + +## Twitter Simple Shortcode + +{{< twitter_simple 1085870671291310081 >}} + +<br> + +--- + +## Vimeo Simple Shortcode + +{{< vimeo_simple 48912912 >}} diff --git a/example/content/features/_index.md b/exampleSite/content/features/_index.md similarity index 100% rename from example/content/features/_index.md rename to exampleSite/content/features/_index.md diff --git a/example/content/features/build/_index.md b/exampleSite/content/features/build/_index.md similarity index 100% rename from example/content/features/build/_index.md rename to exampleSite/content/features/build/_index.md diff --git a/example/content/features/build/access.md b/exampleSite/content/features/build/access.md similarity index 100% rename from example/content/features/build/access.md rename to exampleSite/content/features/build/access.md diff --git a/example/content/features/build/footer.md b/exampleSite/content/features/build/footer.md similarity index 100% rename from example/content/features/build/footer.md rename to exampleSite/content/features/build/footer.md diff --git a/example/content/features/build/headermenu.md b/exampleSite/content/features/build/headermenu.md similarity index 100% rename from example/content/features/build/headermenu.md rename to exampleSite/content/features/build/headermenu.md diff --git a/example/content/features/build/links.md b/exampleSite/content/features/build/links.md similarity index 100% rename from example/content/features/build/links.md rename to exampleSite/content/features/build/links.md diff --git a/example/content/features/build/mainmenu.md b/exampleSite/content/features/build/mainmenu.md similarity index 100% rename from example/content/features/build/mainmenu.md rename to exampleSite/content/features/build/mainmenu.md diff --git a/example/content/features/build/multilingual.md b/exampleSite/content/features/build/multilingual.md similarity index 100% rename from example/content/features/build/multilingual.md rename to exampleSite/content/features/build/multilingual.md diff --git a/example/content/features/build/sidebar.md b/exampleSite/content/features/build/sidebar.md similarity index 100% rename from example/content/features/build/sidebar.md rename to exampleSite/content/features/build/sidebar.md diff --git a/example/content/features/build/title.md b/exampleSite/content/features/build/title.md similarity index 100% rename from example/content/features/build/title.md rename to exampleSite/content/features/build/title.md diff --git a/example/content/features/build/topfigures.md b/exampleSite/content/features/build/topfigures.md similarity index 58% rename from example/content/features/build/topfigures.md rename to exampleSite/content/features/build/topfigures.md index f60b9314828d07434a90913959db69e2194148bb..52ddc2874bac5d54c8fb424f6ea603e342afdb9a 100644 --- a/example/content/features/build/topfigures.md +++ b/exampleSite/content/features/build/topfigures.md @@ -1,5 +1,5 @@ +++ -title = "Change the logo and top figures" +title = "Change the logo, favicon, and top figures" date = 2020-03-09T14:23:27+09:00 publishDate = 2020-03-09T14:23:27+09:00 @@ -29,10 +29,12 @@ draft = false <!--#### 2. Change the logo and top figures.--> -You can use your original logo to represent your website. Also, you can set several images to be shown as a slideshow on the top part of the top page. +You can use your original logo and favicon to represent your website. Also, you can set several images to be shown as a slideshow on the top part of the top page.  +## Setting the logo image and top figures + The logo and image files should be placed under the directory "static". Assuming that the root directory of the site is `/foo/bar`, place the logo as `/foo/bar/static/img/logo.png` and the top figure as `/foo/bar/static/img/topfig1.jpg`, etc. Then, set the path to these files in the `config.toml` as: @@ -48,6 +50,18 @@ Then, set the path to these files in the `config.toml` as: ] ``` +## Setting the favicon image + +You can make your custom favicon image for your website. The default method is to generate a set of images and files required for a multi-platform favicon with the help of a third-party favicon generator such as [the Real Favicon Generator](https://realfavicongenerator.net/). The generated files should be placed in the directory specified by the `faviconDir` parameter in the `config.toml`: + +```config.toml +[Params] + faviconDir = "img/favicon" +``` + +Then the icon file `static/img/favicon/favicon.ico`, image file `static/img/favicon/android-chrome-192x192.png`, etc. will be automatically read and displayed on the browser. + + ## Display the color ribbon If you want to display the color ribbon, which is shown in a figure, add `ribbon_color` parameter with hex color like: diff --git a/example/content/features/contents/_index.md b/exampleSite/content/features/contents/_index.md similarity index 100% rename from example/content/features/contents/_index.md rename to exampleSite/content/features/contents/_index.md diff --git a/example/content/features/contents/front_matter.md b/exampleSite/content/features/contents/front_matter.md similarity index 100% rename from example/content/features/contents/front_matter.md rename to exampleSite/content/features/contents/front_matter.md diff --git a/example/content/features/contents/multilang_posts.md b/exampleSite/content/features/contents/multilang_posts.md similarity index 100% rename from example/content/features/contents/multilang_posts.md rename to exampleSite/content/features/contents/multilang_posts.md diff --git a/example/content/features/contents/post_creation.md b/exampleSite/content/features/contents/post_creation.md similarity index 100% rename from example/content/features/contents/post_creation.md rename to exampleSite/content/features/contents/post_creation.md diff --git a/example/content/features/contents/post_image.md b/exampleSite/content/features/contents/post_image.md similarity index 100% rename from example/content/features/contents/post_image.md rename to exampleSite/content/features/contents/post_image.md diff --git a/example/content/features/contents/post_math.md b/exampleSite/content/features/contents/post_math.md similarity index 100% rename from example/content/features/contents/post_math.md rename to exampleSite/content/features/contents/post_math.md diff --git a/example/content/features/contents/tags_fm.md b/exampleSite/content/features/contents/tags_fm.md similarity index 100% rename from example/content/features/contents/tags_fm.md rename to exampleSite/content/features/contents/tags_fm.md diff --git a/example/content/features/list/_index.md b/exampleSite/content/features/list/_index.md similarity index 100% rename from example/content/features/list/_index.md rename to exampleSite/content/features/list/_index.md diff --git a/example/content/features/list/list_techs.md b/exampleSite/content/features/list/list_techs.md similarity index 100% rename from example/content/features/list/list_techs.md rename to exampleSite/content/features/list/list_techs.md diff --git a/example/content/features/list/post_type_content.md b/exampleSite/content/features/list/post_type_content.md similarity index 100% rename from example/content/features/list/post_type_content.md rename to exampleSite/content/features/list/post_type_content.md diff --git a/example/content/features/list/section_page.md b/exampleSite/content/features/list/section_page.md similarity index 100% rename from example/content/features/list/section_page.md rename to exampleSite/content/features/list/section_page.md diff --git a/example/content/greenwich.md b/exampleSite/content/greenwich.md similarity index 100% rename from example/content/greenwich.md rename to exampleSite/content/greenwich.md diff --git a/example/content/individual.md b/exampleSite/content/individual.md similarity index 100% rename from example/content/individual.md rename to exampleSite/content/individual.md diff --git a/example/content/link/index.md b/exampleSite/content/link/index.md similarity index 100% rename from example/content/link/index.md rename to exampleSite/content/link/index.md diff --git a/example/content/post/post2.md b/exampleSite/content/post/post2.md similarity index 100% rename from example/content/post/post2.md rename to exampleSite/content/post/post2.md diff --git a/example/content/post/post3.md b/exampleSite/content/post/post3.md similarity index 100% rename from example/content/post/post3.md rename to exampleSite/content/post/post3.md diff --git a/example/content/post/post4.md b/exampleSite/content/post/post4.md similarity index 100% rename from example/content/post/post4.md rename to exampleSite/content/post/post4.md diff --git a/example/content/post/post5.md b/exampleSite/content/post/post5.md similarity index 90% rename from example/content/post/post5.md rename to exampleSite/content/post/post5.md index df72c50384b714cb6b35fe7e337517821466438f..09dc49a0d3b160ec21caf77cef48cd31c8bc848a 100644 --- a/example/content/post/post5.md +++ b/exampleSite/content/post/post5.md @@ -6,8 +6,8 @@ publishDate = 2019-11-12T19:09:55+09:00 categories = "" ##ex: categories = "event"## ## for categ. event : remove "#" following 2 columns. ## -eventStartDate = 2020-03-01 -eventEndDate = 2020-03-31 +eventStartDate = 2120-03-01 +eventEndDate = 2120-03-31 tags = ["Event"] ##ex: tags = ["Seminar","Conference"]## diff --git a/example/content/post/post6.md b/exampleSite/content/post/post6.md similarity index 100% rename from example/content/post/post6.md rename to exampleSite/content/post/post6.md diff --git a/example/content/postcard.md b/exampleSite/content/postcard.md similarity index 100% rename from example/content/postcard.md rename to exampleSite/content/postcard.md diff --git a/example/content/sitemap.md b/exampleSite/content/sitemap.md similarity index 100% rename from example/content/sitemap.md rename to exampleSite/content/sitemap.md diff --git a/exampleSite/static/img/2.jpg b/exampleSite/static/img/2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..76aa8e9adcb2159a08e5296d8aa695e3d66dab67 Binary files /dev/null and b/exampleSite/static/img/2.jpg differ diff --git a/example/static/img/4.png b/exampleSite/static/img/4.png similarity index 100% rename from example/static/img/4.png rename to exampleSite/static/img/4.png diff --git a/exampleSite/static/img/banners/WhiteCabinet_defaultBannerImage.PNG b/exampleSite/static/img/banners/WhiteCabinet_defaultBannerImage.PNG new file mode 100644 index 0000000000000000000000000000000000000000..90708fecf17b63841c0f1abf8d0864a810c90d3a Binary files /dev/null and b/exampleSite/static/img/banners/WhiteCabinet_defaultBannerImage.PNG differ diff --git a/example/static/img/build1.jpg b/exampleSite/static/img/build1.jpg similarity index 100% rename from example/static/img/build1.jpg rename to exampleSite/static/img/build1.jpg diff --git a/example/static/img/edit1.jpg b/exampleSite/static/img/edit1.jpg similarity index 100% rename from example/static/img/edit1.jpg rename to exampleSite/static/img/edit1.jpg diff --git a/exampleSite/static/img/favicon/android-chrome-192x192.png b/exampleSite/static/img/favicon/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..0288c69fb66f05affa75d6f6daf03e81149082f0 Binary files /dev/null and b/exampleSite/static/img/favicon/android-chrome-192x192.png differ diff --git a/exampleSite/static/img/favicon/android-chrome-512x512.png b/exampleSite/static/img/favicon/android-chrome-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..be4959be57473cf8b9564fea9df4bcf953e19ad3 Binary files /dev/null and b/exampleSite/static/img/favicon/android-chrome-512x512.png differ diff --git a/exampleSite/static/img/favicon/apple-touch-icon.png b/exampleSite/static/img/favicon/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b9163c6e99ad7b45724ef3d2c78ba0c53fb978b8 Binary files /dev/null and b/exampleSite/static/img/favicon/apple-touch-icon.png differ diff --git a/exampleSite/static/img/favicon/browserconfig.xml b/exampleSite/static/img/favicon/browserconfig.xml new file mode 100644 index 0000000000000000000000000000000000000000..b3930d0f047184047cb81d620436d91653438b8b --- /dev/null +++ b/exampleSite/static/img/favicon/browserconfig.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<browserconfig> + <msapplication> + <tile> + <square150x150logo src="/mstile-150x150.png"/> + <TileColor>#da532c</TileColor> + </tile> + </msapplication> +</browserconfig> diff --git a/exampleSite/static/img/favicon/favicon-16x16.png b/exampleSite/static/img/favicon/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..1033dd4d6350cbe79ed9ae2bee338dc275496b4a Binary files /dev/null and b/exampleSite/static/img/favicon/favicon-16x16.png differ diff --git a/exampleSite/static/img/favicon/favicon-32x32.png b/exampleSite/static/img/favicon/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..6fd3b8694f9328d704d5d4506545993c59021ba5 Binary files /dev/null and b/exampleSite/static/img/favicon/favicon-32x32.png differ diff --git a/exampleSite/static/img/favicon/favicon.ico b/exampleSite/static/img/favicon/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..edc1727e034df5b30163965f1bc506b69effe546 Binary files /dev/null and b/exampleSite/static/img/favicon/favicon.ico differ diff --git a/exampleSite/static/img/favicon/mstile-150x150.png b/exampleSite/static/img/favicon/mstile-150x150.png new file mode 100644 index 0000000000000000000000000000000000000000..22032b5f3c59fb0af17a0bc72e3706bc5c7adde6 Binary files /dev/null and b/exampleSite/static/img/favicon/mstile-150x150.png differ diff --git a/exampleSite/static/img/favicon/safari-pinned-tab.svg b/exampleSite/static/img/favicon/safari-pinned-tab.svg new file mode 100644 index 0000000000000000000000000000000000000000..ad9c273d3f4408d5cf7ef790c3925bdac7c92d8e --- /dev/null +++ b/exampleSite/static/img/favicon/safari-pinned-tab.svg @@ -0,0 +1,88 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" + "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> +<svg version="1.0" xmlns="http://www.w3.org/2000/svg" + width="756.000000pt" height="756.000000pt" viewBox="0 0 756.000000 756.000000" + preserveAspectRatio="xMidYMid meet"> +<metadata> +Created by potrace 1.11, written by Peter Selinger 2001-2013 +</metadata> +<g transform="translate(0.000000,756.000000) scale(0.100000,-0.100000)" +fill="#000000" stroke="none"> +<path d="M1305 7380 c-403 -30 -762 -258 -968 -615 -93 -161 -142 -322 -158 +-520 -6 -85 -9 -1157 -7 -3100 l3 -2970 463 -3 462 -2 0 500 0 500 2680 0 +2680 0 0 -500 0 -500 463 2 462 3 3 2995 c2 2015 -1 3031 -8 3105 -38 408 +-287 779 -649 968 -106 55 -201 90 -329 119 l-97 22 -2450 2 c-1347 1 -2495 +-2 -2550 -6z m5025 -84 c244 -37 464 -149 640 -326 130 -129 223 -278 280 +-448 64 -192 60 35 60 -3268 l0 -3004 -385 0 -385 0 -2 498 -3 497 -2755 0 +-2755 0 -3 -497 -2 -498 -385 0 -385 0 3 3038 c3 3325 -2 3057 58 3234 136 +408 504 714 934 777 33 5 1169 9 2525 10 2096 1 2479 -1 2560 -13z"/> +<path d="M560 5395 l0 -1185 3220 0 3220 0 0 1185 0 1185 -3220 0 -3220 0 0 +-1185z m6370 0 l0 -1105 -3150 0 -3150 0 0 1105 0 1105 3150 0 3150 0 0 -1105z"/> +<path d="M3450 5910 l0 -380 40 0 40 0 0 209 0 210 26 20 c61 48 184 54 244 +11 53 -38 60 -68 60 -270 l0 -180 40 0 40 0 0 188 c0 103 -5 204 -10 224 -13 +45 -52 93 -92 114 -71 37 -193 34 -269 -5 l-39 -21 0 130 0 130 -40 0 -40 0 0 +-380z"/> +<path d="M4360 6186 l0 -105 -42 -3 c-39 -3 -41 -5 -42 -36 -1 -31 0 -32 41 +-32 l41 0 4 -182 c3 -161 5 -188 24 -222 27 -53 73 -76 151 -76 80 0 93 6 93 +41 0 29 -1 29 -59 29 -49 0 -65 4 -88 24 l-28 24 -3 181 -4 181 91 0 91 0 0 +35 0 35 -90 0 -90 0 0 105 0 105 -45 0 -45 0 0 -104z"/> +<path d="M4096 6254 c-19 -18 -21 -55 -4 -72 7 -7 24 -12 38 -12 14 0 31 5 38 +12 28 28 2 88 -38 88 -10 0 -26 -7 -34 -16z"/> +<path d="M2284 6223 c3 -10 64 -169 135 -353 104 -270 133 -336 149 -338 16 +-3 26 14 59 100 22 57 71 183 108 281 38 97 72 174 76 170 3 -5 53 -129 109 +-277 57 -147 110 -270 118 -273 7 -3 17 -2 22 3 10 10 270 680 270 695 0 5 +-19 9 -43 9 l-43 0 -99 -269 c-55 -149 -103 -267 -107 -263 -5 6 -73 179 -205 +520 -3 7 -15 12 -27 10 -17 -2 -38 -48 -127 -273 -94 -237 -108 -267 -117 +-245 -5 14 -41 111 -80 215 -38 105 -80 216 -92 248 l-21 57 -45 0 c-39 0 -45 +-3 -40 -17z"/> +<path d="M4915 6081 c-257 -45 -308 -408 -73 -525 89 -44 219 -35 302 22 58 +40 65 56 35 81 -23 19 -24 19 -44 1 -33 -31 -107 -60 -155 -60 -85 0 -168 58 +-195 136 l-13 39 229 3 229 2 0 33 c0 51 -27 129 -60 175 -51 71 -158 110 +-255 93z m151 -92 c36 -22 69 -75 75 -119 l4 -25 -182 -3 c-182 -2 -183 -2 +-183 19 0 44 47 106 102 134 63 31 127 29 184 -6z"/> +<path d="M4090 5805 l0 -275 40 0 40 0 0 275 0 275 -40 0 -40 0 0 -275z"/> +<path d="M3032 4900 c13 -177 160 -338 384 -419 273 -99 592 -68 816 78 89 58 +151 126 190 207 31 67 53 193 33 200 -6 3 -76 3 -155 2 l-144 -3 -8 -45 c-14 +-88 -115 -148 -298 -177 -80 -13 -110 -14 -188 -4 -199 26 -305 89 -321 189 +l-6 37 -154 3 -154 3 5 -71z"/> +<path d="M560 2740 l0 -1180 3220 0 3220 0 0 1180 0 1180 -3220 0 -3220 0 0 +-1180z m6365 0 l0 -1105 -3145 0 -3145 0 -3 1095 c-1 602 0 1101 3 1108 3 10 +638 12 3147 10 l3143 -3 0 -1105z"/> +<path d="M3200 3205 l0 -375 45 0 c38 0 45 3 45 20 0 25 1 25 53 -2 61 -32 +194 -32 253 -1 105 56 158 141 158 253 0 150 -108 266 -259 277 -56 5 -107 -7 +-187 -42 -17 -7 -18 3 -18 119 l0 126 -45 0 -44 0 -1 -375z m358 76 c72 -37 +112 -104 112 -187 0 -162 -184 -250 -341 -162 l-39 22 0 147 0 147 52 26 c66 +33 160 36 216 7z"/> +<path d="M5420 3475 l0 -105 -45 0 c-45 0 -45 0 -45 -35 0 -35 0 -35 45 -35 +l45 0 0 -162 c1 -197 8 -233 54 -275 40 -37 85 -48 161 -38 54 6 55 7 55 40 0 +33 -1 34 -34 28 -60 -10 -105 5 -126 40 -18 28 -20 51 -20 200 l0 167 90 0 90 +0 0 35 0 35 -90 0 -90 0 0 105 0 105 -45 0 -45 0 0 -105z"/> +<path d="M3882 3548 c-28 -28 -2 -88 38 -88 40 0 66 60 38 88 -7 7 -24 12 -38 +12 -14 0 -31 -5 -38 -12z"/> +<path d="M2019 3526 c-99 -27 -201 -112 -242 -204 -31 -72 -35 -191 -7 -264 +30 -80 104 -159 188 -200 61 -30 74 -33 162 -33 81 0 103 4 151 27 31 14 75 +43 98 63 l42 38 -33 27 -33 28 -44 -39 c-106 -94 -279 -88 -380 12 -136 136 +-95 371 79 453 68 31 179 29 245 -6 28 -14 61 -38 74 -52 l24 -25 35 27 35 26 +-44 39 c-53 47 -88 66 -154 83 -61 17 -135 17 -196 0z"/> +<path d="M2710 3371 c-53 -17 -109 -51 -135 -83 -120 -141 -80 -356 82 -438 +70 -36 187 -36 261 1 l52 26 0 -24 c0 -20 5 -23 40 -23 l40 0 0 270 0 270 -40 +0 c-36 0 -40 -3 -40 -25 l0 -24 -52 26 c-55 28 -160 40 -208 24z m183 -85 c75 +-27 77 -32 77 -191 l0 -141 -40 -23 c-158 -89 -343 2 -343 168 0 82 41 148 +116 185 39 19 138 20 190 2z"/> +<path d="M4290 3363 c-25 -8 -52 -21 -61 -29 -22 -20 -29 -17 -29 11 0 23 -4 +25 -40 25 l-40 0 0 -270 0 -270 40 0 40 0 0 203 c0 183 2 206 18 220 54 49 +174 64 239 30 66 -35 77 -72 81 -275 l4 -178 40 0 40 0 -4 198 c-3 188 -4 199 +-28 242 -54 96 -180 135 -300 93z"/> +<path d="M4912 3362 c-187 -67 -243 -320 -101 -461 97 -97 269 -107 387 -21 +48 35 52 51 17 74 -24 16 -27 16 -63 -13 -114 -91 -293 -38 -332 98 l-9 31 +231 0 231 0 -6 54 c-7 65 -38 140 -75 179 -66 70 -182 94 -280 59z m205 -88 +c26 -21 43 -47 55 -80 l16 -49 -180 -3 c-100 -1 -183 0 -186 2 -8 9 7 51 30 +87 55 82 189 104 265 43z"/> +<path d="M3880 3100 l0 -270 40 0 40 0 0 270 0 270 -40 0 -40 0 0 -270z"/> +<path d="M3064 2288 c3 -13 8 -47 11 -77 16 -138 146 -290 315 -368 320 -147 +753 -89 969 130 86 87 121 160 136 285 l6 53 -158 -3 -158 -3 -6 -43 c-14 +-108 -176 -185 -394 -186 -131 -1 -229 21 -306 67 -63 38 -90 72 -98 124 l-6 +38 -158 3 -158 3 5 -23z"/> +</g> +</svg> diff --git a/exampleSite/static/img/favicon/site.webmanifest b/exampleSite/static/img/favicon/site.webmanifest new file mode 100644 index 0000000000000000000000000000000000000000..b20abb7cbb2903c45280ba3540710669aeb63163 --- /dev/null +++ b/exampleSite/static/img/favicon/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/exampleSite/static/img/landscape.JPG b/exampleSite/static/img/landscape.JPG new file mode 100755 index 0000000000000000000000000000000000000000..60a8f9b7fcb799ab4fcdaefab184a99b178373fe Binary files /dev/null and b/exampleSite/static/img/landscape.JPG differ diff --git a/exampleSite/static/img/landscape2.JPG b/exampleSite/static/img/landscape2.JPG new file mode 100755 index 0000000000000000000000000000000000000000..68f8ab7da94972fccf19ac968b38d5e43b6c6fa7 Binary files /dev/null and b/exampleSite/static/img/landscape2.JPG differ diff --git a/example/static/img/list1.jpg b/exampleSite/static/img/list1.jpg similarity index 100% rename from example/static/img/list1.jpg rename to exampleSite/static/img/list1.jpg diff --git a/example/static/img/rabbit2.png b/exampleSite/static/img/rabbit2.png similarity index 100% rename from example/static/img/rabbit2.png rename to exampleSite/static/img/rabbit2.png diff --git a/example/static/img/rabbit4.png b/exampleSite/static/img/rabbit4.png similarity index 100% rename from example/static/img/rabbit4.png rename to exampleSite/static/img/rabbit4.png diff --git a/example/static/img/screenshots/embmap1.png b/exampleSite/static/img/screenshots/embmap1.png similarity index 100% rename from example/static/img/screenshots/embmap1.png rename to exampleSite/static/img/screenshots/embmap1.png diff --git a/example/static/img/screenshots/embmap2.png b/exampleSite/static/img/screenshots/embmap2.png similarity index 100% rename from example/static/img/screenshots/embmap2.png rename to exampleSite/static/img/screenshots/embmap2.png diff --git a/exampleSite/static/img/screenshots/fmbanner_fig.png b/exampleSite/static/img/screenshots/fmbanner_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..c3ec2fab4c5a05433f4beb761e2b4c2279164b03 Binary files /dev/null and b/exampleSite/static/img/screenshots/fmbanner_fig.png differ diff --git a/exampleSite/static/img/screenshots/fmtags_fig.png b/exampleSite/static/img/screenshots/fmtags_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..ac6a16a52f790c87c0c575036537cd7cdaf3a4c6 Binary files /dev/null and b/exampleSite/static/img/screenshots/fmtags_fig.png differ diff --git a/exampleSite/static/img/screenshots/fmtitle_fig.png b/exampleSite/static/img/screenshots/fmtitle_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..59df0695ebcb0d8e597abcdcdbc7d486c9ecb01a Binary files /dev/null and b/exampleSite/static/img/screenshots/fmtitle_fig.png differ diff --git a/exampleSite/static/img/screenshots/footer_fig.png b/exampleSite/static/img/screenshots/footer_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..9a5b465b65a694dcee326cbc0156391b8e5ba9bf Binary files /dev/null and b/exampleSite/static/img/screenshots/footer_fig.png differ diff --git a/exampleSite/static/img/screenshots/infobar_fig.png b/exampleSite/static/img/screenshots/infobar_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..b9c85335257458f91ed4a2c05fac944772e6c495 Binary files /dev/null and b/exampleSite/static/img/screenshots/infobar_fig.png differ diff --git a/exampleSite/static/img/screenshots/links_fig.png b/exampleSite/static/img/screenshots/links_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..5057ae7677899ad69971149082a60b8e2e8f929c Binary files /dev/null and b/exampleSite/static/img/screenshots/links_fig.png differ diff --git a/exampleSite/static/img/screenshots/mainmenu_fig.png b/exampleSite/static/img/screenshots/mainmenu_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..ec36a87e82338ca41da3506f7fddbc1b7eb471b6 Binary files /dev/null and b/exampleSite/static/img/screenshots/mainmenu_fig.png differ diff --git a/exampleSite/static/img/screenshots/post_fig.png b/exampleSite/static/img/screenshots/post_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..4e5fe8989c477eb93a9021f130564fb39fc10048 Binary files /dev/null and b/exampleSite/static/img/screenshots/post_fig.png differ diff --git a/exampleSite/static/img/screenshots/postlist_fig.png b/exampleSite/static/img/screenshots/postlist_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf5df2333f70981356d39e1b3c42adef919ea32 Binary files /dev/null and b/exampleSite/static/img/screenshots/postlist_fig.png differ diff --git a/exampleSite/static/img/screenshots/textlist_fig.png b/exampleSite/static/img/screenshots/textlist_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..9808811a1b9b478cc74a6d310e74357a3ab070c5 Binary files /dev/null and b/exampleSite/static/img/screenshots/textlist_fig.png differ diff --git a/exampleSite/static/img/screenshots/tilelist_fig.png b/exampleSite/static/img/screenshots/tilelist_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..e33cebb10100c9ee7c972c7ed40faff2a8c8fc7c Binary files /dev/null and b/exampleSite/static/img/screenshots/tilelist_fig.png differ diff --git a/exampleSite/static/img/screenshots/topfigures_headermenu_fig.png b/exampleSite/static/img/screenshots/topfigures_headermenu_fig.png new file mode 100644 index 0000000000000000000000000000000000000000..eab7b8883394fca57c4af53bad49dd252a062842 Binary files /dev/null and b/exampleSite/static/img/screenshots/topfigures_headermenu_fig.png differ diff --git a/exampleSite/static/img/thumbnail.png b/exampleSite/static/img/thumbnail.png new file mode 100755 index 0000000000000000000000000000000000000000..2febd3476ea3601a292ec76388ad0358035ed2c5 Binary files /dev/null and b/exampleSite/static/img/thumbnail.png differ diff --git a/exampleSite/static/img/topfigure1.jpg b/exampleSite/static/img/topfigure1.jpg new file mode 100755 index 0000000000000000000000000000000000000000..8757f74fccd70a5dd66863129da86df3656fcfb0 Binary files /dev/null and b/exampleSite/static/img/topfigure1.jpg differ diff --git a/exampleSite/static/img/topfigure2.jpg b/exampleSite/static/img/topfigure2.jpg new file mode 100755 index 0000000000000000000000000000000000000000..a53e41e080c21935dbc60af185985438f0e8c49b Binary files /dev/null and b/exampleSite/static/img/topfigure2.jpg differ diff --git a/exampleSite/static/img/topfigure3.jpg b/exampleSite/static/img/topfigure3.jpg new file mode 100755 index 0000000000000000000000000000000000000000..b346a41bdb5188eea4a69480e0daa9dfff9e5dd5 Binary files /dev/null and b/exampleSite/static/img/topfigure3.jpg differ diff --git a/exampleSite/static/img/topfigure4.jpg b/exampleSite/static/img/topfigure4.jpg new file mode 100755 index 0000000000000000000000000000000000000000..fee5523742f24de572874d61e33967337d1f511b Binary files /dev/null and b/exampleSite/static/img/topfigure4.jpg differ diff --git a/exampleSite/static/img/topfigure5.jpg b/exampleSite/static/img/topfigure5.jpg new file mode 100755 index 0000000000000000000000000000000000000000..fe1994a198b87de4000fb7e05455b21c56db1749 Binary files /dev/null and b/exampleSite/static/img/topfigure5.jpg differ diff --git a/exampleSite/static/img/white_cabinet_components.png b/exampleSite/static/img/white_cabinet_components.png new file mode 100755 index 0000000000000000000000000000000000000000..3649fff1d1bea0f43dd5347028b3ef606c199e02 Binary files /dev/null and b/exampleSite/static/img/white_cabinet_components.png differ diff --git a/exampleSite/static/img/white_cabinet_logo.png b/exampleSite/static/img/white_cabinet_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d8120d446575dcf58e091b0e41e0566326bfb6a4 Binary files /dev/null and b/exampleSite/static/img/white_cabinet_logo.png differ diff --git a/example/themes b/exampleSite/themes similarity index 100% rename from example/themes rename to exampleSite/themes diff --git a/images/screenshot.png b/images/screenshot.png new file mode 100755 index 0000000000000000000000000000000000000000..7df7ac5d1bd2c030c9e5e9e4e1ddb7e6e6a55380 Binary files /dev/null and b/images/screenshot.png differ diff --git a/images/tn.png b/images/tn.png new file mode 100644 index 0000000000000000000000000000000000000000..919563db55f28da42b12f2823bdb9b5c0d3a6018 Binary files /dev/null and b/images/tn.png differ diff --git a/layouts/_default/single.html b/layouts/_default/single.html index c8be37d6ce41aa6f92edd5c807dfcd335460ebda..b6e8b7beae31fe44809c08d3839cc78c6d02d06e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -8,18 +8,19 @@ {{ partial "breadcrumb.html" . }} <div class="single-title">{{ .Title }}</div> {{ $tag_color := .Site.Params.categories_colors }} + <div class="single-date-tags"> + <p> Posted on {{ dateFormat "2 Jan, 2006" .Date }} </p> {{ if .Params.tags }} {{ $numtags := len .Params.tags }} {{ $first_tag := index .Params.tags 0 }} {{ if gt $numtags 0 }} {{ if ne $first_tag "" }} {{/* --if-- insert tag box */}} - <div class="single-tags"> {{ range .Params.tags }} {{ $param_tag_name := . }} <a href="{{ $.Site.BaseURL | absURL }}{{ $.Site.BaseURL | relLangURL }}/tags/{{ lower $param_tag_name }}" class="tagbutton {{ $param_tag_name }}">{{ $param_tag_name }}</a> {{ end }} - </div> {{ end }} {{ end }} {{/* --end-- insert tag box */}} {{ end }} + </div> <article class="content"> {{ .Content }} </article> diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 295faf84dd60f849e9866f03d1c7d81e87c4fc81..b82faaca68c8088bbd5215cafeb73536e42b8961 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -65,10 +65,12 @@ } .sitemap-narrow ul { + text-align: left; margin-top: -5px; + margin-left: 41vw; list-style:none; position:relative; - left:45%; + padding-left: 0px; } .sitemap-narrow li { @@ -76,6 +78,15 @@ margin-top: 3px; } + .sitemap-narrow li ul { + text-align: left; + margin-left: 1.0em; + } + + .sitemap-narrow li ul li:before { + content: "- "; + } + .address-narrow { text-align: center; font-size: 11px; @@ -106,6 +117,12 @@ display: grid; grid-template-columns: calc( (100% - 1em) / 2) calc( (100% -1em_) / 2); } + + .item_sitemap-narrow { + display: grid; + grid-template-columns: none; + } + .item_address { display: grid; padding: 0px; diff --git a/layouts/partials/header.html b/layouts/partials/header.html index ff90b79802af423de17f2c42aa51b50c75ec20f1..e3830fa31bd17ba8bde60f758a343212cdc58385 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -6,11 +6,19 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>{{ if not .IsHome }}{{ .Title }}�悳{ end }}{{ .Site.Title }}</title> + <!-- favicon settings --> + <link rel="icon" href="{{ .Site.BaseURL }}{{ .Site.Params.faviconDir }}/favicon.ico" /> + <link rel="apple-touch-icon" sizes="180x180" href="{{ .Site.BaseURL }}{{ .Site.Params.faviconDir }}/apple-touch-icon.png"> + <link rel="icon" type="image/png" sizes="32x32" href="{{ .Site.BaseURL }}{{ .Site.Params.faviconDir }}/favicon-32x32.png"> + <link rel="icon" type="image/png" sizes="16x16" href="{{ .Site.BaseURL }}{{ .Site.Params.faviconDir }}/favicon-16x16.png"> + <link rel="manifest" href="{{ .Site.BaseURL }}{{ .Site.Params.faviconDir }}/site.webmanifest"> + <meta name="msapplication-TileColor" content="#da532c"> + <meta name="theme-color" content="#ffffff"> + <!-- end favicon settings --> <link rel="stylesheet" href="{{ .Site.BaseURL }}css/header.css"> <link rel="stylesheet" href="{{ .Site.BaseURL }}css/main.css"> <link rel="stylesheet" href="{{ .Site.BaseURL }}css/syntax.css"> <link rel="stylesheet" href="{{ .Site.BaseURL }}css/postcard.css"> - <link rel="stylesheet" href="{{ .Site.BaseURL }}css/category_tag.css"> <link rel="stylesheet" href="{{ $.Site.BaseURL }}css/all.min.css"> <script src="{{ .Site.BaseURL }}js/jquery-3.4.1.min.js"></script> diff --git a/layouts/partials/main_menu.html b/layouts/partials/main_menu.html index b4f6ed2bd2fd8fedf22514bb17c48b78d9689598..60f9ff4119325be54ebd079469b6587889a43720 100644 --- a/layouts/partials/main_menu.html +++ b/layouts/partials/main_menu.html @@ -21,15 +21,19 @@ {{ if (eq $defaultOpen "open") }} <button class="button active">{{ $menuName }}</button> <div class="nest"> - {{ with ($.Site.GetPage $listfile) }} - <p>{{ .Content }}</p> - {{ end }} + {{ range $.Site.RegularPages }} + {{ if eq .File.TranslationBaseName $listfile }} + <p>{{ .Content }}</p> + {{ end }} + {{ end }} </div> {{ else }} <button class="button">{{ $menuName }}</button> <div class="nest" style="display: none;"> - {{ with ($.Site.GetPage $listfile) }} - <p>{{ .Content }}</p> + {{ range $.Site.RegularPages }} + {{ if eq .File.TranslationBaseName $listfile }} + <p>{{ .Content }}</p> + {{ end }} {{ end }} </div> {{ end }} diff --git a/layouts/partials/postcard.html b/layouts/partials/postcard.html index 39cc8f0a43d811f0b7c82ff19e2a02d64409490b..34394fbc1a40f32b39e5930c1441813559274ff9 100644 --- a/layouts/partials/postcard.html +++ b/layouts/partials/postcard.html @@ -1,50 +1,36 @@ - - {{ if eq .card_type "upcoming" }} {{ with .context }} {{ $tag_color := .Site.Params.categories_colors }} <div class="postcard"> {{ if ne (.Params.eventStartDate) (.Params.eventEndDate) }} - <div class="eventdate"> {{ dateFormat "2 Jan, 2006" .Params.eventStartDate }} - {{ dateFormat "2 Jan, 2006" .Params.eventEndDate }} - {{ if .Params.tags }} - {{ $numtags := len .Params.tags }} - {{ $first_tag := index .Params.tags 0 }} - {{ if gt $numtags 0 }} {{ if ne $first_tag "" }} {{/* --if-- insert tag box */}} - <div class="tags"> - {{ range .Params.tags }} - {{ $param_tag_name := . }} - <a href="{{ $.Site.BaseURL | absLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton {{ $param_tag_name }}">{{ $param_tag_name }}</a> - {{ end }} - </div> - {{ end }} {{ end }} {{/* --end-- insert tag box */}} - {{ end }} </div> - {{ else }} {{/* if eventStartDate == eventEndDate */}} - <div class="eventdate"> {{ dateFormat "2 Jan, 2006" .Params.eventEndDate }} - {{ if .Params.tags }} - {{ $numtags := len .Params.tags }} - {{ $first_tag := index .Params.tags 0 }} - {{ if gt $numtags 0 }} {{ if ne $first_tag "" }} - <div class="tags"> {{/* --if-- insert tag box */}} - {{ range .Params.tags }} - {{ $param_tag_name := . }} - <a href="{{ $.Site.BaseURL | relLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton {{ $param_tag_name }}">{{ $param_tag_name }}</a> - {{ end }} {{/* --end-- insert tag box */}} - </div> - {{ end }} {{ end }} - {{ end }} </div> - {{ end }} <h2 class="post-title">{{ .Title }}</h2> + {{ if .Params.tags }} + {{ $numtags := len .Params.tags }} + {{ $first_tag := index .Params.tags 0 }} + {{ if gt $numtags 0 }} {{ if ne $first_tag "" }} + <div class="tags"> {{/* --if-- insert tag box */}} {{ range .Params.tags }} + {{ $param_tag_name := . }} + <a href="{{ $.Site.BaseURL | relLangURL }}tags/{{ lower $param_tag_name }}/" class="tagbutton {{ $param_tag_name }}">{{ $param_tag_name }}</a> + {{ end }} {{/* --end-- insert tag box */}} + </div> + {{ end }} {{ end }} + {{ end }} + <div class="postcard-content"> <p>{{ .Content }}</p> + </div> + <div class="date"> + Posted on {{ dateFormat "2 Jan, 2006" .Date }} + </div> <p><a href="{{ .Permalink }}" class="read-more">Read more...</a></p> </div> @@ -55,8 +41,7 @@ {{ with .context }} {{ $tag_color := .Site.Params.categories_colors }} <div class="postcard"> - <div class="eventdate"> - {{ dateFormat "2 Jan, 2006" .Date }} + <h2 class="post-title">{{ .Title }}</h2> {{ if .Params.tags }} {{ $numtags := len .Params.tags }} {{ $first_tag := index .Params.tags 0 }} @@ -69,9 +54,12 @@ </div> {{ end }} {{ end }} {{ end }} - </div> - <h2 class="post-title">{{ .Title }}</h2> + <div class="postcard-content"> <p>{{ .Content }}</p> + </div> + <div class="date"> + Posted on {{ dateFormat "2 Jan, 2006" .Date }} + </div> <p><a href="{{ .Permalink }}" class="read-more">Read more...</a></p> </div> {{ end }} @@ -80,11 +68,13 @@ {{ with .context }} {{ $tag_color := .Site.Params.categories_colors }} <div class="postcard"> - <div class="eventdate"> - {{ dateFormat "2 Jan, 2006" .Date }} - </div> <h2 class="post-title">{{ .Title }}</h2> - <p>{{ .Content }}</p> + <div class="postcard-content"> + <p>{{ .Content }}</p> + </div> + <div class="date"> + Posted on {{ dateFormat "2 Jan, 2006" .Date }} + </div> <p><a href="{{ .Permalink }}" class="read-more">Read more...</a></p> </div> {{ end }} diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 552c5828fdf5d62d4f5c61e059950cf14562c336..1eed8c62252fbc2914e3a9dc189a388c559c5431 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -26,13 +26,13 @@ </div> {{ else if .Params.image }} <div class="topic bannersize" onKeyPress="return true" onClick="link('{{ .Site.BaseURL }}{{ .RelPermalink }}')" style="background-image: url({{ .Site.BaseURL }}{{ .Params.image }});" > - <h1> {{dateFormat "2 Jan, 2006" .Params.date }} </h1><br> - <h2> {{ .Title }} </h2> + <div class="title"> <h2> {{ .Title }} </h2> </div><br> + <div class="date"> Posted on {{dateFormat "2 Jan, 2006" .Params.date }} </div> </div> {{ else }} <div class="topic bannersize" onKeyPress="return true" onClick="link('{{ .Site.BaseURL }}{{ .RelPermalink }}')" style="background-image: url({{ .Site.BaseURL }}{{ .Site.Params.defaultBannerImage }});" > - <h1> {{dateFormat "2 Jan, 2006" .Params.date }} </h1><br> - <h2> {{ .Title }} </h2> + <div class="title"> <h2> {{ .Title }} </h2></div><br> + <div class="date"> Posted on {{dateFormat "2 Jan, 2006" .Params.date }} </div> </div> {{ end }}<!--bannerimg--> {{ end }}<!--StatBanner--> @@ -51,22 +51,22 @@ </div> {{ else if .Params.image }} <div class="topic bannersize" onKeyPress="return true" onClick="link('{{ .Site.BaseURL }}{{ .RelPermalink }}')" style="background-image: url({{ .Site.BaseURL }}{{ .Params.image }});" > - <h1> {{dateFormat "2 Jan, 2006" .Params.date }} </h1><br> - <h2> {{ .Title }} </h2> + <div class="title"> <h2> {{ .Title }} </h2> </div><br> + <div class="date"> Posted on {{dateFormat "2 Jan, 2006" .Params.date }} </div> </div> {{ else }} <div class="topic bannersize" onKeyPress="return true" onClick="link('{{ .Site.BaseURL }}{{ .RelPermalink }}')" style="background-image: url({{ .Site.BaseURL }}{{ .Site.Params.defaultBannerImage }});" > - <h1> {{dateFormat "2 Jan, 2006" .Params.date }} </h1><br> - <h2> {{ .Title }} </h2> + <div class="title"> <h2> {{ .Title }} </h2> </div><br> + <div class="date"> Posted on {{dateFormat "2 Jan, 2006" .Params.date }} </div> </div> {{ end }} <!--bannerimg--> {{ end }} <!--num of banner--> {{ end }}<!--exclude StatBanner--> {{ end }}<!--range ByDate.Reverse--> {{ end }}<!--from post--> + <script src="{{ .Site.BaseURL }}js/topic.js"></script> </div> <!-- topic_list --> - </div> <!-- sidebar --> <div class="links"> diff --git a/layouts/shortcodes/upcoming_posts.html b/layouts/shortcodes/upcoming_posts.html index 7a02f93b75cb2b547852061fa4ecb4f42a9d06c7..990f7911d5ea107575ff7b9bc2fadeaac2079a21 100644 --- a/layouts/shortcodes/upcoming_posts.html +++ b/layouts/shortcodes/upcoming_posts.html @@ -2,13 +2,23 @@ {{- if not $title -}} {{- $title := "Upcoming Events" -}} {{- end -}} -<div class="posts-title" >{{ $title }}</div> + +{{ $upcoming_posts := slice }} {{ range (where (.Site.RegularPages.ByParam "eventEndDate") "Section" "post").ByDate.Reverse }} {{ $FormattedNow := (now.AddDate 0 0 -1) }} {{ if le $FormattedNow .Params.eventEndDate }} - {{ partial "postcard" (dict "context" . "card_type" "upcoming" ) }} + {{ $upcoming_posts = $upcoming_posts | append . }} {{ end }} -<!-- Add alternate content to show when there is no upcoming event --> {{ end }} + +{{ if ge (len $upcoming_posts) 1 }} + <div class="posts-title" >{{ $title }}</div> + +{{- range $upcoming_posts }} + {{ partial "postcard" (dict "context" . "card_type" "upcoming" ) }} +{{- end }} + <br> <br> + +{{ end }} diff --git a/static/css/postcard.css b/static/css/postcard.css index 2dea1790bee4c0698b105379b3316beb281dbac9..bd88a2d2964a425ce5a21ab309446ade8c154853 100644 --- a/static/css/postcard.css +++ b/static/css/postcard.css @@ -82,14 +82,16 @@ } .postcard h2.post-title{ - margin-top : 12px; + margin-top : 0px; color: black; + width: 100%; font-size: 18px; position: relative; display: inline-block; margin-bottom: 1em; } +/* .postcard h2.post-title:before { content: ''; position: absolute; @@ -103,6 +105,21 @@ background-color: #ccc; border-radius: 2px; } +*/ + +.postcard h2.post-title:after { + content: ''; + position: relative; + bottom: -8px; + display: block; + width: 100%; + height: 2px; + left: 50%; + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + background-color: #ccc; + border-radius: 2px; +} .postcard::before { display: block; @@ -111,21 +128,21 @@ left: 0; width: 100%; height: 100px; - background: -webkit-linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,0.8) 50%, rgba(255,255,255,0.8) 60%, rgba(255,254,253,1.0) 100%); - background: linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 50%, rgba(255,255,255,0.9) 60%, rgba(255,254,253,1.0) 100%); + background: -webkit-linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,0.8) 40%, rgba(255,255,255,0.8) 60%, rgba(255,254,253,1.0) 100%); + background: linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 40%, rgba(255,255,255,0.9) 60%, rgba(255,254,253,1.0) 100%); content: ""; } div.tags{ + top: -11px; display: table; border-collapse: separate; border-spacing: 3px 0; - position: absolute; + position: relative; text-align: center; vertical-align: middle; - width: 100%; - height: auto; text-align: left; + width: 100%; } .tags a.tagbutton { @@ -139,6 +156,7 @@ div.tags{ border: solid 1px gray; color: white; transition: .4s; + float: right; } .tags a.tagbutton:hover { @@ -148,35 +166,46 @@ div.tags{ } + .postcard div.eventdate { position: relative; - background-color: #2a2a2a; - padding: 3px 8px 3px 8px; + background-color: #020202; + padding: 5px 10px 5px 10px; + margin: 0px 0px 5px 0px; text-align: center; - font-size: 13px; + font-size: 15px; border-radius: 2px; - width: 180px; + width: 250px; height: auto; - color: #eef; + color: #fff; } -@media screen and (min-width: 720px) { - .postcard div.tags { - left: calc(100% + 3px); - top: 3px; - } +.postcard div.date { + position: absolute; + bottom: 20px; + left: 20px; + background-color: #f2f2f2; + padding: 2px 5px 5px 5px; + text-align: center; + font-size: 10px; + border-radius: 2px; + height: auto; + color: #000; } @media screen and (max-width: 720px) { - .postcard div.eventdate { - margin-bottom: 10px; + .postcard h2.post-title:before { + bottom : 16px; + width : 100%; } + .postcard div.tags { - left: -5px; - top: 31px; + position: relative; + top: -27px; } .postcard h2.post-title { - margin-top: 20px; + margin-bottom: 40px; + font-size: 15px; } .postcard { @@ -184,22 +213,45 @@ div.tags{ width: 90%; } .postcard::before { - background: -webkit-linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 60%, rgba(255,255,255,0.9) 80%, rgba(255,254,253,1.0) 100%); - background: linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 60%, rgba(255,255,255,0.9) 80%, rgba(255,254,253,1.0) 100%); + background: -webkit-linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 40%, rgba(255,255,255,0.9) 60%, rgba(255,254,253,1.0) 100%); + background: linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 40%, rgba(255,255,255,0.9) 60%, rgba(255,254,253,1.0) 100%); content: ""; } - .tags div a.tagbutton { + .tags a.tagbutton { font-size: 5px; border: solid 1px white; } + + .postcard h2.post-title:after { + position: relative; + bottom: -12px; + display: block; + width: 84vw; + height: 2px; + left: 42.5vw; + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + background-color: #ccc; + border-radius: 2px; + } + + div.nest div.postcard h2.post-title:after { + width: 100%; + left: 50%; + } + + .postcard div.postcard-content { + margin-top: -31px; + } + } /* the default tag button */ .postcard .read-more{ position: absolute; bottom: 20px; - box-shadow: 0 0 4px white; + box-shadow: 0 0px 4px white; right: 20px; width: auto; font-size: 12px; @@ -230,7 +282,7 @@ div.tags{ .posts-title { text-align: center; font-size: 18px; - margin-top: 15px; + margin-top: 18px; margin-left: 70px; color: #124; margin-right: 70px; @@ -238,3 +290,4 @@ div.tags{ background: -moz-linear-gradient(top, #fff 0%, #eee 50%, #ddd 51%, #fff 100%); /* firefox */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(50%,#eee), color-stop(51%,#ddd), color-stop(100%,#fff)); /* webkit */ -pie-background:linear-gradient(top, #fff 0%, #eee 50%, #ddd 51%, #fff 100%); +} diff --git a/static/css/sidebar.css b/static/css/sidebar.css index 8e6a718fb2bf8b493f3b8b8dbf9405562ca39424..d3853e898c6be38c687c212bf3ac0c57d5eca09d 100644 --- a/static/css/sidebar.css +++ b/static/css/sidebar.css @@ -14,6 +14,7 @@ border-radius: 4px; /*box-sizing: border-box;*/ + /* box shadow */ box-shadow: 0 0 5px #ccc; -webkit-transition: all 0.2s ease-out; @@ -22,33 +23,41 @@ overflow: hidden; text-overflow: ellipsis; margin: 6px 7px 6px 7px; - background-color:rgba(255,255,255,0.6); + background-color:rgba(255,255,255,0.5); background-blend-mode:lighten; + display:block; + +} + +.topic:hover { + filter:alpha(opacity=50); + -ms-filter: "alpha(opacity=50)"; + -moz-opacity:0.5; + -khtml-opacity: 0.5; + cursor: pointer; + background-color:rgba(180,180,180,0.3); + box-shadow: 0 0 9px #bbb; + color: #333; } + .imgsize{ width: 24vw; height: 18vw; /*border: solid 5px red; */ } + .bannersize{ width: 24vw; - padding-bottom: 25%; + height : 18vw; + /* padding-bottom: 25%;*/ /* border: solid 5px blue;*/ } + .topic img{ width: 100%; height: auto; -} - -.topic:hover { - filter:alpha(opacity=50); - -ms-filter: "alpha(opacity=50)"; - -moz-opacity:0.5; - -khtml-opacity: 0.5; - cursor: pointer; - background-color:rgba(180,180,180,0.3); - box-shadow: 0 0 9px #bbb; + z-index: 1; } .topic a { @@ -60,21 +69,89 @@ font-size: 16px; justify-content: center; text-align: center; - } -.topic h2 { - font-size: 18px; - color: #444; +.topic div.title { + + display: table-cell; + vertical-align: middle; + /* -webkit-align-items: center; align-items: center; -webkit-justify-content: center; justify-content: center; + */ text-align: center; - margin: 10px 20px 10px 10px; + + font-size: 19px; + height: 15vw; + padding-left: 2vw; + padding-right: 2vw; + width: 20vw; + margin:auto; + padding:auto; + z-index: 1; + text-shadow: 2px 2px 8px #fff, + -2px 2px 8px #fff, + 2px -2px 8px #fff, + -2px -2px 8px #fff; } +.topic div.date { + text-align: center; + /* height: 1vw; */ + font-size: 13px; + justify-content: center; + /*margin: 2vw 0 -5vw 0; */ + + position: absolute; + bottom: 4vw; + height: 3vw; + margin: auto; + padding-bottom:3vw; + z-index: 3; + text-shadow: 1px 1px 2px #fff, + -1px 1px 2px #fff, + 1px -1px 2px #fff, + -1px -1px 2px #fff; +} + +@media screen and (min-width: 720px) { + .topic div.date { + position: relative; + } +} +@media screen and (max-width: 1000px) { + .topic div.title { + font-size:12px; + } + .topic div.date { + font-size:9px; + } +} +@media screen and (max-width: 720px) { + .topic div.date { + position:absolute; + font-size: 13px; + color: #555; + justify-content: center; + text-align: center; + position: absolute; + bottom: 7px; + height: 13px; + z-index: 4; + margin-left: 52px; + padding-bottom: 23px; + } + .topic div.title { + font-size:15px; + height: 170px; + width: 215px; + padding-left: 12px; + padding-right: 12px; + } +} .topic_list { width: 100%; @@ -113,8 +190,6 @@ box-shadow: 0 0 11px #ccc; } - - .slick-prev:before { color: #445; opacity: 0.5; diff --git a/static/css/single.css b/static/css/single.css index 57204244ee0166c9b5f76e573f8c9b0e7d8bb906..f475e70c23bd72c8cd0a99088a841a4ac2dfbe69 100644 --- a/static/css/single.css +++ b/static/css/single.css @@ -70,7 +70,7 @@ } -.single-tags { +.single-date-tags { display: table; border-collapse: separate; border-spacing: 3px 3px; @@ -80,7 +80,17 @@ text-align: right; } + +.single-date-tags p { + text-align: left; + float: left; + padding-left: 4vw; + margin: 0; + color: #b0b0b0; +} + a.tagbutton { + float:right; padding: 1px 4px 1px 4px; margin: 1px 7px 1px 5px; font-size: 10px; diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c89192a5d64627e26cbad528f2d048597cc69085 Binary files /dev/null and b/static/favicon.ico differ diff --git a/static/js/container.js b/static/js/container.js index d5887022aef313ef2d7f9523d2e4f6a38157fc5b..0ce4df97dd997169eff7fb17d13a2bd8fbc8f49c 100644 --- a/static/js/container.js +++ b/static/js/container.js @@ -5,6 +5,7 @@ $(function(){ $topicList = document.getElementsByClassName("topic_list")[0], $links = document.getElementsByClassName("links")[0], $sitemap = document.getElementsByClassName("sitemap")[0], + $sitemap_grid = document.getElementsByClassName("item_sitemap")[0], $address = document.getElementsByClassName("address")[0]; wideClass = 'container', @@ -31,6 +32,7 @@ $(function(){ $sidebar.className="sidebar-narrow"; $links.className="links-narrow"; $sitemap.className="sitemap-narrow"; + $sitemap_grid.className="item_sitemap-narrow"; $address.className="address-narrow"; $topicList.className="topic_list-narrow"; //console.log("width changed: narrow"); diff --git a/static/js/topic.js b/static/js/topic.js new file mode 100644 index 0000000000000000000000000000000000000000..65d9ad0c7305ab19bfe02f96bc70abfb302d6137 --- /dev/null +++ b/static/js/topic.js @@ -0,0 +1,29 @@ +var title_select = document.querySelectorAll('div.bannersize > div.title'); + +title_select.forEach(content =>{ + content.textContent = shortenText(content) +}); + +function shortenText(content) { + var string = content.textContent + const max_length = 80; + return ommitLongText(string, max_length); +} + +function ommitLongText(str, n_max) { + var n = 0; + var length = 0; + for(i=0; n < n_max && i < str.length; i++) { + if (str[i].match(/[ -~]/) ) { + n += 1; + } else { + n += 2; + } + length += 1; + } + if (length < str.length) { + return str.substr(0, length) + '...'; + } else { + return str + } +} diff --git a/theme.toml b/theme.toml index e2b7f73596127e134f982bebca5804673355b316..26e9234537f1830b6952c5a1f58790c98ee02902 100644 --- a/theme.toml +++ b/theme.toml @@ -3,12 +3,12 @@ name = "White Cabinet" license = "BSD 3-clause" -licenselink = "https://github.com/cns-netadmin/white-cabinet/master/LICENSE" +licenselink = "https://github.com/cns-netadmin/white-cabinet/blob/master/LICENSE" description = "Hugo theme adaptable to any content, from an institute website to a personal blog." homepage = "https://www.cns.s.u-tokyo.ac.jp/white_cabinet/" tags = ["blog","responsive","multilingual","mobile","white","business","Google analytics","Customizable"] features = ["responsive","multilingual","mobile","Google analytics"] -min_version = "0.61" +min_version = "0.61.0" [author] name = "CNS, the Univ. of Tokyo"