diff options
-rw-r--r-- | Makefile | 21 | ||||
-rw-r--r-- | assets/css/layouts/_card-list.scss | 16 | ||||
-rw-r--r-- | content/art/doodles/index.md | 2 | ||||
-rw-r--r-- | content/art/drawings/index.md | 2 | ||||
-rw-r--r-- | content/art/emojis/index.md | 2 | ||||
-rw-r--r-- | content/art/index.md | 2 | ||||
-rw-r--r-- | content/fediring/index.md | 2 | ||||
-rw-r--r-- | content/fediring/next.md | 2 | ||||
-rw-r--r-- | content/fediring/random.md | 6 | ||||
-rw-r--r-- | content/profiles/index.md | 2 | ||||
-rw-r--r-- | content/services/index.md | 2 | ||||
-rw-r--r-- | templates/layouts/categorized_list.html | 10 | ||||
-rw-r--r-- | templates/layouts/list.html | 8 | ||||
-rw-r--r-- | templates/partials/small_gallery_card.html | 39 |
14 files changed, 46 insertions, 70 deletions
@@ -34,7 +34,6 @@ feed_files: $(FEED_FILES) | |||
34 | static_files: $(STATIC_FILES) | 34 | static_files: $(STATIC_FILES) |
35 | font_files: $(FONT_FILES) | 35 | font_files: $(FONT_FILES) |
36 | css_files: $(CSS_FILES) | 36 | css_files: $(CSS_FILES) |
37 | icons: out/icons.svg | ||
38 | 37 | ||
39 | # | 38 | # |
40 | # RULES | 39 | # RULES |
@@ -141,14 +140,21 @@ out/%.css: assets/css/%.scss $(CSS_SRC) | out | |||
141 | 140 | ||
142 | sass --load-path=node_modules "$<" | ./node_modules/.bin/postcss --use autoprefixer --no-map -o "$@" | 141 | sass --load-path=node_modules "$<" | ./node_modules/.bin/postcss --use autoprefixer --no-map -o "$@" |
143 | 142 | ||
144 | out/icons.svg: | out | 143 | out/%: content/% | out |
145 | $(info [ICON] $< -> $@) | 144 | $(info [COPY] $< -> $@) |
145 | |||
146 | mkdir -p $(@D) | ||
147 | cp "$<" "$@" | ||
148 | |||
149 | icons: | out | ||
150 | $(info [ICON] out/icons.svg) | ||
146 | 151 | ||
147 | node ./node_modules/iro-icons/scripts/create_sprite.js \ | 152 | node ./node_modules/iro-icons/scripts/create_sprite.js \ |
148 | asterisk \ | 153 | asterisk \ |
149 | arrow-left \ | 154 | arrow-left \ |
150 | arrow-right \ | 155 | arrow-right \ |
151 | arrow-up-right \ | 156 | arrow-up-right \ |
157 | shuffle \ | ||
152 | envelope \ | 158 | envelope \ |
153 | hash \ | 159 | hash \ |
154 | messages \ | 160 | messages \ |
@@ -162,14 +168,7 @@ out/icons.svg: | out | |||
162 | x \ | 168 | x \ |
163 | chevron-left \ | 169 | chevron-left \ |
164 | chevron-right \ | 170 | chevron-right \ |
165 | "$@" | 171 | "out/icons.svg" |
166 | |||
167 | |||
168 | out/%: content/% | out | ||
169 | $(info [COPY] $< -> $@) | ||
170 | |||
171 | mkdir -p $(@D) | ||
172 | cp "$<" "$@" | ||
173 | 172 | ||
174 | .cache/meta: | .cache | 173 | .cache/meta: | .cache |
175 | mkdir -p .cache/meta | 174 | mkdir -p .cache/meta |
diff --git a/assets/css/layouts/_card-list.scss b/assets/css/layouts/_card-list.scss index 7a09c54..b8d343b 100644 --- a/assets/css/layouts/_card-list.scss +++ b/assets/css/layouts/_card-list.scss | |||
@@ -7,18 +7,22 @@ | |||
7 | --margin-top: fn.global-dim(--size --700), | 7 | --margin-top: fn.global-dim(--size --700), |
8 | --spacing: fn.global-dim(--size --200), | 8 | --spacing: fn.global-dim(--size --200), |
9 | --gap: fn.global-dim(--size --25), | 9 | --gap: fn.global-dim(--size --25), |
10 | --grid: ( | 10 | --grid-2: ( |
11 | --gap: fn.global-dim(--size --75), | 11 | --gap: fn.global-dim(--size --75), |
12 | --col-width: fn.global-dim(--size --3400), | 12 | --col-width: fn.global-dim(--size --3400), |
13 | ), | 13 | ), |
14 | --small-gallery: ( | 14 | --grid-3: ( |
15 | --gap: fn.global-dim(--size --250), | 15 | --gap: fn.global-dim(--size --75), |
16 | --col-width: fn.global-dim(--size --2800), | 16 | --col-width: fn.global-dim(--size --2800), |
17 | ), | 17 | ), |
18 | --gallery: ( | 18 | --gallery-2: ( |
19 | --gap: fn.global-dim(--size --250), | 19 | --gap: fn.global-dim(--size --250), |
20 | --col-width: fn.global-dim(--size --3400), | 20 | --col-width: fn.global-dim(--size --3400), |
21 | ) | 21 | ), |
22 | --gallery-3: ( | ||
23 | --gap: fn.global-dim(--size --250), | ||
24 | --col-width: fn.global-dim(--size --2800), | ||
25 | ), | ||
22 | ) | 26 | ) |
23 | ), 'dims'); | 27 | ), 'dims'); |
24 | 28 | ||
@@ -40,7 +44,7 @@ | |||
40 | gap: fn.dim(--gap); | 44 | gap: fn.dim(--gap); |
41 | margin-top: fn.dim(--spacing); | 45 | margin-top: fn.dim(--spacing); |
42 | 46 | ||
43 | @each $mode in 'grid' 'small-gallery' 'gallery' { | 47 | @each $mode in 'grid-2' 'grid-3' 'gallery-2' 'gallery-3' { |
44 | @include iro.bem-modifier($mode) { | 48 | @include iro.bem-modifier($mode) { |
45 | display: grid; | 49 | display: grid; |
46 | align-items: start; | 50 | align-items: start; |
diff --git a/content/art/doodles/index.md b/content/art/doodles/index.md index a650a89..3605873 100644 --- a/content/art/doodles/index.md +++ b/content/art/doodles/index.md | |||
@@ -2,7 +2,7 @@ | |||
2 | title: Doodles | 2 | title: Doodles |
3 | icon: image | 3 | icon: image |
4 | position: 2 | 4 | position: 2 |
5 | list_layout: gallery | 5 | list_layout: gallery-2 |
6 | list_order: date_desc | 6 | list_order: date_desc |
7 | feed: true | 7 | feed: true |
8 | --- | 8 | --- |
diff --git a/content/art/drawings/index.md b/content/art/drawings/index.md index 31d092d..e22731e 100644 --- a/content/art/drawings/index.md +++ b/content/art/drawings/index.md | |||
@@ -2,7 +2,7 @@ | |||
2 | title: Drawings | 2 | title: Drawings |
3 | icon: image | 3 | icon: image |
4 | position: 0 | 4 | position: 0 |
5 | list_layout: gallery | 5 | list_layout: gallery-2 |
6 | list_order: date_desc | 6 | list_order: date_desc |
7 | feed: true | 7 | feed: true |
8 | --- | 8 | --- |
diff --git a/content/art/emojis/index.md b/content/art/emojis/index.md index efeda37..e897989 100644 --- a/content/art/emojis/index.md +++ b/content/art/emojis/index.md | |||
@@ -2,7 +2,7 @@ | |||
2 | title: Emojis | 2 | title: Emojis |
3 | icon: smile | 3 | icon: smile |
4 | position: 1 | 4 | position: 1 |
5 | list_layout: gallery | 5 | list_layout: gallery-2 |
6 | list_order: date_desc | 6 | list_order: date_desc |
7 | feed: true | 7 | feed: true |
8 | --- | 8 | --- |
diff --git a/content/art/index.md b/content/art/index.md index 0b5072b..63032a3 100644 --- a/content/art/index.md +++ b/content/art/index.md | |||
@@ -1,7 +1,7 @@ | |||
1 | --- | 1 | --- |
2 | title: Art | 2 | title: Art |
3 | position: 2 | 3 | position: 2 |
4 | list_layout: small-gallery | 4 | list_layout: gallery-3 |
5 | list_order: date_desc | 5 | list_order: date_desc |
6 | list_limit: 6 | 6 | list_limit: 6 |
7 | feed: true | 7 | feed: true |
diff --git a/content/fediring/index.md b/content/fediring/index.md index 1caffef..fc5a43e 100644 --- a/content/fediring/index.md +++ b/content/fediring/index.md | |||
@@ -1,7 +1,7 @@ | |||
1 | --- | 1 | --- |
2 | title: Fediring | 2 | title: Fediring |
3 | position: 100 | 3 | position: 100 |
4 | list_layout: grid | 4 | list_layout: grid-3 |
5 | url: https://fediring.net/ | 5 | url: https://fediring.net/ |
6 | --- | 6 | --- |
7 | 7 | ||
diff --git a/content/fediring/next.md b/content/fediring/next.md index 3aa08a7..cb85ad7 100644 --- a/content/fediring/next.md +++ b/content/fediring/next.md | |||
@@ -1,6 +1,6 @@ | |||
1 | --- | 1 | --- |
2 | title: Next website | 2 | title: Next website |
3 | position: 2 | 3 | position: 3 |
4 | icon: blank | 4 | icon: blank |
5 | post_icon: arrow-right | 5 | post_icon: arrow-right |
6 | url: https://fediring.net/next?host=volpeon.ink | 6 | url: https://fediring.net/next?host=volpeon.ink |
diff --git a/content/fediring/random.md b/content/fediring/random.md new file mode 100644 index 0000000..5911a85 --- /dev/null +++ b/content/fediring/random.md | |||
@@ -0,0 +1,6 @@ | |||
1 | --- | ||
2 | title: Random website | ||
3 | position: 2 | ||
4 | icon: shuffle | ||
5 | url: https://fediring.net/random | ||
6 | --- | ||
diff --git a/content/profiles/index.md b/content/profiles/index.md index 3007c62..9fe9d8b 100644 --- a/content/profiles/index.md +++ b/content/profiles/index.md | |||
@@ -1,6 +1,6 @@ | |||
1 | --- | 1 | --- |
2 | title: Profiles | 2 | title: Profiles |
3 | position: 1 | 3 | position: 1 |
4 | list_layout: grid | 4 | list_layout: grid-2 |
5 | list_post_icon: arrow-up-right | 5 | list_post_icon: arrow-up-right |
6 | --- | 6 | --- |
diff --git a/content/services/index.md b/content/services/index.md index 9f0dce0..343e028 100644 --- a/content/services/index.md +++ b/content/services/index.md | |||
@@ -1,6 +1,6 @@ | |||
1 | --- | 1 | --- |
2 | title: Services | 2 | title: Services |
3 | position: 4 | 3 | position: 4 |
4 | list_layout: grid | 4 | list_layout: grid-2 |
5 | list_post_icon: arrow-up-right | 5 | list_post_icon: arrow-up-right |
6 | --- | 6 | --- |
diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html index e8466f7..3fabd16 100644 --- a/templates/layouts/categorized_list.html +++ b/templates/layouts/categorized_list.html | |||
@@ -30,11 +30,13 @@ $body$ | |||
30 | $endif$ | 30 | $endif$ |
31 | </header> | 31 | </header> |
32 | <div class="l-card-list__cards l-card-list__cards--$it.layout.id$"> | 32 | <div class="l-card-list__cards l-card-list__cards--$it.layout.id$"> |
33 | $if(it.layout.is_grid)$ | 33 | $if(it.layout.is_grid-2)$ |
34 | $it.items:partials/grid_card()$ | 34 | $it.items:partials/grid_card()$ |
35 | $elseif(it.layout.is_small-gallery)$ | 35 | $elseif(it.layout.is_grid-3)$ |
36 | $it.items:partials/small_gallery_card()$ | 36 | $it.items:partials/grid_card()$ |
37 | $elseif(it.layout.is_gallery)$ | 37 | $elseif(it.layout.is_gallery-2)$ |
38 | $it.items:partials/gallery_card()$ | ||
39 | $elseif(it.layout.is_gallery-3)$ | ||
38 | $it.items:partials/gallery_card()$ | 40 | $it.items:partials/gallery_card()$ |
39 | $else$ | 41 | $else$ |
40 | $it.items:partials/list_card()$ | 42 | $it.items:partials/list_card()$ |
diff --git a/templates/layouts/list.html b/templates/layouts/list.html index 88102b9..ebbc2d4 100644 --- a/templates/layouts/list.html +++ b/templates/layouts/list.html | |||
@@ -7,9 +7,13 @@ $body$ | |||
7 | 7 | ||
8 | <div class="l-card-list"> | 8 | <div class="l-card-list"> |
9 | <div class="l-card-list__cards l-card-list__cards--$list_layout.id$"> | 9 | <div class="l-card-list__cards l-card-list__cards--$list_layout.id$"> |
10 | $if(list_layout.is_grid)$ | 10 | $if(list_layout.is_grid-2)$ |
11 | $list:partials/grid_card()$ | 11 | $list:partials/grid_card()$ |
12 | $elseif(list_layout.is_gallery)$ | 12 | $elseif(list_layout.is_grid-3)$ |
13 | $list:partials/grid_card()$ | ||
14 | $elseif(list_layout.is_gallery-2)$ | ||
15 | $list:partials/gallery_card()$ | ||
16 | $elseif(list_layout.is_gallery-3)$ | ||
13 | $list:partials/gallery_card()$ | 17 | $list:partials/gallery_card()$ |
14 | $else$ | 18 | $else$ |
15 | $list:partials/list_card()$ | 19 | $list:partials/list_card()$ |
diff --git a/templates/partials/small_gallery_card.html b/templates/partials/small_gallery_card.html deleted file mode 100644 index 921d612..0000000 --- a/templates/partials/small_gallery_card.html +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | $if(it.url)$ | ||
2 | $if(it.thumbnail)$ | ||
3 | <a href="$it.url.rel$" class="l-card-list__card c-card"> | ||
4 | <div class="c-card__row l-media l-media--flush"> | ||
5 | <div class="c-card__thumbnail"> | ||
6 | <img | ||
7 | class="c-card__thumbnail-img" | ||
8 | src="$it.thumbnail.rel$" | ||
9 | alt="Preview thumbnail of "$it.title$"" | ||
10 | loading="lazy" | ||
11 | /> | ||
12 | </div> | ||
13 | </div> | ||
14 | <div class="c-card__row l-media c-card__row--hidden"> | ||
15 | <div class="l-media__block l-media__block--main"> | ||
16 | $if(it.subtitle)$ | ||
17 | <strong class="u-d-block u-elp">$it.title$</strong> | ||
18 | <small class="u-d-block u-elp">$it.subtitle$</small> | ||
19 | $elseif(it.category)$ | ||
20 | <small class="u-d-block u-elp">$it.category$</small> | ||
21 | <strong class="u-d-block u-elp">$it.title$</strong> | ||
22 | $elseif(it.date)$ | ||
23 | <time datetime="$it.date.yyyy_mm_dd$"> | ||
24 | <small class="u-d-none@sm-hi"> | ||
25 | $it.date.short$ | ||
26 | </small> | ||
27 | <small class="u-d-none@sm-lo"> | ||
28 | $it.date.long$ | ||
29 | </small> | ||
30 | </time> | ||
31 | <strong class="u-d-block u-elp">$it.title$</strong> | ||
32 | $else$ | ||
33 | $it.title$ | ||
34 | $endif$ | ||
35 | </div> | ||
36 | </div> | ||
37 | </a> | ||
38 | $endif$ | ||
39 | $endif$ | ||