yttt/yamatotoma.to
2
0
Fork 0
Code Pull requests Activity Actions

upgrade to bootstrap 4, complete rewrite of template (#629)

Browse source
This commit is contained in:
Dean Attali 2020-05-02 02:10:20 -04:00 • committed by GitHub
parent 67bd8058c7
commit 54ca402373
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 642 additions and 10358 deletions
Download patch file Download diff file Expand all files Collapse all files

16
_layouts/base.html
View file

@ -1,22 +1,28 @@
---
common-css:
- "/assets/css/bootstrap.min.css"
- "/assets/css/bootstrap-social.css"
- "/assets/css/main.css"
common-ext-css:
- "//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css"
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
- "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css"
common-googlefonts:
- "Lora:400,700,400italic,700italic"
- "Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
common-ext-js:
- href: "https://code.jquery.com/jquery-3.4.1.min.js"
sri: "sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
- href: "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
sri: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
sri: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
common-js:
- "/assets/js/jquery-1.11.2.min.js"
- "/assets/js/bootstrap.min.js"
- "/assets/js/main.js"
---
<!DOCTYPE html>
<html lang="{{ page.language | default: site.language | default: 'en' }}">
<!-- Beautiful Jekyll | MIT license | Copyright Dean Attali 2016 -->
<!-- Beautiful Jekyll | MIT license | Copyright Dean Attali 2020 -->
{% include head.html %}
<body>

2
_layouts/default.html
View file

@ -4,6 +4,6 @@ layout: base
<div class="intro-header"></div>
<div role="main" class="container">
<div role="main" class="container-md">
{{ content }}
</div>

12
_layouts/home.html
View file

@ -34,7 +34,7 @@ layout: page
{% endif %}
<div class="post-entry">
{% assign excerpt_length = site.excerpt_length | default: 50 %}
{{ post.excerpt | strip_html | xml_escape | truncatewords: excerpt_length }}
{{ post.excerpt | strip_html | xml_escape | truncatewords: excerpt_length }}
{% assign excerpt_word_count = post.excerpt | number_of_words %}
{% if post.content != post.excerpt or excerpt_word_count > excerpt_length %}
<a href="{{ post.url | relative_url }}" class="post-read-more">[Read&nbsp;More]</a>
@ -60,15 +60,15 @@ layout: page
</div>
{% if paginator.total_pages > 1 %}
<ul class="pager main-pager">
<ul class="pagination main-pager">
{% if paginator.previous_page %}
<li class="previous">
<a href="{{ paginator.previous_page_path | relative_url }}">&larr; Newer Posts</a>
<li class="page-item previous">
<a class="page-link" href="{{ paginator.previous_page_path | relative_url }}">&larr; Newer Posts</a>
</li>
{% endif %}
{% if paginator.next_page %}
<li class="next">
<a href="{{ paginator.next_page_path | relative_url }}">Older Posts &rarr;</a>
<li class="page-item next">
<a class="page-link" href="{{ paginator.next_page_path | relative_url }}">Older Posts &rarr;</a>
</li>
{% endif %}
</ul>

16
_layouts/minimal.html
View file

@ -1,10 +1,16 @@
---
common-css:
- "/assets/css/bootstrap.min.css"
- "/assets/css/main-minimal.css"
common-js:
- "/assets/js/jquery-1.11.2.min.js"
- "/assets/js/bootstrap.min.js"
common-ext-css:
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
common-ext-js:
- href: "https://code.jquery.com/jquery-3.4.1.min.js"
sri: "sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
- href: "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
sri: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
sri: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
---
<!DOCTYPE html>
@ -14,7 +20,7 @@ common-js:
<body>
<div role="main" class="container main-content">
<div role="main" class="container-md main-content">
{{ content }}
</div>

4
_layouts/page.html
View file

@ -4,9 +4,9 @@ layout: base
{% include header.html type="page" %}
<div class="container" role="main">
<div class="container-md" role="main">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
{{ content }}
{% include comments.html %}
</div>

16
_layouts/post.html
View file

@ -4,9 +4,9 @@ layout: base
{% include header.html type="post" %}
<div class="container">
<div class="container-md">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
{% if page.gh-repo %}
{% assign gh_split = page.gh-repo | split:'/' %}
@ -52,19 +52,19 @@ layout: base
{% include social-share.html %}
{% endif %}
<ul class="pager blog-pager">
<ul class="pagination blog-pager">
{% if page.previous.url %}
<li class="previous">
<a href="{{ page.previous.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title}}">&larr; Previous Post</a>
<li class="page-item previous">
<a class="page-link" href="{{ page.previous.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title}}">&larr; Previous Post</a>
</li>
{% endif %}
{% if page.next.url %}
<li class="next">
<a href="{{ page.next.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title}}">Next Post &rarr;</a>
<li class="page-item next">
<a class="page-link" href="{{ page.next.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title}}">Next Post &rarr;</a>
</li>
{% endif %}
</ul>
{% include comments.html %}
{% include comments.html %}
</div>
</div>
</div>