diff --git a/README.md b/README.md index 4202a07..a5d7726 100644 --- a/README.md +++ b/README.md @@ -238,6 +238,7 @@ enableSidebarSeries = true enableSidebarCategories = true enableToc = true itemsPerCategory = 5 +enableSideSubscribe = false # comment enableComment = false @@ -312,7 +313,34 @@ The CSS grid layout are in `assets/sass/layout/_grid.scss`. A lot can be done by ## Gallery -Follow the steps below if you want to make gallery +There are two ways to make gallery. You can specify **mode** at frontmatter. + +```bash +content/gallery/mygallery/index.md + +--- +title: "{{ replace .Name "-" " " | title }}" +date: {{ .Date }} +description: +type: gallery +mode: one-by-one # at-once or one-by-one +tags: +- +series: +- +categories: +- +images: # when mode is one-by-one, images front matter works + - image: image1.jpg + caption: caption1 + - image: image2.jpg + caption: caption2 + ... +--- + +``` + +If you set the mode to one-by-one, list.html page will use images frontmatter above. If you set the mode to at-once, list.html page will not use images frontmatter and just read all files under the static/gallery/mygallery folder. 1. Make a gallery folder under the content folder diff --git a/archetypes/gallery.md b/archetypes/gallery.md index aaf539b..c2bb142 100644 --- a/archetypes/gallery.md +++ b/archetypes/gallery.md @@ -3,10 +3,14 @@ title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} description: type: gallery +mode: at-once # at-once or one-by-one tags: - series: - categories: - +images: # when mode is one-by-one, images front matter works + - image: + caption: --- diff --git a/assets/sass/abstracts/_variables.scss b/assets/sass/abstracts/_variables.scss index 8a297ac..a3cbd96 100644 --- a/assets/sass/abstracts/_variables.scss +++ b/assets/sass/abstracts/_variables.scss @@ -6,7 +6,7 @@ $code-font-stack: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", " "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace !default; -$z-indexes: ("modal", "navbar", "dropdown", "header", "grid", "search", "content", "footer", "taxo", "toc"); +$z-indexes: ("modal", "navbar", "dropdown", "header", "grid", "search", "content", "footer", "taxo", "toc", "gallery-mask"); $ls: ( base: -10, heading: 10, diff --git a/assets/sass/components/_subs.scss b/assets/sass/components/_subs.scss index 97c5c2a..df301a0 100644 --- a/assets/sass/components/_subs.scss +++ b/assets/sass/components/_subs.scss @@ -15,22 +15,57 @@ &__form { @include flexbox(); @include align-items(center); + margin-bottom: 0.25rem; + } + + &__icon { + padding: 0.3rem; + border-top-left-radius: 0.25rem; + border-bottom-left-radius: 0.25rem; + + @include flexbox(); + @include align-items(center); + @include themify($themes) { + color: themed("search-icon-color"); + background-color: themed("search-background-color"); + } } &__input { height: 32px; width: 100%; padding: 0.25rem; - border-radius: 0.25rem; + border-top-right-radius: 0.25rem; + border-bottom-right-radius: 0.25rem; margin-right: 1rem; - background-color: #212121; - border: 1px solid #212121; - color: red; - border-left: none; + border: none; outline: none; + @include themify($themes) { + color: themed("search-color"); + background-color: themed("search-background-color"); + @include input-placeholder { + font-family: $search_placeholder_font; + color: themed("search-placeholder-color"); + } + } } &__button { + border-radius: 0.125rem; + border: none; + outline: none; + height: 25px; + width: auto; + min-width: 60px; + cursor: pointer; + @include transition(all, 0.25s, ease); + @include themify($themes) { + color: themed('subs-button-color'); + background-color:themed('subs-button-background-color'); + @include on-event { + background-color:themed('subs-button-hover-background-color'); + } + } } } \ No newline at end of file diff --git a/assets/sass/main.scss b/assets/sass/main.scss index eb59363..57b6950 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -124,6 +124,11 @@ $whoami_border_color: {{ $scr.Get "whoami_border_color" }}; $switch_background_color: {{ $scr.Get "switch_background_color" }}; $switch_button_color: {{ $scr.Get "switch_button_color" }}; $switch_active_color: {{ $scr.Get "switch_active_color" }}; +$subs_button_color: {{ $scr.Get "subs_button_color" }}; +$subs_button_background_color: {{ $scr.Get "subs_button_background_color" }}; +$subs_button_hover_background_color: {{ $scr.Get "subs_button_hover_background_color" }}; +$gallery_mask_color: {{ $scr.Get "gallery_mask_color" }}; +$gallery_mask_background_color: {{ $scr.Get "gallery_mask_background_color" }}; @import 'abstracts/variables'; @import 'abstracts/mixins'; diff --git a/assets/sass/pages/_gallery.scss b/assets/sass/pages/_gallery.scss index e971175..f4125b6 100644 --- a/assets/sass/pages/_gallery.scss +++ b/assets/sass/pages/_gallery.scss @@ -35,20 +35,16 @@ .grid-sizer, .grid-item { width: 33.333%; - padding: 0.25rem; - - img { - border-radius: 0.25rem; - } + padding: 0.5rem; } .grid-item { - float: left; + float: left; } .grid-item img { display: block; - max-width: 100%; + max-width: 100%; } @@ -62,4 +58,37 @@ font-size: 1rem; text-align: center; } + + .grid-item { + position: relative; + opacity: 1; + height: auto; + cursor: pointer; + + &__desc { + position: absolute; + display: none; + left: 0; + right: 0; + top: 0; + bottom: 0; + margin: auto; + padding: 0.5rem; + width: calc(100% - 1rem); + height: calc(100% - 1rem); + border-radius: 0.25rem; + z-index: z('gallery-mask'); + font-family: $single_title_font; + font-weight: 700; + cursor: pointer; + + @include box-shadow(0, 4px, 4px, 0, rgba(0, 0, 0, 0.4)); + @include on-event { + @include themify($themes) { + color: themed('gallery-mask-color'); + background-color: themed('gallery-mask-background-color'); + } + } + } + } } \ No newline at end of file diff --git a/assets/sass/themes/_custom.scss b/assets/sass/themes/_custom.scss index b706385..cd5ec57 100644 --- a/assets/sass/themes/_custom.scss +++ b/assets/sass/themes/_custom.scss @@ -94,4 +94,9 @@ $custom: ( switch-background-color: $switch_background_color, switch-button-color: $switch_button_color, switch-active-color: $switch_active_color, + subs-button-color: $subs_button_color, + subs-button-background-color: $subs_button_background_color, + subs-button-hover-background-color: $subs_button_hover_background_color, + gallery-mask-color: $gallery_mask_color, + gallery-mask-background-color: $gallery_mask_background_color, ) !default; \ No newline at end of file diff --git a/assets/sass/themes/_dark.scss b/assets/sass/themes/_dark.scss index a36af17..5ad6fdc 100644 --- a/assets/sass/themes/_dark.scss +++ b/assets/sass/themes/_dark.scss @@ -95,4 +95,9 @@ $dark: ( switch-background-color: #403E41, switch-button-color: #FCFCFA, switch-active-color: #FF6188, + subs-button-color: #FCFCFA, + subs-button-background-color: #FF6188, + subs-button-hover-background-color: darken(#FF6188, 5%), + gallery-mask-color: #FCFCFA, + gallery-mask-background-color: rgba(0, 0, 0, 0.7), ); \ No newline at end of file diff --git a/assets/sass/themes/_hacker.scss b/assets/sass/themes/_hacker.scss index 7b9b926..6db6c94 100644 --- a/assets/sass/themes/_hacker.scss +++ b/assets/sass/themes/_hacker.scss @@ -98,4 +98,9 @@ $hacker: ( switch-background-color: #403E41, switch-button-color: #FCFCFA, switch-active-color: #FF6188, + subs-button-color: $primary-color, + subs-button-background-color: #252526, + subs-button-hover-background-color: lighten(#252526, 5%), + gallery-mask-color: #FCFCFA, + gallery-mask-background-color: rgba(0, 0, 0, 0.7), ); \ No newline at end of file diff --git a/assets/sass/themes/_light.scss b/assets/sass/themes/_light.scss index c0379ba..aa5058d 100644 --- a/assets/sass/themes/_light.scss +++ b/assets/sass/themes/_light.scss @@ -95,4 +95,9 @@ $light: ( switch-background-color: #bdbdbd, switch-button-color: #FCFCFA, switch-active-color: #FF6188, + subs-button-color: #607d8b, + subs-button-background-color: #eeeeee, + subs-button-hover-background-color: darken(#eeeeee, 5%), + gallery-mask-color: #424242, + gallery-mask-background-color: rgba(255, 255, 255, 0.7), ); \ No newline at end of file diff --git a/assets/sass/themes/_solarized.scss b/assets/sass/themes/_solarized.scss index 2354065..c4d0278 100644 --- a/assets/sass/themes/_solarized.scss +++ b/assets/sass/themes/_solarized.scss @@ -9,7 +9,7 @@ $solarized: ( title-color: $primary-color, meta-color: lighten($primary-color, 5%), body-color: #424242, - hr-color: $primary-color, + hr-color: $secondary-color, body-background-color: #FDF7E3, backdrop-background-color: #DDD6C7, dropdown-border-color: $primary-color, @@ -98,4 +98,9 @@ $solarized: ( switch-background-color: darken(#EEE8D5, 10%), switch-button-color: #FCFCFA, switch-active-color: #FF6188, + subs-button-color: #FCFCFA, + subs-button-background-color: $secondary-color, + subs-button-hover-background-color: darken($secondary-color, 3%), + gallery-mask-color: #424242, + gallery-mask-background-color: rgba(253, 247, 227, 0.7), ); \ No newline at end of file diff --git a/data/_config/_default/params.toml b/data/_config/_default/params.toml index d726a40..35dd588 100644 --- a/data/_config/_default/params.toml +++ b/data/_config/_default/params.toml @@ -22,6 +22,7 @@ enableSidebarSeries = true enableSidebarCategories = true enableToc = true itemsPerCategory = 5 +enableSideSubscribe = false # footer showPoweredBy = true diff --git a/data/skin.toml b/data/skin.toml index 546f76a..9cecd68 100644 --- a/data/skin.toml +++ b/data/skin.toml @@ -93,4 +93,9 @@ gtt_hover_background_color = "inherit" whoami_border_color = "inherit" switch_background_color = "inherit" switch_button_color = "inehrit" -switch_active_color = "inehrit" \ No newline at end of file +switch_active_color = "inehrit" +subs_button_color = "inherit" +subs_button_background_color = "inherit" +subs_button_hover_background_color = "inherit" +gallery_mask_color = "inherit" +gallery_mask_background_color = "inherit" \ No newline at end of file diff --git a/exampleSite/config.toml b/exampleSite/config.toml index a8573f9..0c29270 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -48,7 +48,8 @@ rssLimit = 100 enableSidebarCategories = true enableToc = true itemsPerCategory = 5 - + enableSideSubscribe = false + # footer showPoweredBy = true showFeedLinks = true diff --git a/exampleSite/content/gallery/photo/index.ko.md b/exampleSite/content/gallery/photo/index.ko.md index 3709e31..d9503d8 100644 --- a/exampleSite/content/gallery/photo/index.ko.md +++ b/exampleSite/content/gallery/photo/index.ko.md @@ -2,5 +2,9 @@ title: "Photo" date: 2018-10-12T10:20:16+09:00 type: "gallery" +mode: "one-by-one" description: "포토 갤러리" +images: + - image: owl.jpg + caption: owl caption --- diff --git a/exampleSite/content/gallery/photo/index.md b/exampleSite/content/gallery/photo/index.md index 2b058ac..6f9bf18 100644 --- a/exampleSite/content/gallery/photo/index.md +++ b/exampleSite/content/gallery/photo/index.md @@ -2,5 +2,9 @@ title: "Photo" date: 2018-10-12T10:20:16+09:00 type: "gallery" +mode: "one-by-one" description: "photo gallery" +images: + - image: owl.jpg + caption: owl caption --- diff --git a/exampleSite/static/gallery/photo/owl-4590569_640.jpg b/exampleSite/static/gallery/photo/owl.jpg similarity index 100% rename from exampleSite/static/gallery/photo/owl-4590569_640.jpg rename to exampleSite/static/gallery/photo/owl.jpg diff --git a/i18n/en.toml b/i18n/en.toml index 244c703..481e6ad 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -37,8 +37,11 @@ other = "What's on this Page" [subs-label] other = "Subscribe" -[subs-placeholder] +[subs-placeholder-email] other = "Your email address" +[subs-placeholder-name] +other = "Your name" + [subs-button] other = "Join" \ No newline at end of file diff --git a/i18n/ko.toml b/i18n/ko.toml index a4c8ec3..238eaf0 100644 --- a/i18n/ko.toml +++ b/i18n/ko.toml @@ -37,8 +37,11 @@ other = "목차" [subs-label] other = "구독" -[subs-placeholder] -other = "이메일 주소 입력" +[subs-placeholder-email] +other = "이메일 주소" + +[subs-placeholder-name] +other = "이름" [subs-button] other = "구독하기" \ No newline at end of file diff --git a/layouts/archive/list.html b/layouts/archive/list.html index c7ae649..adabbaa 100644 --- a/layouts/archive/list.html +++ b/layouts/archive/list.html @@ -10,7 +10,7 @@
- {{ range (and (where .Site.RegularPages "Type" "!=" "about") (where .Site.RegularPages "Type" "!=" "archive")).GroupByDate .Site.Params.archiveGroupByDate }} + {{ range (and (where .Site.RegularPages "Type" "!=" "about") (where .Site.RegularPages "Type" "!=" "archive")).GroupByDate (.Site.Params.archiveGroupByDate | default 2006) }} {{ .Key }}
+ +{{ if in (lower .Params.Mode) "one" }} +
- {{ $basename := (replace .File.Dir "\\" "/") }} - {{ range (readDir (print "./static/" $basename)) }} -
- {{ .Name }} -
+ {{ if .File.Dir }} + {{ $basename := (replace .File.Dir "\\" "/") }} + {{ range .Params.Images }} +
+ {{ print .caption }} +
{{ .caption }}
+
+ {{ end }} {{ end }}
{{ partial "pagination/pagination-single" . }}
+ +{{ else }} + +
+
+
+ {{ if .File.Dir }} + {{ $basename := (replace .File.Dir "\\" "/") }} + {{ range (readDir (print "./static/" $basename)) }} +
+ {{ index (split .Name +
{{ index (split .Name ".") 0 }}
+
+ {{ end }} + {{ end }} +
+ {{ partial "pagination/pagination-single" . }} +
+ +{{ end }} + {{ partial "body/photoswipe" . }} {{ $masonry := resources.Get `js/masonry.pkgd.min.js` | resources.Fingerprint }} @@ -35,6 +62,14 @@ $grid.masonry(); }); + $('.grid-item').mouseenter(function () { + $(this).children('.grid-item__desc').show(); + }); + + $('.grid-item').mouseleave(function () { + $(this).children('.grid-item__desc').hide(); + }); + enquire.register("screen and (max-width:500px)", { match: function () { $('.grid-item').addClass('full'); diff --git a/layouts/partials/body/photoswipe.html b/layouts/partials/body/photoswipe.html index 70af480..5074fbb 100644 --- a/layouts/partials/body/photoswipe.html +++ b/layouts/partials/body/photoswipe.html @@ -82,17 +82,28 @@ var pswpElement = $('.pswp')[0]; var imgElements = $('.single__contents').find('img'); var items = []; - + + {{ $mode:= .Params.Mode }} + var mode = JSON.parse({{ $mode | jsonify }}); + imgElements.each(function (i, v) { - $(this).click(function (e) { + $(this).siblings().click(function (e) { initGallery(i); }); $(this).css('cursor', 'pointer'); + + var caption = null; + if (mode && mode.toLowerCase().includes('one')) { + caption = $(this).attr('alt'); + } else { + caption = filename(v['src']); + } + items.push({ src: v['src'], w: 0, h: 0, - title: filename(v['src']), + title: caption, }); }); diff --git a/layouts/partials/functions/parse_theme.html b/layouts/partials/functions/parse_theme.html index 5edfc03..8bc83f9 100644 --- a/layouts/partials/functions/parse_theme.html +++ b/layouts/partials/functions/parse_theme.html @@ -96,3 +96,8 @@ {{- $scr.Set "switch_background_color" $skin.switch_background_color -}} {{- $scr.Set "switch_button_color" $skin.switch_button_color -}} {{- $scr.Set "switch_active_color" $skin.switch_active_color -}} +{{- $scr.Set "subs_button_color" $skin.subs_button_color -}} +{{- $scr.Set "subs_button_background_color" $skin.subs_button_background_color -}} +{{- $scr.Set "subs_button_hover_background_color" $skin.subs_button_hover_background_color -}} +{{- $scr.Set "gallery_mask_color" $skin.gallery_mask_color -}} +{{- $scr.Set "gallery_mask_background_color" $skin.gallery_mask_background_color -}} \ No newline at end of file diff --git a/layouts/partials/head/scripts.html b/layouts/partials/head/scripts.html index cb223fc..ed7e1fc 100644 --- a/layouts/partials/head/scripts.html +++ b/layouts/partials/head/scripts.html @@ -13,10 +13,12 @@ {{ $zzo := resources.Get "js/zzo.js" | resources.Minify | resources.Fingerprint }} -{{ range .Site.Params.custom_js -}} +{{ if .Site.Params.custom_js }} +{{ range .Site.Params.custom_js }} {{ $custom_template := resources.Get . }} {{ if $custom_template }} {{ $custom_js := $custom_template | resources.Minify | resources.Fingerprint }} {{ end }} -{{- end }} \ No newline at end of file +{{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/partials/head/styles.html b/layouts/partials/head/styles.html index 95ae80c..1267193 100644 --- a/layouts/partials/head/styles.html +++ b/layouts/partials/head/styles.html @@ -3,10 +3,12 @@ {{ $main_style := $main_template | resources.ExecuteAsTemplate "main_parsed.scss" . | toCSS $main_options | resources.Minify }} -{{ range .Site.Params.custom_css -}} +{{ if .Site.Params.custom_css }} +{{ range .Site.Params.custom_css }} {{ $custom_template := resources.Get . }} {{ if $custom_template }} {{ $custom_style := $custom_template | resources.ToCSS | resources.Minify }} {{ end }} -{{- end }} \ No newline at end of file +{{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/partials/header/site-header.html b/layouts/partials/header/site-header.html index 25a30c5..19c35de 100644 --- a/layouts/partials/header/site-header.html +++ b/layouts/partials/header/site-header.html @@ -1,7 +1,7 @@ {{ if .IsHome }}
- {{ .Site.Params.myname }} + {{ if .Site.Params.myname }}{{ .Site.Params.myname }}{{ end }}
Hi, I'm {{ .Site.Params.myname }}
diff --git a/layouts/partials/sidebar/sidebar-home.html b/layouts/partials/sidebar/sidebar-home.html index a7cd9f5..7707994 100644 --- a/layouts/partials/sidebar/sidebar-home.html +++ b/layouts/partials/sidebar/sidebar-home.html @@ -9,10 +9,12 @@
{{ .Title }}
    + {{ if .Site.Params.itemsPerCategory }} {{ range first .Site.Params.itemsPerCategory .Pages }}
  • {{ .Title }}
    • {{ end }} + {{ end }}
{{ end }} diff --git a/layouts/partials/sidebar/sidebar-list.html b/layouts/partials/sidebar/sidebar-list.html index 1ec3e58..7629994 100644 --- a/layouts/partials/sidebar/sidebar-list.html +++ b/layouts/partials/sidebar/sidebar-list.html @@ -5,6 +5,7 @@ {{ with .File }}{{ $currentID = .UniqueID }}{{ end }}
{{ partial "sidebar/site-search" . }} + {{ if .Site.Params.itemsPerCategory }} {{ range first .Site.Params.itemsPerCategory .Pages }}
{{ .Title }} @@ -16,6 +17,7 @@
{{ end }} + {{ end }}
{{ partial "taxonomy/taxonomy-tags" . }} diff --git a/layouts/partials/sidebar/site-subs.html b/layouts/partials/sidebar/site-subs.html index 9621c00..23249e3 100644 --- a/layouts/partials/sidebar/site-subs.html +++ b/layouts/partials/sidebar/site-subs.html @@ -5,13 +5,18 @@ {{ i18n "subs-label" }}
- + + {{ partial "svgs/etc/person.svg" (dict "width" 22 "height" 22) }} + +
- +
+ + {{ partial "svgs/social/email.svg" (dict "width" 22 "height" 22) }} + + +
+ - - {{ end }} \ No newline at end of file diff --git a/layouts/partials/summary/card.html b/layouts/partials/summary/card.html index 7190dbe..6c0ef57 100644 --- a/layouts/partials/summary/card.html +++ b/layouts/partials/summary/card.html @@ -15,7 +15,7 @@ {{ if $params.featured_image }}
{{ with (print "images/" $params.featured_image) }} - {{ print $params.featured_image }} + {{ print $params.featured_image }} {{ end }}
{{ else if $params.featured_video }} @@ -23,7 +23,7 @@
diff --git a/layouts/partials/svgs/etc/person.svg b/layouts/partials/svgs/etc/person.svg new file mode 100644 index 0000000..53d100f --- /dev/null +++ b/layouts/partials/svgs/etc/person.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/layouts/partials/svgs/etc/visibility.svg b/layouts/partials/svgs/etc/visibility.svg new file mode 100644 index 0000000..1bec0ad --- /dev/null +++ b/layouts/partials/svgs/etc/visibility.svg @@ -0,0 +1 @@ + \ No newline at end of file