From 456420ce2d13d226a4184cc1a9a71ad16e764939 Mon Sep 17 00:00:00 2001 From: minoplhy Date: Mon, 7 Jun 2021 23:09:29 -0700 Subject: [PATCH] sync --- _layouts/_layouts/default.html | 20 ---------------- _layouts/_layouts/page.html | 14 ------------ _layouts/_layouts/post.html | 38 ------------------------------- _layouts/default.html | 21 ++++++++++++++++- _layouts/{_layouts => }/home.html | 0 _layouts/page.html | 11 ++++++++- _layouts/post.html | 35 +++++++++++++++++++++++++++- _sass/minima-dark/initialize.scss | 8 +++---- assets/css/style.scss | 4 ++-- minima-dark.gemspec | 4 ++-- 10 files changed, 72 insertions(+), 83 deletions(-) delete mode 100644 _layouts/_layouts/default.html delete mode 100644 _layouts/_layouts/page.html delete mode 100644 _layouts/_layouts/post.html rename _layouts/{_layouts => }/home.html (100%) diff --git a/_layouts/_layouts/default.html b/_layouts/_layouts/default.html deleted file mode 100644 index 58e141b..0000000 --- a/_layouts/_layouts/default.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - {%- include head.html -%} - - - - {%- include header.html -%} - -
-
- {{ content }} -
-
- - {%- include footer.html -%} - - - - diff --git a/_layouts/_layouts/page.html b/_layouts/_layouts/page.html deleted file mode 100644 index 01e4b2a..0000000 --- a/_layouts/_layouts/page.html +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: default ---- -
- -
-

{{ page.title | escape }}

-
- -
- {{ content }} -
- -
diff --git a/_layouts/_layouts/post.html b/_layouts/_layouts/post.html deleted file mode 100644 index c9a03be..0000000 --- a/_layouts/_layouts/post.html +++ /dev/null @@ -1,38 +0,0 @@ ---- -layout: default ---- -
- -
-

{{ page.title | escape }}

-

- {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} - - {%- if page.modified_date -%} - ~ - {%- assign mdate = page.modified_date | date_to_xmlschema -%} - - {%- endif -%} - {%- if page.author -%} - • {% for author in page.author %} - - {%- if forloop.last == false %}, {% endif -%} - {% endfor %} - {%- endif -%}

-
- -
- {{ content }} -
- - {%- if site.disqus.shortname -%} - {%- include disqus_comments.html -%} - {%- endif -%} - - -
diff --git a/_layouts/default.html b/_layouts/default.html index cddd070..58e141b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1 +1,20 @@ -{{ content }} + + + + {%- include head.html -%} + + + + {%- include header.html -%} + +
+
+ {{ content }} +
+
+ + {%- include footer.html -%} + + + + diff --git a/_layouts/_layouts/home.html b/_layouts/home.html similarity index 100% rename from _layouts/_layouts/home.html rename to _layouts/home.html diff --git a/_layouts/page.html b/_layouts/page.html index 5e71126..01e4b2a 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,5 +1,14 @@ --- layout: default --- +
-{{ content }} +
+

{{ page.title | escape }}

+
+ +
+ {{ content }} +
+ +
diff --git a/_layouts/post.html b/_layouts/post.html index 5e71126..c9a03be 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,5 +1,38 @@ --- layout: default --- +
-{{ content }} +
+

{{ page.title | escape }}

+

+ {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} + + {%- if page.modified_date -%} + ~ + {%- assign mdate = page.modified_date | date_to_xmlschema -%} + + {%- endif -%} + {%- if page.author -%} + • {% for author in page.author %} + + {%- if forloop.last == false %}, {% endif -%} + {% endfor %} + {%- endif -%}

+
+ +
+ {{ content }} +
+ + {%- if site.disqus.shortname -%} + {%- include disqus_comments.html -%} + {%- endif -%} + + +
diff --git a/_sass/minima-dark/initialize.scss b/_sass/minima-dark/initialize.scss index b7f5eda..cbd4536 100644 --- a/_sass/minima-dark/initialize.scss +++ b/_sass/minima-dark/initialize.scss @@ -43,8 +43,8 @@ $on-large: $on-laptop !default; // Import pre-styling-overrides hook and style-partials. @import - "minima/custom-variables", // Hook to override predefined variables. - "minima/base", // Defines element resets. - "minima/layout", // Defines structure and style based on CSS selectors. - "minima/custom-styles" // Hook to override existing styles. + "minima-dark/custom-variables", // Hook to override predefined variables. + "minima-dark/base", // Defines element resets. + "minima-dark/layout", // Defines structure and style based on CSS selectors. + "minima-dark/custom-styles" // Hook to override existing styles. ; diff --git a/assets/css/style.scss b/assets/css/style.scss index 1762da7..9e2d6ff 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -3,5 +3,5 @@ --- @import - "minima/skins/{{ site.minima.skin | default: 'dark' }}", - "minima/initialize"; + "minima-dark/skins/{{ site.minima.skin | default: 'dark' }}", + "minima-dark/initialize"; diff --git a/minima-dark.gemspec b/minima-dark.gemspec index 157ed66..a646386 100644 --- a/minima-dark.gemspec +++ b/minima-dark.gemspec @@ -6,8 +6,8 @@ Gem::Specification.new do |spec| spec.authors = ["minoplhy"] spec.email = ["zebr@m21.kylz.nl"] - spec.summary = "TODO: Write a short summary, because Rubygems requires one." - spec.homepage = "TODO: Put your gem's website or public repo URL here." + spec.summary = "just test" + spec.homepage = "https://kylz.nl/git/kale/minima-dark" spec.license = "MIT" spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|LICENSE|README|_config\.yml)!i) }