oinam-jekyll 1.1.0 → 1.3.0

data/_includes/css/settings.css

@@ -1,13 +1,13 @@
 :root {
-  --font-family-sans:       system-ui, -apple-system, 'Segoe UI', 'Roboto', Ubuntu, Cantarell, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
-  --font-family-serif:      Georgia, 'Times New Roman', serif;
-  --font-family-monospace:  SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
-  --font-family-cursive:    cursive;
+  --font-family-sans: system-ui, -apple-system, 'Segoe UI', 'Roboto', Ubuntu, Cantarell, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+  /* A more modern Georgia-based serif */
+  --font-family-serif: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
+  --font-family-monospace: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
+  --font-family-cursive: cursive;
 
   /* an ideal reading width - 48rem - 768px based off 16px:1rem */
-  /* 42 is an interesting number. ;-) */
   /* remember to set this to media-queries too if you are not handling it separately */
-  --body-width: 42rem;
+  --body-width: 48rem;
 
   /* default: minor third scale progression */
   --typescale-body: 1.2;
@@ -19,7 +19,7 @@
   --spacing-heading: 1rem;
 
   
-  /* default: minor third scale progression */
+  /* default: minor-third scale progression */
   --space-ratio: 1.2;
 
   --space-base: 1;
@@ -43,7 +43,7 @@
   --space-double: calc(var(--space-base-rem) * 2);
 
 
-  /* typography */
+  /* typography (default) */
   --font-family: var(--font-family-sans);
   --font-family-headings: var(--font-family-sans);
   
@@ -114,10 +114,27 @@
   }
 }
 
-/* when serif font-family for main content */
+/*
+  FONT-FAMILY
+  sans: Everything is Sans-Serif (default)
+  serif: Everything is Serif
+  mixed-sans: Headings are Sans-Serif and Body is Serif
+  mixed-serif: Headings are Serif and Body is Sans-Serif
+
+  TBD: Need to write this better. Making it just work for now.
+  */
+
 {% if site.styles.font_family == 'serif' %}
-:root {
-  --font-family: var(--font-family-serif);
-  --font-family-headings: var(--font-family-serif);
-}
+  :root {
+    --font-family: var(--font-family-serif);
+    --font-family-headings: var(--font-family-serif);
+  }
+{% elsif site.styles.font_family == 'mixed-sans' %}
+  :root {
+    --font-family: var(--font-family-serif);
+  }
+{% elsif site.styles.font_family == 'mixed-serif' %}
+  :root {
+    --font-family-headings: var(--font-family-serif);
+  }
 {% endif %}

data/_includes/css/styles-extended.css

@@ -7,10 +7,14 @@ $breakpoint-medium: 800px;
 $breakpoint-large:  1024px;
 $breakpoint-extralarge: 1600px;
 
+main {
+  /* stick footer to the footer by pushing from the block above it -- main > footer */
+  flex: 1;
+}
+
 header.header,
 footer.footer {
   padding: var(--space-base) 0;
-  font-family: var(--font-family-sans);
 }
 
 header.header {
@@ -45,13 +49,10 @@ header.header h2 {
   font-weight: 400;
 }
 
-header.header :is(h1, h2, h3, h4, h5, h6) {
-  font-family: var(--font-family-sans);
-}
-
 footer.footer {
   margin-top: var(--space-double);
   border-top: var(--border-width) solid var(--border-color);
+  font-size: var(--font-size-small);
 }
 
 .footer__credit {
@@ -64,7 +65,6 @@ nav {
   margin: var(--space-base) 0 0;
   padding: 0;
 
-  font-family: var(--font-family-sans);
   font-size: var(--font-size-smaller);
   text-transform: uppercase;
 }
@@ -90,7 +90,6 @@ nav a:hover, nav a:active {
   }
   
   .content-large,
-  figure,
   img.large,
   img.large + em {
     margin-left: calc(50% - 50vw);
@@ -216,15 +215,9 @@ img.full + em {
 .items-list :is(h1, h2, h3, h4, h5, h6) {
   display: inline-block;
   margin: var(--space-base) var(--space-double) 0;
-  padding: var(--space-quarter) var(--space-base);
+  padding: var(--space-quarter);
 
   color: var(--text-color-alt);
-  background: var(--background-color-alt);
-  border: 1px solid var(--border-color);
-  border-top-left-radius: var(--border-radius);
-  border-top-right-radius: var(--border-radius);
-  border-bottom: 0 none;
-  
   font-size: calc(var(--font-size) * var(--typescale-heading));
 }
 
@@ -321,11 +314,28 @@ img.full + em {
   border-radius: 0;
 }
 
+/* highlighter */
+figure.highlight {}
+
+figure.highlight pre,
+figure.highlight code {
+  background: none;
+}
+
+.highlight {
+  border-radius: var(--border-radius);
+}
+
+.highlight * {
+  color: initial;
+}
+
 /* footnotes are generated by Kramdown powered Markdown */
 .footnotes {
   margin-top: var(--space-double);
   padding: var(--space-base) var(--space-half);
   border-top: var(--border-width) solid var(--border-color);
+  font-family: var(--font-family-sans);
   font-size: var(--font-size-small);
 }
 
@@ -333,6 +343,14 @@ img.full + em {
   text-decoration: none;
 }
 
+.meta-update {
+  margin: var(--space-base) 0;
+  padding: 0;
+  font-size: var(--font-size-smaller);
+  font-style: italic;
+  color: var(--text-color-alt);
+}
+
 /* UTILITIES --------------------------------------- */
 
 /* clamp content to one line */

data/_includes/css/styles.css

@@ -97,9 +97,14 @@ blockquote {
 
   background: var(--background-color-alt);
   border-radius: var(--border-radius);
+  border: var(--border-width) solid var(--background-color-alt);
   border-left: var(--border-width-alt) solid var(--border-color-highlight);
 }
 
+blockquote p {
+  border-radius: var(--border-radius);
+}
+
 cite {
   font-size: var(--font-size-smaller);
   font-style: normal;
@@ -113,7 +118,6 @@ samp {
   font-family: var(--font-family-monospace);
   font-size: var(--font-size-small);
   color: var(--text-color-alt);
-  white-space: pre-line;
 
   /* repair edges of wrapped inline elements */
   -webkit-box-decoration-break: clone;
@@ -132,11 +136,11 @@ pre {
   margin: var(--space-base) 0;
   padding: var(--space-base) var(--space-double);
   max-width: 100%;
-  overflow: auto;
-  overflow-x: auto;
+  tab-size: 2;
 
   background: var(--background-color-alt);
   border-radius: var(--border-radius);
+  border: var(--border-width) solid var(--background-color-alt);
   border-left: var(--border-width-alt) solid var(--border-color-highlight);
 }
 
@@ -144,9 +148,12 @@ pre code {
   background: none;
   margin: 0;
   padding: 0;
+  tab-size: 2;
 }
 
 code {
+  max-width: 100%;
+  white-space: pre-wrap;
   padding: var(--space-quarter) var(--space-half);
   background: var(--background-color-alt);
   border-radius: var(--border-radius);
@@ -221,12 +228,8 @@ main video {
 figure {
   padding: 0;
   margin: var(--space-base) 0;
-
   background: var(--background-color-alt);
   border-radius: var(--border-radius);
-  border-bottom: 1px solid var(--border-color);
-
-  text-align: center;
 }
 
 figure img {
@@ -242,6 +245,11 @@ figcaption {
   
   font-family: var(--font-family-sans);
   font-size: var(--font-size-smaller);
+  text-align: center;
+
+  background: var(--background-color-alt);
+  border-radius: var(--border-radius);
+  border-bottom: 1px solid var(--border-color);
 }
 
 audio {
@@ -267,8 +275,4 @@ th {
 table caption {
   font-weight: bold;
   margin-bottom: var(--space-half);
-}
-
-footer {
-  font-size: var(--font-size-small);
 }

data/_includes/css/{color-theme-nord.css → theme/nord.css}

@@ -23,7 +23,7 @@
   /* aurora */
   --color-nord11: #bf616a;
   --color-nord12: #d08770;
-  --color-nord13: #ebcb8b;
+  --color-nord13: #ebcb8b;  
   --color-nord14: #a3be8c;
   --color-nord15: #b48ead;
 }

data/_includes/header.html

@@ -1,5 +1,9 @@
 <header class="header">
   <h1><a href="{{ site.baseurl | prepend: site.url }}/" title="{{ site.title }}">{{ site.title }}</a></h1>
-  {% if site.description %}<h2>{{ site.description | escape }}</h2>{% endif %}
+  {% if site.description %}
+    {% if site.layout.header_desc != false %}
+      <h2>{{ site.description | escape }}</h2>
+    {% endif %}
+  {% endif %}
   {% include nav.html %}
 </header>

data/_includes/styles.html

@@ -1,9 +1,8 @@
-<style type="text/css">
 {%- capture include_to_scssify -%}
 
   {% include css/settings.css %}
 
-  {% include css/color-theme-{{ site.layout.theme | default: 'default' }}.css %}
+  {% include css/theme/{{ site.layout.theme | default: 'default' }}.css %}
 
   {% include css/styles.css %}
 
@@ -15,7 +14,7 @@
   
   {% if site.styles.syntax_highlighter != false %}
     {% if page.type == posts %}
-      {% include css/styles-code.css %}
+      {% include css/highlighter/{{ site.layout.theme_highlighter | default: 'default' }}.css %}
     {% endif %}
   {% endif %}
 
@@ -24,5 +23,5 @@
   {% endif %}
 
 {%- endcapture -%}
-{{- include_to_scssify | scssify | strip_newlines  -}}
-</style>
+
+{{- include_to_scssify | scssify | strip_newlines  -}}

data/_layouts/default.html

@@ -17,7 +17,14 @@
 <meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
 <meta name="robots" content="index,follow">
 
-{% include styles.html %}
+{% if site.styles.inline != false %}
+  <style type="text/css">
+    {% include styles.html %}
+  </style>
+{% else %}
+  <link rel="stylesheet" href="{{ site.baseurl | prepend: site.url }}/styles.css">
+{% endif %}
+
 {% include head-custom.html %}
 
 </head>

data/_layouts/page.html

@@ -4,5 +4,10 @@ layout: default
 
 <article>
   <h1>{{ page.title | escape }}</h1>
+  
   {{ content }}
+
+  {% if page.update %}
+  <p class="meta-update">Updated on {{ page.update }}.</p>
+  {% endif %}
 </article>

data/_layouts/post.html

@@ -6,21 +6,23 @@ layout: default
   <time datetime="{{ post.date | date: '%Y-%m-%d' }}">{{ page.date | date: '%a, %b %-d, %Y' }}</time>
   <span>{%- include read-time.html -%}</span>
 </div>
-  
+
 <article>
   <h1>{{ page.title }}</h1>
   {{ content }}
 </article>
 
+{%- if page.previous.url or page.next.url -%}
 <div class="post-nav">
   <span>
-    {%- if page.previous.url -%} 
+    {%- if page.previous.url -%}
     <a href="{{ page.previous.url | prepend: site.baseurl | prepend: site.url }}" class="post-nav__prev" title="{{ page.previous.title }}">← Prev</a>
     {%- endif -%}
   </span>
   <span>
-    {%- if page.next.url -%}  
+    {%- if page.next.url -%}
     <a href="{{ page.next.url | prepend: site.baseurl | prepend: site.url }}" class="post-nav__next" title="{{ page.next.title }}">Next →</a>
-    {%- endif -%} 
+    {%- endif -%}
   </span>
-</div>
+</div>
+{%- endif -%}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oinam-jekyll
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Oinam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -96,16 +96,33 @@ files:
 - README.md
 - _data/nav.yml
 - _includes/appearance.html
-- _includes/css/color-theme-default.css
-- _includes/css/color-theme-nord.css
-- _includes/css/color-theme-vintage.css
 - _includes/css/debug.css
 - _includes/css/forms.css
+- _includes/css/highlighter/autumn.css
+- _includes/css/highlighter/borland.css
+- _includes/css/highlighter/bw.css
+- _includes/css/highlighter/colorful.css
+- _includes/css/highlighter/default.css
+- _includes/css/highlighter/emacs.css
+- _includes/css/highlighter/friendly.css
+- _includes/css/highlighter/fruity.css
+- _includes/css/highlighter/manni.css
+- _includes/css/highlighter/monokai.css
+- _includes/css/highlighter/murphy.css
+- _includes/css/highlighter/native.css
+- _includes/css/highlighter/pastie.css
+- _includes/css/highlighter/perldoc.css
+- _includes/css/highlighter/tango.css
+- _includes/css/highlighter/trac.css
+- _includes/css/highlighter/vim.css
+- _includes/css/highlighter/vs.css
 - _includes/css/settings.css
-- _includes/css/styles-code.css
 - _includes/css/styles-extended.css
 - _includes/css/styles.css
 - _includes/css/theme-toggle.css
+- _includes/css/theme/default.css
+- _includes/css/theme/nord.css
+- _includes/css/theme/vintage.css
 - _includes/footer-ext.html
 - _includes/footer.html
 - _includes/gallery.html
@@ -145,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple, clean, and minimal Jekyll Theme.

data/_includes/css/styles-code.css

@@ -1 +0,0 @@
-.highlight .hll{background-color:#ffc}.highlight{background:#f0f3f3}.highlight .c{color:#09f;font-style:italic}.highlight .err{color:#a00;background-color:#faa}.highlight .k{color:#069;font-weight:bold}.highlight .o{color:#555}.highlight .ch{color:#09f;font-style:italic}.highlight .cm{color:#09f;font-style:italic}.highlight .cp{color:#099}.highlight .cpf{color:#09f;font-style:italic}.highlight .c1{color:#09f;font-style:italic}.highlight .cs{color:#09f;font-weight:bold;font-style:italic}.highlight .gd{background-color:#fcc;border:1px solid #c00}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:#030;font-weight:bold}.highlight .gi{background-color:#cfc;border:1px solid #0c0}.highlight .go{color:#aaa}.highlight .gp{color:#009;font-weight:bold}.highlight .gs{font-weight:bold}.highlight .gu{color:#030;font-weight:bold}.highlight .gt{color:#9c6}.highlight .kc{color:#069;font-weight:bold}.highlight .kd{color:#069;font-weight:bold}.highlight .kn{color:#069;font-weight:bold}.highlight .kp{color:#069}.highlight .kr{color:#069;font-weight:bold}.highlight .kt{color:#078;font-weight:bold}.highlight .m{color:#f60}.highlight .s{color:#c30}.highlight .na{color:#309}.highlight .nb{color:#366}.highlight .nc{color:#0a8;font-weight:bold}.highlight .no{color:#360}.highlight .nd{color:#99f}.highlight .ni{color:#999;font-weight:bold}.highlight .ne{color:#c00;font-weight:bold}.highlight .nf{color:#c0f}.highlight .nl{color:#99f}.highlight .nn{color:#0cf;font-weight:bold}.highlight .nt{color:#309;font-weight:bold}.highlight .nv{color:#033}.highlight .ow{color:#000;font-weight:bold}.highlight .w{color:#bbb}.highlight .mb{color:#f60}.highlight .mf{color:#f60}.highlight .mh{color:#f60}.highlight .mi{color:#f60}.highlight .mo{color:#f60}.highlight .sa{color:#c30}.highlight .sb{color:#c30}.highlight .sc{color:#c30}.highlight .dl{color:#c30}.highlight .sd{color:#c30;font-style:italic}.highlight .s2{color:#c30}.highlight .se{color:#c30;font-weight:bold}.highlight .sh{color:#c30}.highlight .si{color:#a00}.highlight .sx{color:#c30}.highlight .sr{color:#3aa}.highlight .s1{color:#c30}.highlight .ss{color:#fc3}.highlight .bp{color:#366}.highlight .fm{color:#c0f}.highlight .vc{color:#033}.highlight .vg{color:#033}.highlight .vi{color:#033}.highlight .vm{color:#033}.highlight .il{color:#f60}