Merge upstream
This commit is contained in:
@@ -1,22 +1,27 @@
|
||||
---
|
||||
common-css:
|
||||
- "/css/bootstrap.min.css"
|
||||
- "/css/bootstrap-social.css"
|
||||
- "/css/main.css"
|
||||
- "/assets/css/bootstrap-social.css"
|
||||
- "/assets/css/main.css"
|
||||
common-ext-css:
|
||||
- "//maxcdn.bootstrapcdn.com/font-awesome/4.6.0/css/font-awesome.min.css"
|
||||
common-googlefonts:
|
||||
- "Lora:400,700,400italic,700italic"
|
||||
- "Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
|
||||
- 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"
|
||||
- "https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic"
|
||||
- "https://fonts.googleapis.com/css?family=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:
|
||||
- "/js/jquery-1.11.2.min.js"
|
||||
- "/js/bootstrap.min.js"
|
||||
- "/js/main.js"
|
||||
- "/assets/js/main.js"
|
||||
---
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<!-- Beautiful Jekyll | MIT license | Copyright Dean Attali 2016 -->
|
||||
<html lang="{{ page.language | default: site.language | default: 'en' }}">
|
||||
<!-- Beautiful Jekyll | MIT license | Copyright Dean Attali 2020 -->
|
||||
{% include head.html %}
|
||||
|
||||
<body>
|
||||
|
||||
@@ -4,6 +4,6 @@ layout: base
|
||||
|
||||
<div class="intro-header"></div>
|
||||
|
||||
<div role="main" class="container">
|
||||
<div role="main" class="container-md">
|
||||
{{ content }}
|
||||
</div>
|
||||
|
||||
88
landing.bryanroessler.com/_layouts/home.html
Normal file
88
landing.bryanroessler.com/_layouts/home.html
Normal file
@@ -0,0 +1,88 @@
|
||||
---
|
||||
layout: page
|
||||
---
|
||||
|
||||
{{ content }}
|
||||
|
||||
{% assign posts = paginator.posts | default: site.posts %}
|
||||
|
||||
<div class="posts-list">
|
||||
{% for post in posts %}
|
||||
<article class="post-preview">
|
||||
<a href="{{ post.url | absolute_url }}">
|
||||
<h2 class="post-title">{{ post.title }}</h2>
|
||||
|
||||
{% if post.subtitle %}
|
||||
<h3 class="post-subtitle">
|
||||
{{ post.subtitle }}
|
||||
</h3>
|
||||
{% endif %}
|
||||
</a>
|
||||
|
||||
<p class="post-meta">
|
||||
{% assign date_format = site.date_format | default: "%B %-d, %Y" %}
|
||||
Posted on {{ post.date | date: date_format }}
|
||||
</p>
|
||||
|
||||
<div class="post-entry-container">
|
||||
{%- capture thumbnail -%}
|
||||
{% if post.thumbnail-img %}
|
||||
{{ post.thumbnail-img }}
|
||||
{% elsif post.cover-img %}
|
||||
{% if post.cover-img.first %}
|
||||
{{ post.cover-img[0].first.first }}
|
||||
{% else %}
|
||||
{{ post.cover-img }}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{% endif %}
|
||||
{% endcapture %}
|
||||
{% assign thumbnail=thumbnail | strip %}
|
||||
{% if thumbnail != "" %}
|
||||
<div class="post-image">
|
||||
<a href="{{ post.url | absolute_url }}">
|
||||
<img src="{{ thumbnail | absolute_url }}">
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="post-entry">
|
||||
{% assign excerpt_length = site.excerpt_length | default: 50 %}
|
||||
{{ 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 | absolute_url }}" class="post-read-more">[Read More]</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if post.tags.size > 0 %}
|
||||
<div class="blog-tags">
|
||||
Tags:
|
||||
{% if site.link-tags %}
|
||||
{% for tag in post.tags %}
|
||||
<a href="{{ '/tags' | absolute_url }}#{{- tag -}}">{{- tag -}}</a>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
{{ post.tags | join: ", " }}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</article>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{% if paginator.total_pages > 1 %}
|
||||
<ul class="pagination main-pager">
|
||||
{% if paginator.previous_page %}
|
||||
<li class="page-item previous">
|
||||
<a class="page-link" href="{{ paginator.previous_page_path | absolute_url }}">← Newer Posts</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if paginator.next_page %}
|
||||
<li class="page-item next">
|
||||
<a class="page-link" href="{{ paginator.next_page_path | absolute_url }}">Older Posts →</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
@@ -1,20 +1,26 @@
|
||||
---
|
||||
common-css:
|
||||
- "/css/bootstrap.min.css"
|
||||
- "/css/main-minimal.css"
|
||||
common-js:
|
||||
- "/js/jquery-1.11.2.min.js"
|
||||
- "/js/bootstrap.min.js"
|
||||
- "/assets/css/main-minimal.css"
|
||||
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>
|
||||
<html lang="en">
|
||||
<html lang="{{ page.language | default: site.language | default: 'en' }}">
|
||||
|
||||
{% include head.html %}
|
||||
|
||||
<body>
|
||||
|
||||
<div role="main" class="container main-content">
|
||||
<div role="main" class="container-md main-content">
|
||||
{{ content }}
|
||||
</div>
|
||||
|
||||
|
||||
@@ -4,22 +4,11 @@ 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 }}
|
||||
{% if page.comments %}
|
||||
<div class="disqus-comments">
|
||||
{% include disqus.html %}
|
||||
</div>
|
||||
{% include fb-comment.html %}
|
||||
<div class="staticman-comments">
|
||||
{% include staticman-comments.html %}
|
||||
</div>
|
||||
<div class="justcomments-comments">
|
||||
{% include just_comments.html %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% include comments.html %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -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,31 +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}}">← 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}}">← 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 →</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 →</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
{% if page.comments %}
|
||||
<div class="disqus-comments">
|
||||
{% include disqus.html %}
|
||||
</div>
|
||||
{% include fb-comment.html %}
|
||||
<div class="staticman-comments">
|
||||
{% include staticman-comments.html %}
|
||||
</div>
|
||||
<div class="justcomments-comments">
|
||||
{% include just_comments.html %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% include comments.html %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user