diff --git a/README.md b/README.md index 79214f6..b4fdaa1 100644 --- a/README.md +++ b/README.md @@ -132,8 +132,8 @@ title = "Hugo Zzo Theme" theme = "zzo" defaultContentLanguage = "en" -defaultContentLanguageInSubdir = false -hasCJKLanguage = false +defaultContentLanguageInSubdir = true +hasCJKLanguage = true summaryLength = 70 @@ -177,19 +177,19 @@ You shoud make your own menu. identifier = "about" name = "about" url = "about" - weight = 0 + weight = 1 [[main]] identifier = "archive" name = "archive" url = "archive" - weight = 1 + weight = 2 [[main]] identifier = "gallery" name = "gallery" url = "gallery" - weight = 2 + weight = 3 [[main]] parent = "gallery" @@ -205,13 +205,13 @@ You shoud make your own menu. identifier = "posts" name = "posts" url = "posts" - weight = 3 + weight = 4 [[main]] identifier = "notes" name = "notes" url = "notes" - weight = 4 + weight = 5 ... ``` @@ -219,7 +219,9 @@ You shoud make your own menu. ```bash description = "The Zzo theme for Hugo example site." -custom_css = ["css/foo.css", "css/bar.css"] +custom_css = ["css/custom.css", "css/custom.css"] +custom_js = ["js/custom.js"] +custom_skin = "custom" # body enableToc = true diff --git a/assets/js/zzo.js b/assets/js/zzo.js index 5adc218..21dcd8f 100644 --- a/assets/js/zzo.js +++ b/assets/js/zzo.js @@ -89,6 +89,14 @@ $(document).ready(function() { $('.navbar__menu').addClass('is-active'); } }); + $('.navbar__menu-item').each(function() { + var menu = $(this).text().trim().toLowerCase(); + if (location.pathname.includes(menu)) { + $(this).addClass('active'); + } else { + $(this).removeClass('active'); + } + }); // truncate $('.summary__text').shave(160); diff --git a/assets/sass/layout/_navigation.scss b/assets/sass/layout/_navigation.scss index 8e8ce6d..a17c66c 100644 --- a/assets/sass/layout/_navigation.scss +++ b/assets/sass/layout/_navigation.scss @@ -147,11 +147,15 @@ @include align-items(center); @include justify-content(center); @include themify($themes) { - color: themed('navbar-title-color'); + color: themed('navbar-title-color'); @include on-event { color: themed('navbar-title-hover-color'); background-color: themed('navbar-menu-hover-background-color'); text-decoration: none; + border-bottom: 1px solid themed('navbar-border-bottom-color'); + } + &.active { + color: themed('navbar-title-active-color') !important; } } diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 5db91fb..110aefd 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -24,14 +24,10 @@ $navbar_border_bottom_color: {{ $scr.Get "navbar_border_bottom_color" }}; $navbar_background_color: {{ $scr.Get "navbar_background_color" }}; $navbar_title_color: {{ $scr.Get "navbar_title_color" }}; $navbar_title_hover_color: {{ $scr.Get "navbar_title_hover_color" }}; +$navbar_title_active_color: {{ $scr.Get "navbar_title_active_color" }}; $navbar_menu_hover_background_color: {{ $scr.Get "navbar_menu_hover_background_color" }}; $navbar_dropdown_item_hover_color: {{ $scr.Get "navbar_dropdown_item_hover_color" }}; $navbar_dropdown_item_hover_background_color: {{ $scr.Get "navbar_dropdown_item_hover_background_color" }}; -$input_color: {{ $scr.Get "input_color" }}; -$input_background_color: {{ $scr.Get "input_background_color" }}; -$input_border_color: {{ $scr.Get "input_border_color" }}; -$input_hover_border_color: {{ $scr.Get "input_hover_border_color" }}; -$input_focus_border_color: {{ $scr.Get "input_focus_border_color" }}; $sidebar_title_color: {{ $scr.Get "sidebar_title_color" }}; $sidebar_li_color: {{ $scr.Get "sidebar_li_color" }}; $taxo_title_color: {{ $scr.Get "taxo_title_color" }}; @@ -39,6 +35,7 @@ $taxo_tags_background_color: {{ $scr.Get "taxo_tags_background_color" }}; $taxo_tags_color: {{ $scr.Get "taxo_tags_color" }}; $taxo_series_background_color: {{ $scr.Get "taxo_series_background_color" }}; $taxo_series_color: {{ $scr.Get "taxo_series_color" }}; +$taxo_background_color_hover: {{ $scr.Get "taxo_background_color_hover" }}; $taxo_categories_background_color: {{ $scr.Get "taxo_categories_background_color" }}; $taxo_categories_color: {{ $scr.Get "taxo_categories_color" }}; $breadcrumb_item_color: {{ $scr.Get "breadcrumb_item_color" }}; @@ -132,5 +129,6 @@ $archive_hover_line_color: {{ $scr.Get "archive_hover_line_color" }}; @import 'pages/list'; @import 'pages/terms'; @import 'pages/archive'; +@import 'pages/404'; @import 'prism/prism'; \ No newline at end of file diff --git a/assets/sass/pages/_404.scss b/assets/sass/pages/_404.scss new file mode 100644 index 0000000..d72b40e --- /dev/null +++ b/assets/sass/pages/_404.scss @@ -0,0 +1,19 @@ +.not-found { + height: 100%; + font-family: "Montserrat", sans-serif; + + @include flexbox(); + @include align-items(center); + @include justify-content(center); + @include flex-direction(column); + + @include themify($themes) { + .title { + color: themed('title-color'); + } + + .subtitle { + color: themed('meta-color'); + } + } +} \ No newline at end of file diff --git a/assets/sass/prism/_hacker.scss b/assets/sass/prism/_hacker.scss index 9143014..ee52354 100644 --- a/assets/sass/prism/_hacker.scss +++ b/assets/sass/prism/_hacker.scss @@ -1,145 +1,211 @@ -/* Generated with http://k88hudson.github.io/syntax-highlighting-theme-generator/www */ -/* http://k88hudson.github.io/react-markdocs */ -/** - * @author k88hudson - * - * Based on prism.js default theme for JavaScript, CSS and HTML - * Based on dabblet (http://dabblet.com) - * @author Lea Verou - */ -/********************************************************* -* General -*/ -.theme__hacker { - pre[class*="language-"], - code[class*="language-"] { - color: #f3ff6e; - font-size: 13px; - text-shadow: none; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; - direction: ltr; +.theme__hacker { + code[class*="language-"], + pre[class*="language-"] { text-align: left; white-space: pre; word-spacing: normal; word-break: normal; - line-height: 1.5; + word-wrap: normal; + color: #fafafa !important; + background: #2f2f2f; + font-family: Roboto Mono, monospace; + font-size: 1em; + line-height: 1.5em; + -moz-tab-size: 4; -o-tab-size: 4; tab-size: 4; + -webkit-hyphens: none; -moz-hyphens: none; -ms-hyphens: none; hyphens: none; } - pre[class*="language-"]::selection, + + code[class*="language-"]::-moz-selection, + pre[class*="language-"]::-moz-selection, + code[class*="language-"] ::-moz-selection, + pre[class*="language-"] ::-moz-selection { + background: #363636; + } + code[class*="language-"]::selection, - pre[class*="language-"]::mozselection, - code[class*="language-"]::mozselection { - text-shadow: none; - background: #b3d4fc; - } - @media print { - pre[class*="language-"], - code[class*="language-"] { - text-shadow: none; - } - } - pre[class*="language-"] { - padding: 1em; - margin: .5em 0; - overflow: auto; - background: #202420; + pre[class*="language-"]::selection, + code[class*="language-"] ::selection, + pre[class*="language-"] ::selection { + background: #363636; } + :not(pre) > code[class*="language-"] { - padding: .1em .3em; - border-radius: .3em; + white-space: normal; + border-radius: 0.2em; + padding: 0.1em; + } + + pre[class*="language-"] { + overflow: auto; + position: relative; + margin: 0.5em 0; + padding: 1.25em 1em; + } + + .language-css > code, + .language-sass > code, + .language-scss > code { + color: #fd9170; + } + + [class*="language-"] .namespace { + opacity: 0.7; + } + + .token.atrule { color: #1fff2a; - background: #202420; } - /********************************************************* - * Tokens - */ - .namespace { - opacity: .7; + + .token.attr-name { + color: #ffcb6b; } - .token.comment, - .token.prolog, - .token.doctype, + + .token.attr-value { + color: #fff59d; + } + + .token.attribute { + color: #fff59d; + } + + .token.boolean { + color: #1fff2a; + } + + .token.builtin { + color: #ffcb6b; + } + .token.cdata { - color: #93a1a1; + color: #80cbc4; } - .token.punctuation { - color: #e08c48; + + .token.char { + color: #80cbc4; } - .token.property, - .token.tag, - .token.boolean, - .token.number, - .token.constant, - .token.symbol, + + .token.class { + color: #ffcb6b; + } + + .token.class-name { + color: #fafafa; + } + + .token.comment { + color: #616161; + } + + .token.constant { + color: #1fff2a; + } + .token.deleted { - color: #7b4d94; + color: #ff6666; } - .token.selector, - .token.attr-name, - .token.string, - .token.char, - .token.builtin, - .token.inserted { - color: #3f8a16; + + .token.doctype { + color: #616161; } - .token.operator, - .token.entity, - .token.url, - .language-css .token.string, - .style .token.string { - color: #a67f59; - background: #202420; - } - .token.atrule, - .token.attr-value, - .token.keyword { - color: #8FFFE9; + + .token.entity { + color: #ff6666; } + .token.function { color: #1fff2a; } - .token.regex, - .token.important, - .token.variable { - color: #e08c48; + + .token.hexcode { + color: #fafafa; } - .token.important, - .token.bold { + + .token.id { + color: #1fff2a; font-weight: bold; } - .token.italic { - font-style: italic; + + .token.important { + color: #1fff2a; + font-weight: bold; } - .token.entity { - cursor: help; + + .token.inserted { + color: #80cbc4; } - /********************************************************* - * Line highlighting - */ - pre[data-line] { - position: relative; + + .token.keyword { + color: #ff80ab; } - pre[class*="language-"] > code[class*="language-"] { - position: relative; - z-index: 1; + + .token.number { + color: #b388ff; } - .line-highlight { - position: absolute; - left: 0; - right: 0; - padding: inherit 0; - margin-top: 1em; - background: #202420; - box-shadow: inset 5px 0 0 #f7d87c; - z-index: 0; - pointer-events: none; - line-height: inherit; - white-space: pre; + + .token.operator { + color: #89ddff; + } + + .token.prolog { + color: #616161; + } + + .token.property { + color: #80cbc4; + } + + .token.pseudo-class { + color: #fff59d; + } + + .token.pseudo-element { + color: #fff59d; + } + + .token.punctuation { + color: #b3e9ff; + } + + .token.regex { + color: #fafafa; + } + + .token.selector { + color: #ff6666; + } + + .token.string { + color: #fff59d; + } + + .token.symbol { + color: #1fff2a; + } + + .token.tag { + color: #1fff2a; + } + + .token.unit { + color: #fd9170; + } + + .token.url { + color: #ff6666; + } + + .token.variable { + color: #ff6666; + } + + .token.interpolation { + color: #fafafa; } } \ No newline at end of file diff --git a/assets/sass/themes/_custom.scss b/assets/sass/themes/_custom.scss index 3532506..2376634 100644 --- a/assets/sass/themes/_custom.scss +++ b/assets/sass/themes/_custom.scss @@ -22,14 +22,10 @@ $custom: ( navbar-background-color: $navbar_background_color, navbar-title-color: $navbar_title_color, navbar-title-hover-color: $navbar_title_hover_color, + navbar-title-active-color: $navbar_title_active_color, navbar-menu-hover-background-color: $navbar_menu_hover_background_color, navbar-dropdown-item-hover-color: $navbar_dropdown_item_hover_color, navbar-dropdown-item-hover-background-color: $navbar_dropdown_item_hover_background_color, - input-color: $input_color, - input-background-color: $input_background_color, - input-border-color: $input_border_color, - input-hover-border-color: $input_hover_border_color, - input-focus-border-color: $input_focus_border_color, sidebar-title-color: $sidebar_title_color, sidebar-li-color: $sidebar_li_color, taxo-title-color: $taxo_title_color, @@ -39,6 +35,7 @@ $custom: ( taxo-series-color: $taxo-series-color, taxo-categories-background-color: $taxo-categories-background-color, taxo-categories-color: $taxo-categories-color, + taxo-background-color-hover: $taxo-background-color-hover, breadcrumb-item-color: $breadcrumb-item-color, breadcrumb-background-color: $breadcrumb-background-color, breadcrumb-item-active-color: $breadcrumb-item-active-color, diff --git a/assets/sass/themes/_dark.scss b/assets/sass/themes/_dark.scss index 3a15292..e8c9f55 100644 --- a/assets/sass/themes/_dark.scss +++ b/assets/sass/themes/_dark.scss @@ -22,14 +22,10 @@ $dark: ( navbar-background-color: #403E41, navbar-title-color: #FCFCFA, navbar-title-hover-color: #FFD866, + navbar-title-active-color: #FF6188, navbar-menu-hover-background-color: lighten(#403E41, 5%), navbar-dropdown-item-hover-color: #FFD866, navbar-dropdown-item-hover-background-color: #595B5C, - input-color: #FCFCFA, - input-background-color: #403E41, - input-border-color: #595B5C, - input-hover-border-color: #727072, - input-focus-border-color: #727072, sidebar-title-color: #aed581, sidebar-li-color: #FCFCFA, taxo-title-color: #bdbdbd, @@ -39,6 +35,7 @@ $dark: ( taxo-series-color: #EA9C77, taxo-categories-background-color: #212121, taxo-categories-color: #AB9DF2, + taxo-background-color-hover: darken(#212121, 5%), breadcrumb-item-color: #82aaff, breadcrumb-background-color: #212121, breadcrumb-item-active-color: #bdbdbd, @@ -78,6 +75,7 @@ $dark: ( search-placeholder-color: #727072, search-color: #FCFCFA, search-icon-color: #727072, + search-content-color: inherit, search-background-color: #212121, search-content-background-color: #595B5C, search-hover-background-color: #727072, diff --git a/assets/sass/themes/_hacker.scss b/assets/sass/themes/_hacker.scss index 72c1ee5..7735c0e 100644 --- a/assets/sass/themes/_hacker.scss +++ b/assets/sass/themes/_hacker.scss @@ -25,6 +25,7 @@ $hacker: ( navbar-background-color: #252526, navbar-title-color: #E3CD26, navbar-title-hover-color: $primary-color, + navbar-title-active-color: #f3ff6e, navbar-menu-hover-background-color: lighten(#151715, 20%), navbar-dropdown-item-hover-color: $primary-color, navbar-dropdown-item-hover-background-color: lighten(#151715, 12%), diff --git a/assets/sass/themes/_light.scss b/assets/sass/themes/_light.scss index 7f5c9a4..bb05b51 100644 --- a/assets/sass/themes/_light.scss +++ b/assets/sass/themes/_light.scss @@ -1,12 +1,9 @@ -$primary-color: #607d8b; -$secondary-color: #bdbdbd; - $light: ( footer-background-color: #eeeeee, footer-color: #424242, - link: $primary-color, + link: #607d8b, link-hover: #FF6188, - title-color: $primary-color, + title-color: #607d8b, meta-color: #424242, body-color: #424242, hr-color: #fcfcfa, @@ -24,9 +21,10 @@ $light: ( navbar-border-bottom-color: #e0e0e0, navbar-background-color: #eeeeee, navbar-title-color: #424242, - navbar-title-hover-color: $primary-color, + navbar-title-hover-color: #607d8b, + navbar-title-active-color: #FF6188, navbar-menu-hover-background-color: darken(#eeeeee, 5%), - navbar-dropdown-item-hover-color: $primary-color, + navbar-dropdown-item-hover-color: #607d8b, navbar-dropdown-item-hover-background-color: #bdbdbd, sidebar-title-color: #424242, sidebar-li-color: #424242, @@ -47,10 +45,10 @@ $light: ( single-hr-background-color: #bdbdbd, single-blockquote-border-color: #bdbdbd, single-header-title-color: #424242, - single-contents-title-color: $primary-color, + single-contents-title-color: #607d8b, related-header-title-color: #424242, - related-link-color: $primary-color, - content-pre-main-color: $primary-color, + related-link-color: #607d8b, + content-pre-main-color: #607d8b, content-pre-background-color: #F5F2F0, content-code-color: #212121, content-code-background-color: #F5F2F0, @@ -85,8 +83,8 @@ $light: ( mark-background-color: #FF6188, archive-key-color: #FCFCFA, archive-meta-color: #424242, - archive-type-color: darken($secondary-color, 40%), - archive-key-background-color: $primary-color, - archive-type-background-color: $secondary-color, + archive-type-color: darken(#bdbdbd, 40%), + archive-key-background-color: #607d8b, + archive-type-background-color: #bdbdbd, archive-hover-line-color: #FF6188, ); \ No newline at end of file diff --git a/assets/sass/themes/_solarized.scss b/assets/sass/themes/_solarized.scss index 2ba011a..705e148 100644 --- a/assets/sass/themes/_solarized.scss +++ b/assets/sass/themes/_solarized.scss @@ -25,6 +25,7 @@ $solarized: ( navbar-background-color: #EEE8D5, navbar-title-color: #424242, navbar-title-hover-color: $primary-color, + navbar-title-active-color: $primary-color, navbar-menu-hover-background-color: darken(#FBF1D1, 5%), navbar-dropdown-item-hover-color: $primary-color, navbar-dropdown-item-hover-background-color: #bdbdbd, diff --git a/data/_config/_default/config.toml b/data/_config/_default/config.toml new file mode 100644 index 0000000..3f267ae --- /dev/null +++ b/data/_config/_default/config.toml @@ -0,0 +1,24 @@ +baseURL = "http://example.org/" +title = "Hugo Zzo Theme" +theme = "zzo" + +defaultContentLanguage = "en" +defaultContentLanguageInSubdir = true +hasCJKLanguage = true + +summaryLength = 70 + +googleAnalytics = "" +copyright = "©yourcopyright" +timeout = 10000 +enableEmoji = true +paginate = 7 +rssLimit = 100 + +[outputs] + home = [ "HTML", "RSS", "JSON" ] + +[taxonomies] + category = "categories" + tag = "tags" + series = "series" \ No newline at end of file diff --git a/data/_config/_default/languages.toml b/data/_config/_default/languages.toml new file mode 100644 index 0000000..b49847d --- /dev/null +++ b/data/_config/_default/languages.toml @@ -0,0 +1,9 @@ +[en] + title = "Hugo Zzo Theme" + languageName = "English" + weight = 1 + +[ko] + title = "Hugo Zzo Theme" + languageName = "한국어" + weight = 2 \ No newline at end of file diff --git a/data/_config/_default/menus.en.toml b/data/_config/_default/menus.en.toml new file mode 100644 index 0000000..7ac545d --- /dev/null +++ b/data/_config/_default/menus.en.toml @@ -0,0 +1,39 @@ +[[main]] + identifier = "about" + name = "about" + url = "about" + weight = 1 + +[[main]] + identifier = "archive" + name = "archive" + url = "archive" + weight = 2 + +[[main]] + identifier = "gallery" + name = "gallery" + url = "gallery" + weight = 3 + +[[main]] + parent = "gallery" + name = "cartoon" + url = "gallery/cartoon" + +[[main]] + parent = "gallery" + name = "photo" + url = "gallery/photo" + +[[main]] + identifier = "posts" + name = "posts" + url = "posts" + weight = 4 + +[[main]] + identifier = "notes" + name = "notes" + url = "notes" + weight = 5 \ No newline at end of file diff --git a/data/_config/_default/params.toml b/data/_config/_default/params.toml new file mode 100644 index 0000000..0ea014d --- /dev/null +++ b/data/_config/_default/params.toml @@ -0,0 +1,42 @@ +description = "The Zzo theme for Hugo example site." +custom_css = ["css/custom.css", "scss/custom.scss"] +custom_js = ["js/custom.js"] + +# body +enableToc = true +enableBreadcrumb = true +enableCustomScrollbar = true +enablePhotoSwipe = true +enableSearch = true +enableMark = true + +# sidebar +enableSidebarTags = true +enableSidebarSeries = true +enableSidebarCategories = true + +# footer +showPoweredBy = true +showFeedLinks = true +showSocialLinks = true +enableLangChange = true +enableThemeChange = true +themeOptions = ["custom", "dark", "light", "hacker", "solarized"] + +[marketing] + google_analytics = "" + google_tag_manager = "" + +[socialOptions] + facebook = "http://example.org/" + twitter = "http://example.org/" + github = "http://example.org/" + stack-overflow = "" + instagram = "" + google-plus = "" + youtube = "" + medium = "" + tumblr = "" + linkedin = "" + pinterest = "http://example.org/" + stack-exchange = "" \ No newline at end of file diff --git a/data/skin.toml b/data/skin.toml new file mode 100644 index 0000000..772bea4 --- /dev/null +++ b/data/skin.toml @@ -0,0 +1,88 @@ +footer_background_color = "#eeeeee" +footer_color = "#424242" +link = "#607d8b" +link_hover = "#FF6188" +title_color = "#607d8b" +meta_color = "#424242" +body_color = "#424242" +hr_color = "#fcfcfa" +body_background_color = "#fafafa" +backdrop_background_color = "#e0e0e0" +dropdown_border_color = "#bdbdbd" +dropdown_border_top_color = "#e0e0e0" +dropdown_item_active_background_color = "#e0e0e0" +dropdown_title_background_color = "#fafafa" +dropdown_content_background_color = "#fafafa" +dropdown_footer_item_color = "#424242" +dropdown_item_hover_background_color = "#bdbdbd" +dropdown_item_hover_color = "#fcfcfa" +dropdown_item_color = "#424242" +navbar_border_bottom_color = "#e0e0e0" +navbar_background_color = "#eeeeee" +navbar_title_color = "#424242" +navbar_title_hover_color = "#607d8b" +navbar_title_active_color = "#FF6188" +navbar_menu_hover_background_color = "#e1e1e1" +navbar_dropdown_item_hover_color = "#607d8b" +navbar_dropdown_item_hover_background_color = "#bdbdbd" +sidebar_title_color = "#424242" +sidebar_li_color = "#424242" +taxo_title_color = "#424242" +taxo_tags_background_color = "#9e9e9e" +taxo_tags_color = "#eeeeee" +taxo_series_background_color = "#9e9e9e" +taxo_series_color = "#eeeeee" +taxo_categories_background_color = "#9e9e9e" +taxo_categories_color = "#eeeeee" +taxo_background_color_hover = "#919191" +breadcrumb_item_color = "#424242" +breadcrumb_background_color = "#eeeeee" +breadcrumb_item_active_color = "#bdbdbd" +list_header_title_color = "#424242" +figcaption_color = "#bdbdbd" +figcaption_strong_color = "#424242" +single_hr_background_color = "#bdbdbd" +single_blockquote_border_color = "#bdbdbd" +single_header_title_color = "#424242" +single_contents_title_color = "#607d8b" +related_header_title_color = "#424242" +related_link_color = "#607d8b" +content_pre_main_color = "#607d8b" +content_pre_background_color = "#F5F2F0" +content_code_color = "#212121" +content_code_background_color = "#F5F2F0" +burger_menu_color = "#9e9e9e" +social_icon_color = "#9e9e9e" +social_icon_hover_color = "#6b6b6b" +pagination_link_color = "#424242" +pagination_background_color = "#eeeeee" +pagination_disabled_color = "#bdbdbd" +pagination_number_color = "#757575" +photoswipe_hover_color = "#fcfcfa" +photoswipe_color = "#fcfcfa" +photoswipe_hover_background_color = "#727072" +photoswipe_background_color = "#403E41" +terms_title_color = "#9e9e9e" +terms_tags_color = "#424242" +terms_categories_color = "#424242" +terms_series_color = "#424242" +terms_len_color = "#727072" +toc_label_color = "#727072" +toc_title_color = "#727072" +toc_vertical_line = "#727072" +toc_vertical_line_active = "#FF6188" +search_placeholder_color = "#eeeeee" +search_color = "#fcfcfa" +search_icon_color = "#eeeeee" +search_background_color = "#9e9e9e" +search_content_color = "#fcfcfa" +search_content_background_color = "#9e9e9e" +search_hover_background_color = "#848484" +mark_color = "#fcfcfa" +mark_background_color = "#FF6188" +archive_key_color = "#fcfcfa" +archive_meta_color = "#424242" +archive_type_color = "#575757" +archive_key_background_color = "#607d8b" +archive_type_background_color = "#bdbdbd" +archive_hover_line_color = "#FF6188" \ No newline at end of file diff --git a/data/themes/custom.toml b/data/themes/custom.toml deleted file mode 100644 index d51c9db..0000000 --- a/data/themes/custom.toml +++ /dev/null @@ -1,92 +0,0 @@ -name = "custom" - -footer_background_color = "#403E41" -footer_color = "#bdbdbd" -link = "#FFD866" -link_hover = "#FF6188" -title_color = "#FFD866" -meta_color = "#FCFCFA" -body_color = "#FCFCFA" -hr_color = "#FCFCFA" -body_background_color = "#2D2A2E" -backdrop_background_color = "#212121" -dropdown_border_color = "#212121" -dropdown_border_top_color = "#424242" -dropdown_item_active_background_color = "#424242" -dropdown_title_background_color = "#2D2A2E" -dropdown_content_background_color = "#595B5C" -dropdown_footer_item_color = "#bdbdbd" -dropdown_item_hover_background_color = "#727072" -dropdown_item_hover_color = "#FCFCFA" -dropdown_item_color = "#FCFCFA" -navbar_border_bottom_color = "#2D2A2E" -navbar_background_color = "#403E41" -navbar_title_color = "#FCFCFA" -navbar_title_hover_color = "#FFD866" -navbar_menu_hover_background_color = "#4e3d4f" -navbar_dropdown_item_hover_color = "#FFD866" -navbar_dropdown_item_hover_background_color = "#595B5C" -input_color = "#FCFCFA" -input_background_color = "#403E41" -input_border_color = "#595B5C" -input_hover_border_color = "#727072" -input_focus_border_color = "#727072" -sidebar_title_color = "#aed581" -sidebar_li_color = "#FCFCFA" -taxo_title_color = "#bdbdbd" -taxo_tags_background_color = "#212121" -taxo_tags_color = "#78DCE8" -taxo_series_background_color = "#212121" -taxo_series_color = "#EA9C77" -taxo_categories_background_color = "#212121" -taxo_categories_color = "#AB9DF2" -breadcrumb_item_color = "#82aaff" -breadcrumb_background_color = "#212121" -breadcrumb_item_active_color = "#bdbdbd" -list_header_title_color = "#FCFCFA" -figcaption_color = "#bdbdbd" -figcaption_strong_color = "#FCFCFA" -single_hr_background_color = "#595B5C" -single_blockquote_border_color = "#FCFCFA" -single_header_title_color = "#FCFCFA" -single_contents_title_color = "#aed581" -related_header_title_color = "#FCFCFA" -related_link_color = "#A9DC76" -content_pre_main_color = "#FFA7C4" -content_pre_background_color = "#011627" -content_code_color = "#FCFCFA" -content_code_background_color = "#595B5C" -burger_menu_color = "#FCFCFA" -social_icon_color = "#bdbdbd" -social_icon_hover_color = "#f0f0f0" -pagination_link_color = "#82aaff" -pagination_background_color = "#212121" -pagination_disabled_color = "#757575" -pagination_number_color = "#FCFCFA" -photoswipe_hover_color = "#FCFCFA" -photoswipe_color = "#FCFCFA" -photoswipe_hover_background_color = "#727072" -photoswipe_background_color = "#403E41" -terms_title_color = "#727072" -terms_tags_color = "#78DCE8" -terms_categories_color = "#AB9DF2" -terms_series_color = "#EA9C77" -terms_len_color = "#727072" -toc_label_color = "#727072" -toc_title_color = "#90a4ae" -toc_vertical_line = "#727072" -toc_vertical_line_active = "#FF6188" -search_placeholder_color = "#727072" -search_color = "#FCFCFA" -search_icon_color = "#727072" -search_background_color = "#212121" -search_content_background_color = "#595B5C" -search_hover_background_color = "#727072" -mark_color = "#FCFCFA" -mark_background_color = "#FF6188" -archive_key_color = "#FCFCFA" -archive_type_color = "#FCFCFA" -archive_meta_color = "#aed581" -archive_key_background_color = "#FF6188" -archive_type_background_color = "#82aaff" -archive_hover_line_color = "#FF6188" \ No newline at end of file diff --git a/exampleSite/config.toml b/exampleSite/config.toml index e1f1df5..183990c 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -62,6 +62,10 @@ rssLimit = 100 pinterest = "http://example.org" stack-exchange = "" +[marketing] + google_analytics = "" + google_tag_manager = "" + [languages] [languages.en] title = "Hugo Zzo Theme" diff --git a/layouts/404.html b/layouts/404.html index dad1d3e..f373f61 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1 +1,8 @@ -
404 page not found
\ No newline at end of file +{{ define "main" }} +
+
+

404

+
Page not found
+
+
+{{ end }} \ No newline at end of file diff --git a/layouts/about/single.html b/layouts/about/single.html index 510130f..cf99337 100644 --- a/layouts/about/single.html +++ b/layouts/about/single.html @@ -8,7 +8,7 @@ {{ .Content }} -
+
about page
{{ end }} \ No newline at end of file diff --git a/layouts/index.html b/layouts/index.html index 9c48307..7bd7595 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,3 +1,5 @@ +{{ define "title" }}{{ .Site.Title }}{{ end }} + {{ define "main" }}
diff --git a/layouts/partials/body/breadcrumb.html b/layouts/partials/body/breadcrumb.html index 8c82af8..f16b38d 100644 --- a/layouts/partials/body/breadcrumb.html +++ b/layouts/partials/body/breadcrumb.html @@ -8,8 +8,12 @@ {{ else if not .p1.IsHome }} {{ template "breadcrumbnav" (dict "p1" .p1.Site.Home "p2" .p2 ) }} {{ end }} -
  • - {{ .p1.Title }} +
  • + {{ if eq (len .p1.Title) 0 }} + {{ .p1.Site.Title }} + {{ else }} + {{ .p1.Title }} + {{ end }}
    • {{ end }} \ No newline at end of file diff --git a/layouts/partials/functions/parse_theme.html b/layouts/partials/functions/parse_theme.html index da19b0b..83720cb 100644 --- a/layouts/partials/functions/parse_theme.html +++ b/layouts/partials/functions/parse_theme.html @@ -1,94 +1,90 @@ {{- $scr := .Scratch -}} -{{- $theme_index := .Site.Params.custom_skin -}} -{{ $theme := index .Site.Data.themes $theme_index }} +{{ $skin := .Site.Data.skin }} -{{- $scr.Set "footer_background_color" $theme.footer_background_color -}} -{{- $scr.Set "footer_color" $theme.footer_color -}} -{{- $scr.Set "link" $theme.link -}} -{{- $scr.Set "link_hover" $theme.link_hover -}} -{{- $scr.Set "title_color" $theme.title_color -}} -{{- $scr.Set "meta_color" $theme.meta_color -}} -{{- $scr.Set "body_color" $theme.body_color -}} -{{- $scr.Set "hr_color" $theme.hr_color -}} -{{- $scr.Set "body_background_color" $theme.body_background_color -}} -{{- $scr.Set "backdrop_background_color" $theme.backdrop_background_color -}} -{{- $scr.Set "dropdown_border_color" $theme.dropdown_border_color -}} -{{- $scr.Set "dropdown_border_top_color" $theme.dropdown_border_top_color -}} -{{- $scr.Set "dropdown_item_active_background_color" $theme.dropdown_item_active_background_color -}} -{{- $scr.Set "dropdown_title_background_color" $theme.dropdown_title_background_color -}} -{{- $scr.Set "dropdown_content_background_color" $theme.dropdown_content_background_color -}} -{{- $scr.Set "dropdown_footer_item_color" $theme.dropdown_footer_item_color -}} -{{- $scr.Set "dropdown_item_hover_background_color" $theme.dropdown_item_hover_background_color -}} -{{- $scr.Set "dropdown_item_hover_color" $theme.dropdown_item_hover_color -}} -{{- $scr.Set "dropdown_item_color" $theme.dropdown_item_color -}} -{{- $scr.Set "navbar_border_bottom_color" $theme.navbar_border_bottom_color -}} -{{- $scr.Set "navbar_background_color" $theme.navbar_background_color -}} -{{- $scr.Set "navbar_title_color" $theme.navbar_title_color -}} -{{- $scr.Set "navbar_title_hover_color" $theme.navbar_title_hover_color -}} -{{- $scr.Set "navbar_menu_hover_background_color" $theme.navbar_menu_hover_background_color -}} -{{- $scr.Set "navbar_dropdown_item_hover_color" $theme.navbar_dropdown_item_hover_color -}} -{{- $scr.Set "navbar_dropdown_item_hover_background_color" $theme.navbar_dropdown_item_hover_background_color -}} -{{- $scr.Set "input_color" $theme.input_color -}} -{{- $scr.Set "input_background_color" $theme.input_background_color -}} -{{- $scr.Set "input_border_color" $theme.input_border_color -}} -{{- $scr.Set "input_hover_border_color" $theme.input_hover_border_color -}} -{{- $scr.Set "input_focus_border_color" $theme.input_focus_border_color -}} -{{- $scr.Set "sidebar_title_color" $theme.sidebar_title_color -}} -{{- $scr.Set "sidebar_li_color" $theme.sidebar_li_color -}} -{{- $scr.Set "taxo_title_color" $theme.taxo_title_color -}} -{{- $scr.Set "taxo_tags_background_color" $theme.taxo_tags_background_color -}} -{{- $scr.Set "taxo_tags_color" $theme.taxo_tags_color -}} -{{- $scr.Set "taxo_series_background_color" $theme.taxo_series_background_color -}} -{{- $scr.Set "taxo_series_color" $theme.taxo_series_color -}} -{{- $scr.Set "taxo_categories_background_color" $theme.taxo_categories_background_color -}} -{{- $scr.Set "taxo_categories_color" $theme.taxo_categories_color -}} -{{- $scr.Set "breadcrumb_item_color" $theme.breadcrumb_item_color -}} -{{- $scr.Set "breadcrumb_background_color" $theme.breadcrumb_background_color -}} -{{- $scr.Set "breadcrumb_item_active_color" $theme.breadcrumb_item_active_color -}} -{{- $scr.Set "list_header_title_color" $theme.list_header_title_color -}} -{{- $scr.Set "figcaption_color" $theme.figcaption_color -}} -{{- $scr.Set "figcaption_strong_color" $theme.figcaption_strong_color -}} -{{- $scr.Set "single_hr_background_color" $theme.single_hr_background_color -}} -{{- $scr.Set "single_blockquote_border_color" $theme.single_blockquote_border_color -}} -{{- $scr.Set "single_header_title_color" $theme.single_header_title_color -}} -{{- $scr.Set "single_contents_title_color" $theme.single_contents_title_color -}} -{{- $scr.Set "related_header_title_color" $theme.related_header_title_color -}} -{{- $scr.Set "related_link_color" $theme.related_link_color -}} -{{- $scr.Set "content_pre_main_color" $theme.content_pre_main_color -}} -{{- $scr.Set "content_pre_background_color" $theme.content_pre_background_color -}} -{{- $scr.Set "content_code_color" $theme.content_code_color -}} -{{- $scr.Set "content_code_background_color" $theme.content_code_background_color -}} -{{- $scr.Set "burger_menu_color" $theme.burger_menu_color -}} -{{- $scr.Set "social_icon_color" $theme.social_icon_color -}} -{{- $scr.Set "social_icon_hover_color" $theme.social_icon_hover_color -}} -{{- $scr.Set "pagination_link_color" $theme.pagination_link_color -}} -{{- $scr.Set "pagination_background_color" $theme.pagination_background_color -}} -{{- $scr.Set "pagination_disabled_color" $theme.pagination_disabled_color -}} -{{- $scr.Set "pagination_number_color" $theme.pagination_number_color -}} -{{- $scr.Set "photoswipe_hover_color" $theme.photoswipe_hover_color -}} -{{- $scr.Set "photoswipe_color" $theme.photoswipe_color -}} -{{- $scr.Set "photoswipe_hover_background_color" $theme.photoswipe_hover_background_color -}} -{{- $scr.Set "photoswipe_background_color" $theme.photoswipe_background_color -}} -{{- $scr.Set "terms_title_color" $theme.terms_title_color -}} -{{- $scr.Set "terms_tags_color" $theme.terms_tags_color -}} -{{- $scr.Set "terms_categories_color" $theme.terms_categories_color -}} -{{- $scr.Set "terms_series_color" $theme.terms_series_color -}} -{{- $scr.Set "terms_len_color" $theme.terms_len_color -}} -{{- $scr.Set "toc_label_color" $theme.toc_label_color -}} -{{- $scr.Set "toc_title_color" $theme.toc_title_color -}} -{{- $scr.Set "toc_vertical_line" $theme.toc_vertical_line -}} -{{- $scr.Set "toc_vertical_line_active" $theme.toc_vertical_line_active -}} -{{- $scr.Set "search_placeholder_color" $theme.search_placeholder_color -}} -{{- $scr.Set "search_color" $theme.search_color -}} -{{- $scr.Set "search_icon_color" $theme.search_icon_color -}} -{{- $scr.Set "search_background_color" $theme.search_background_color -}} -{{- $scr.Set "search_content_background_color" $theme.search_content_background_color -}} -{{- $scr.Set "search_hover_background_color" $theme.search_hover_background_color -}} -{{- $scr.Set "mark_color" $theme.mark_color -}} -{{- $scr.Set "mark_background_color" $theme.mark_background_color -}} -{{- $scr.Set "archive_key_color" $theme.archive_key_color -}} -{{- $scr.Set "archive_type_color" $theme.archive_type_color -}} -{{- $scr.Set "archive_meta_color" $theme.archive_meta_color -}} -{{- $scr.Set "archive_key_background_color" $theme.archive_key_background_color -}} -{{- $scr.Set "archive_type_background_color" $theme.archive_type_background_color -}} -{{- $scr.Set "archive_hover_line_color" $theme.archive_hover_line_color -}} +{{- $scr.Set "footer_background_color" $skin.footer_background_color -}} +{{- $scr.Set "footer_color" $skin.footer_color -}} +{{- $scr.Set "link" $skin.link -}} +{{- $scr.Set "link_hover" $skin.link_hover -}} +{{- $scr.Set "title_color" $skin.title_color -}} +{{- $scr.Set "meta_color" $skin.meta_color -}} +{{- $scr.Set "body_color" $skin.body_color -}} +{{- $scr.Set "hr_color" $skin.hr_color -}} +{{- $scr.Set "body_background_color" $skin.body_background_color -}} +{{- $scr.Set "backdrop_background_color" $skin.backdrop_background_color -}} +{{- $scr.Set "dropdown_border_color" $skin.dropdown_border_color -}} +{{- $scr.Set "dropdown_border_top_color" $skin.dropdown_border_top_color -}} +{{- $scr.Set "dropdown_item_active_background_color" $skin.dropdown_item_active_background_color -}} +{{- $scr.Set "dropdown_title_background_color" $skin.dropdown_title_background_color -}} +{{- $scr.Set "dropdown_content_background_color" $skin.dropdown_content_background_color -}} +{{- $scr.Set "dropdown_footer_item_color" $skin.dropdown_footer_item_color -}} +{{- $scr.Set "dropdown_item_hover_background_color" $skin.dropdown_item_hover_background_color -}} +{{- $scr.Set "dropdown_item_hover_color" $skin.dropdown_item_hover_color -}} +{{- $scr.Set "dropdown_item_color" $skin.dropdown_item_color -}} +{{- $scr.Set "navbar_border_bottom_color" $skin.navbar_border_bottom_color -}} +{{- $scr.Set "navbar_background_color" $skin.navbar_background_color -}} +{{- $scr.Set "navbar_title_color" $skin.navbar_title_color -}} +{{- $scr.Set "navbar_title_hover_color" $skin.navbar_title_hover_color -}} +{{- $scr.Set "navbar_title_active_color" $skin.navbar_title_active_color -}} +{{- $scr.Set "navbar_menu_hover_background_color" $skin.navbar_menu_hover_background_color -}} +{{- $scr.Set "navbar_dropdown_item_hover_color" $skin.navbar_dropdown_item_hover_color -}} +{{- $scr.Set "navbar_dropdown_item_hover_background_color" $skin.navbar_dropdown_item_hover_background_color -}} +{{- $scr.Set "sidebar_title_color" $skin.sidebar_title_color -}} +{{- $scr.Set "sidebar_li_color" $skin.sidebar_li_color -}} +{{- $scr.Set "taxo_title_color" $skin.taxo_title_color -}} +{{- $scr.Set "taxo_tags_background_color" $skin.taxo_tags_background_color -}} +{{- $scr.Set "taxo_tags_color" $skin.taxo_tags_color -}} +{{- $scr.Set "taxo_series_background_color" $skin.taxo_series_background_color -}} +{{- $scr.Set "taxo_series_color" $skin.taxo_series_color -}} +{{- $scr.Set "taxo_background_color_hover" $skin.taxo_background_color_hover -}} +{{- $scr.Set "taxo_categories_background_color" $skin.taxo_categories_background_color -}} +{{- $scr.Set "taxo_categories_color" $skin.taxo_categories_color -}} +{{- $scr.Set "breadcrumb_item_color" $skin.breadcrumb_item_color -}} +{{- $scr.Set "breadcrumb_background_color" $skin.breadcrumb_background_color -}} +{{- $scr.Set "breadcrumb_item_active_color" $skin.breadcrumb_item_active_color -}} +{{- $scr.Set "list_header_title_color" $skin.list_header_title_color -}} +{{- $scr.Set "figcaption_color" $skin.figcaption_color -}} +{{- $scr.Set "figcaption_strong_color" $skin.figcaption_strong_color -}} +{{- $scr.Set "single_hr_background_color" $skin.single_hr_background_color -}} +{{- $scr.Set "single_blockquote_border_color" $skin.single_blockquote_border_color -}} +{{- $scr.Set "single_header_title_color" $skin.single_header_title_color -}} +{{- $scr.Set "single_contents_title_color" $skin.single_contents_title_color -}} +{{- $scr.Set "related_header_title_color" $skin.related_header_title_color -}} +{{- $scr.Set "related_link_color" $skin.related_link_color -}} +{{- $scr.Set "content_pre_main_color" $skin.content_pre_main_color -}} +{{- $scr.Set "content_pre_background_color" $skin.content_pre_background_color -}} +{{- $scr.Set "content_code_color" $skin.content_code_color -}} +{{- $scr.Set "content_code_background_color" $skin.content_code_background_color -}} +{{- $scr.Set "burger_menu_color" $skin.burger_menu_color -}} +{{- $scr.Set "social_icon_color" $skin.social_icon_color -}} +{{- $scr.Set "social_icon_hover_color" $skin.social_icon_hover_color -}} +{{- $scr.Set "pagination_link_color" $skin.pagination_link_color -}} +{{- $scr.Set "pagination_background_color" $skin.pagination_background_color -}} +{{- $scr.Set "pagination_disabled_color" $skin.pagination_disabled_color -}} +{{- $scr.Set "pagination_number_color" $skin.pagination_number_color -}} +{{- $scr.Set "photoswipe_hover_color" $skin.photoswipe_hover_color -}} +{{- $scr.Set "photoswipe_color" $skin.photoswipe_color -}} +{{- $scr.Set "photoswipe_hover_background_color" $skin.photoswipe_hover_background_color -}} +{{- $scr.Set "photoswipe_background_color" $skin.photoswipe_background_color -}} +{{- $scr.Set "terms_title_color" $skin.terms_title_color -}} +{{- $scr.Set "terms_tags_color" $skin.terms_tags_color -}} +{{- $scr.Set "terms_categories_color" $skin.terms_categories_color -}} +{{- $scr.Set "terms_series_color" $skin.terms_series_color -}} +{{- $scr.Set "terms_len_color" $skin.terms_len_color -}} +{{- $scr.Set "toc_label_color" $skin.toc_label_color -}} +{{- $scr.Set "toc_title_color" $skin.toc_title_color -}} +{{- $scr.Set "toc_vertical_line" $skin.toc_vertical_line -}} +{{- $scr.Set "toc_vertical_line_active" $skin.toc_vertical_line_active -}} +{{- $scr.Set "search_placeholder_color" $skin.search_placeholder_color -}} +{{- $scr.Set "search_color" $skin.search_color -}} +{{- $scr.Set "search_icon_color" $skin.search_icon_color -}} +{{- $scr.Set "search_background_color" $skin.search_background_color -}} +{{- $scr.Set "search_content_background_color" $skin.search_content_background_color -}} +{{- $scr.Set "search_hover_background_color" $skin.search_hover_background_color -}} +{{- $scr.Set "mark_color" $skin.mark_color -}} +{{- $scr.Set "mark_background_color" $skin.mark_background_color -}} +{{- $scr.Set "archive_key_color" $skin.archive_key_color -}} +{{- $scr.Set "archive_type_color" $skin.archive_type_color -}} +{{- $scr.Set "archive_meta_color" $skin.archive_meta_color -}} +{{- $scr.Set "archive_key_background_color" $skin.archive_key_background_color -}} +{{- $scr.Set "archive_type_background_color" $skin.archive_type_background_color -}} +{{- $scr.Set "archive_hover_line_color" $skin.archive_hover_line_color -}} diff --git a/layouts/partials/header/site-header.html b/layouts/partials/header/site-header.html index cd2940e..33f3650 100644 --- a/layouts/partials/header/site-header.html +++ b/layouts/partials/header/site-header.html @@ -1,5 +1,5 @@ {{ if .IsHome }} -
    +

    {{ .Site.Title }}

    {{ end }} \ No newline at end of file diff --git a/layouts/partials/navbar/site-nav.html b/layouts/partials/navbar/site-nav.html index 7ff9c0d..c675f3b 100644 --- a/layouts/partials/navbar/site-nav.html +++ b/layouts/partials/navbar/site-nav.html @@ -36,7 +36,3 @@ {{ end }} - - \ No newline at end of file