diff options
author | imzeuk <imzeuk@gmail.com> | 2019-04-13 17:05:30 +0300 |
---|---|---|
committer | imzeuk <imzeuk@gmail.com> | 2019-04-13 17:05:30 +0300 |
commit | 2e8f8b195073717462708d17ac02201a2907f43c (patch) | |
tree | 375900948aa45063df119474f55cf384c32a84b9 | |
parent | b092d740e6a9ca4d372df3575dc83fdbff44fad1 (diff) |
modify any
-rw-r--r-- | exampleSite/config.toml | 3 | ||||
-rw-r--r-- | exampleSite/content/posts/theme-preview.md | 150 | ||||
-rw-r--r-- | exampleSite/static/1.jpg | bin | 571342 -> 0 bytes | |||
-rw-r--r-- | exampleSite/static/100.jpg | bin | 0 -> 297962 bytes | |||
-rw-r--r-- | layouts/404.html | 2 | ||||
-rw-r--r-- | layouts/_default/list.html | 2 | ||||
-rw-r--r-- | layouts/_default/single.html | 4 | ||||
-rw-r--r-- | layouts/_default/terms.html | 2 | ||||
-rw-r--r-- | layouts/partials/comments.html | 2 | ||||
-rw-r--r-- | layouts/partials/footer.html | 2 | ||||
-rw-r--r-- | layouts/partials/head.html | 21 | ||||
-rw-r--r-- | layouts/partials/header.html | 6 | ||||
-rw-r--r-- | layouts/partials/js.html | 10 | ||||
-rw-r--r-- | layouts/partials/post.html | 4 | ||||
-rw-r--r-- | layouts/shortcodes/img.html | 2 | ||||
-rw-r--r-- | static/css/zozo.css | 3 | ||||
-rw-r--r-- | static/css/zozo.scss | 4 |
17 files changed, 181 insertions, 36 deletions
diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 1dfa23d..3e78b7d 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -1,11 +1,12 @@ baseURL = "http://localhost:1313/" languageCode = "zh-cn" defaultContentLanguage = "zh-cn" -title = "ZoZo" # 网站标题 +title = "无尽光芒" # 网站标题 theme = "zozo" hasCJKLanguage = true # has chinese/japanese/korean ? # 自动检测是否包含 中文\日文\韩文 summaryLength = 100 paginate = 4 # 首页显示文章数量 +enableEmoji = true [author] # essential # 必需 name = "Zeuk" diff --git a/exampleSite/content/posts/theme-preview.md b/exampleSite/content/posts/theme-preview.md new file mode 100644 index 0000000..2acb54d --- /dev/null +++ b/exampleSite/content/posts/theme-preview.md @@ -0,0 +1,150 @@ +--- +title: "Theme Preview" +date: 2019-04-13T17:49:40+08:00 +hidden: false +draft: false +tags: ["theme"] +keywords: [] +description: "" +slug: "Theme Preview" +--- + +# Headings + +```markdown +# H1 +## H2 +### H3 +#### H4 +##### H5 +###### H6 +``` + +# H1 + +## H2 + +### H3 + +#### H4 + +##### H5 + +###### H6 + +# Paragraphs + +```markdown +This is a paragraph. +I am still part of the paragraph. + +New paragraph. +``` + +This is a paragraph. +I am still part of the paragraph. + +New paragraph. + +# Image + +```markdown +Web Image + +![Web Image](https://i.loli.net/2019/04/13/5cb1d33cf0ee6.jpg) + +Local Image + +![Local Image](100.jpg) + +``` + +Web Image + +![Web Image](https://i.loli.net/2019/04/13/5cb1d33cf0ee6.jpg) + +Local Image + +![Local Image](/100.jpg) + + +# Block Quotes + +```markdown +> This is a block quote +``` + +> This is a block quote + +# Code Blocks + +``````markdown +```javascript +// Fenced **with** highlighting +function doIt() { + for (var i = 1; i <= slen ; i^^) { + setTimeout("document.z.textdisplay.value = newMake()", i*300); + setTimeout("window.status = newMake()", i*300); + } +} +``` +`````` + +```javascript +function doIt() { + for (var i = 1; i <= slen ; i^^) { + setTimeout("document.z.textdisplay.value = newMake()", i*300); + setTimeout("window.status = newMake()", i*300); + } +} +``` + +# Tables + +```markdown +| Colors | Fruits | Vegetable | +| ------------- |:---------------:| -----------------:| +| Red | *Apple* | [Pepper](#Tables) | +| ~~Orange~~ | Oranges | **Carrot** | +| Green | ~~***Pears***~~ | Spinach | +``` + +| Colors | Fruits | Vegetable | +| ------------- |:---------------:| -----------------:| +| Red | *Apple* | [Pepper](#Tables) | +| ~~Orange~~ | Oranges | **Carrot** | +| Green | ~~***Pears***~~ | Spinach | + +# List Types + +#### Ordered List + +```markdown +1. First item +2. Second item +3. Third item +``` + +1. First item +2. Second item +3. Third item + +#### Unordered List + +```markdown +- First item +- Second item +- Third item +``` + +- First item +- Second item +- Third item + +# Emoji + +This is a test for emoji. +:smile: +:see_no_evil: +:smile_cat: +:watermelon:
\ No newline at end of file diff --git a/exampleSite/static/1.jpg b/exampleSite/static/1.jpg Binary files differdeleted file mode 100644 index e583acd..0000000 --- a/exampleSite/static/1.jpg +++ /dev/null diff --git a/exampleSite/static/100.jpg b/exampleSite/static/100.jpg Binary files differnew file mode 100644 index 0000000..6218139 --- /dev/null +++ b/exampleSite/static/100.jpg diff --git a/layouts/404.html b/layouts/404.html index cacc747..49a0a00 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -6,7 +6,7 @@ <div class="page_tags"> <h1>(≥o≤)</h1> <h2>{{ with .Site.Params.title404 }}{{ . }}{{ else }}404 Page Not Found{{ end }}</h2> - <h3><a href="{{ $.Site.BaseURL }}">首页</a></h3> + <h3><a href="{{ "/" | relURL }}">首页</a></h3> </div> <div class="pagination"></div> </div> diff --git a/layouts/_default/list.html b/layouts/_default/list.html index cbae4bb..7a3b8f6 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -10,7 +10,7 @@ {{ range .Pages }} <div class="listing_item"> <div class="listing_post"> - <a href="{{ .Permalink }}">{{ .Title }}</a> + <a href="{{ .RelPermalink }}">{{ .Title }}</a> <div class="post_time"><span class="date">{{ .Date.Format "01-02" }}</span></div> </div> </div> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index e981d71..e4623b6 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,7 +6,7 @@ <div class="post_page"> <div class="post animated fadeInDown"> <div class="post_title post_detail_title"> - <h2><a href='{{ .Permalink }}'>{{ .Title }}</a></h2> + <h2><a href='{{ .RelPermalink }}'>{{ .Title }}</a></h2> <span class="date">{{ .Date.Format "2006.01.02" }}</span> </div> <div class="post_content markdown">{{ .Content }}</div> @@ -17,7 +17,7 @@ <span class="field tags"> <i class="remixicon-stack-line"></i> {{ range . }} - <a href="{{ $.Site.BaseURL }}tags/{{ . | urlize }}/">{{ . }}</a> + <a href="{{ "tags" | relURL }}/{{ . | urlize }}/">{{ . }}</a> {{ end }} </span> </div> diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 03341e6..3496fae 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -9,7 +9,7 @@ {{ range $key, $value := .Data.Terms.ByCount }} {{ if ($value.Name) }} <li> - <a href="{{ $.Site.BaseURL }}{{ $data.Plural }}/{{ $value.Name | urlize }}"> + <a href="{{ $data.Plural | relURL }}/{{ $value.Name | urlize }}"> {{ $value.Name | upper }} <span class="terms_count">{{ $value.Count }}</span> </a> diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index 86c3ad2..247ab6c 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -4,7 +4,7 @@ <div id="vcomments"></div> </div> -<link rel="stylesheet" href="{{ .Site.BaseURL }}css/comments.css"/> +<link rel="stylesheet" href="{{ "/css/comments.css" | relURL }}"/> <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script> <script src='//unpkg.com/valine/dist/Valine.min.js'></script> diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 8804da8..f82731a 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -14,7 +14,7 @@ </div> <div class="powered_by"> - <a href="https://kaigc.com">Designed by Zeuk,</a> + <a href="https://zeuk.me">Designed by Zeuk,</a> <a href="http://www.gohugo.io/">Proudly published with Hugo</a> </div> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index c0507d5..91648af 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -19,28 +19,29 @@ {{ if .Keywords }} {{ $length := len .Keywords | add -1 }} - <meta name="keywords" content="{{ range $index, $element := .Keywords }}{{ $element | safeHTML }}{{if ne $index $length }}, {{ end }}{{ end }}"/> + <meta name="keywords" content="{{ range $index, $element := .Keywords }}{{ $element | safeHTML }}{{ if ne $index $length }}, {{ end }}{{ end }}"/> {{ else if .Site.Params.keywords }} {{ $length := len .Site.Params.keywords | add -1 }} - <meta name="keywords" content="{{ range $index, $element := .Site.Params.keywords }}{{ $element | safeHTML }}{{if ne $index $length }}, {{ end }}{{ end }}"/> + <meta name="keywords" content="{{ range $index, $element := .Site.Params.keywords }}{{ $element | safeHTML }}{{ if ne $index $length }}, {{ end }}{{ end }}"/> {{ end }} <!-- Permalink & RSSlink --> <link rel="canonical" href="{{ .Permalink }}"/> - {{ range .AlternativeOutputFormats -}} + {{ range .AlternativeOutputFormats }} <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | safeURL }}"> - {{ end -}} + {{ end }} <title>{{ if .IsHome }}{{ .Title }}{{ else }}{{ .Title }} · {{ .Site.Title }}{{ end }}</title> - <link rel="shortcut icon" href="{{ .Site.BaseURL }}images/favicon.ico"/> - <link rel="stylesheet" href="{{ .Site.BaseURL }}css/animate.min.css"/> - <link rel="stylesheet" href="{{ .Site.BaseURL }}css/remixicon.css"/> - <link rel="stylesheet" href="{{ .Site.BaseURL }}css/zozo.css"/> - <link rel="stylesheet" href="{{ .Site.BaseURL }}css/highlight.css"/> + <link rel="shortcut icon" href="{{ "/images/favicon.ico" | relURL }}"/> + <link rel="stylesheet" href="{{ "/css/animate.min.css" | relURL }}"/> + <link rel="stylesheet" href="{{ "/css/remixicon.css" | relURL }}"/> + <link rel="stylesheet" href="{{ "/css/zozo.css" |relURL }}"/> + <link rel="stylesheet" href="{{ "/css/highlight.css" | relURL }}"/> + <!-- custom css --> {{ range .Site.Params.customCSS }} - <link rel="stylesheet" href="{{ $.Site.BaseURL }}{{ . }}"/> + <link rel="stylesheet" href="{{ "/css/" | relURL }}{{ . }}"> {{ end }} </head> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 748b27c..2bc3ce8 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -2,9 +2,9 @@ <div class="site_title_container"> <div class="site_title"> <h1> - <a href="{{ .Site.BaseURL }}"> + <a href="{{ "/" | relURL }}"> <span>{{ .Site.Title }}</span> - <img src="{{ .Site.BaseURL }}images/logo.svg"/> + <img src="{{ "/images/logo.svg" | relURL }}"/> </a> </h1> </div> @@ -12,7 +12,7 @@ <p class="sub_title">{{ with .Site.Params.subTitle }}{{ . }}{{ else }}{{ end }}</p> <div class="my_socials"> {{ range $key, $val := .Site.Social }} - {{ if ne $val ""}} + {{ if ne $val "" }} <a href="{{ $val }}" title="{{ $key }}" target="_blank"><i class="remixicon-{{ $key }}-fill"></i></a> {{ end }} {{ end }} diff --git a/layouts/partials/js.html b/layouts/partials/js.html index dfc3a15..46225b5 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -1,7 +1,7 @@ -<script src="{{ .Site.BaseURL }}js/jquery-3.3.1.min.js"></script> -<script src="{{ .Site.BaseURL }}js/zozo.js"></script> -<script src="{{ .Site.BaseURL }}js/highlight.pack.js"></script> -<link href="{{ .Site.BaseURL }}css/fancybox.min.css" rel="stylesheet"> -<script src="{{ .Site.BaseURL }}js/fancybox.min.js"></script> +<script src="{{ "/js/jquery-3.3.1.min.js" | relURL }}"></script> +<script src="{{ "/js/zozo.js" | relURL }}"></script> +<script src="{{ "/js/highlight.pack.js" | relURL }}"></script> +<link href="{{ "/css/fancybox.min.css" | relURL }}" rel="stylesheet"> +<script src="{{ "/js/fancybox.min.js" | relURL }}"></script> <script>hljs.initHighlightingOnLoad()</script> diff --git a/layouts/partials/post.html b/layouts/partials/post.html index b8f631f..f6011a9 100644 --- a/layouts/partials/post.html +++ b/layouts/partials/post.html @@ -3,7 +3,7 @@ {{ range $paginator.Pages }} <div class="post animated fadeInDown"> <div class="post_title"> - <h2><a href='{{ .Permalink }}'>{{ .Title }}</a></h2> + <h2><a href='{{ .RelPermalink }}'>{{ .Title }}</a></h2> </div> <div class="list"> <div class="post_content"> @@ -21,7 +21,7 @@ <span class="field tags"> <i class="remixicon-stack-line"></i> {{ range . }} - <a href="{{ $.Site.BaseURL }}tags/{{ . | urlize }}/">{{ . }}</a> + <a href="{{ "tags" | relURL }}/{{ . | urlize }}/">{{ . }}</a> {{ end }} </span> {{ end }} diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html index 28c0918..c575cb9 100644 --- a/layouts/shortcodes/img.html +++ b/layouts/shortcodes/img.html @@ -1,5 +1,5 @@ {{ $path := .Get "src" }} -{{ $caption := .Get "caption"}} +{{ $caption := .Get "caption" }} <div class="fancybox"> <a data-fancybox="gallery" href="{{ $path }}" data-caption="{{ $caption }}"> <img src="{{ $path }}"/> diff --git a/static/css/zozo.css b/static/css/zozo.css index 06f42c2..2ef2e39 100644 --- a/static/css/zozo.css +++ b/static/css/zozo.css @@ -407,9 +407,6 @@ h6 { .markdown h4 { font-size: 1.1em; } -.markdown p { - white-space: pre-line; -} .markdown pre, .markdown code { font-family: "Roboto Mono", Menlo, Monaco, courier, monospace; diff --git a/static/css/zozo.scss b/static/css/zozo.scss index 2693add..a183739 100644 --- a/static/css/zozo.scss +++ b/static/css/zozo.scss @@ -487,10 +487,6 @@ h6 { font-size: 1.1em; } - p { - white-space: pre-line; - } - pre, code { font-family: "Roboto Mono", Menlo, Monaco, courier, monospace; |