Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
rayterrill committed Jun 9, 2022
1 parent 3dd898e commit 2aa6876
Show file tree
Hide file tree
Showing 14 changed files with 11,388 additions and 86 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ _site
.jekyll-cache
.jekyll-metadata
vendor
.vscode
3 changes: 0 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ source "https://rubygems.org"
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
# gem "jekyll", "~> 4.2.2"
# This is the default theme for new Jekyll sites. You may change this to anything you like.
gem "minima", git: "https://github.com/jekyll/minima"
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
# uncomment the line below. To upgrade, run `bundle update github-pages`.
gem "github-pages", "~> 226", group: :jekyll_plugins
# If you have any plugins, put them here!
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.12"
gem "jekyll-remote-theme", "~> 0.4.3"
end

# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
19 changes: 6 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
GIT
remote: https://github.com/jekyll/minima
revision: 296bf6b872b8450529bee1e48d0ca9be200a4be5
specs:
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -215,10 +206,14 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.15.0)
nokogiri (1.13.6-x86_64-darwin)
racc (~> 1.4)
octokit (4.23.0)
octokit (4.24.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
pathutil (0.16.2)
Expand All @@ -238,7 +233,7 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.9.1)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
simpleidn (0.2.1)
Expand All @@ -264,8 +259,6 @@ DEPENDENCIES
github-pages (~> 226)
http_parser.rb (~> 0.6.0)
jekyll-feed (~> 0.12)
jekyll-remote-theme (~> 0.4.3)
minima!
tzinfo (~> 1.2)
tzinfo-data
wdm (~> 0.1.1)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# TacticalNerdery.com

This site uses the minima template (https://github.com/jekyll/minima), and has a few customizations in the _includes and _layouts folder which override the defaults in the gem.
Migrated to the https://github.com/startbootstrap/startbootstrap-blog-post template.
3 changes: 0 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ baseurl: "" # the subpath of your site, e.g. /blog
url: "" # the base hostname & protocol for your site, e.g. http://example.com

# Build settings
remote_theme: jekyll/minima
minima:
skin: dark
plugins:
- jekyll-feed
show_content: true
3 changes: 0 additions & 3 deletions _includes/custom-head.html

This file was deleted.

4 changes: 2 additions & 2 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<footer class="site-footer h-card">
<footer class="mt-auto py-5 bg-dark footer-top">
<div>
<p class="footer-text">Made w sticks, bubble-gum, and a little bit of <i class="fa-solid fa-heart"></i> by <a href="https://twitter.com/Rayterrill">a dude</a> in Portland.</p>
<p class="m-0 text-center text-white">Made w sticks, bubble-gum, and a little bit of <i class="fa-solid fa-heart"></i> by <a href="https://twitter.com/Rayterrill">a dude</a> in Portland.</p>
</div>
</footer>
55 changes: 20 additions & 35 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,36 +1,21 @@
<header class="site-header">

<div class="wrapper">
{%- assign default_paths = site.pages | map: "path" -%}
{%- assign page_paths = site.header_pages | default: default_paths -%}
{%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
<a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>

{%- if titles_size > 0 -%}
<nav class="site-nav">
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
<label for="nav-trigger">
<span class="menu-icon">
<svg viewBox="0 0 18 15" width="18px" height="15px">
<path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
</svg>
</span>
</label>

<div class="trigger">
{%- for path in page_paths -%}
{%- assign my_page = site.pages | where: "path", path | first -%}
{%- if my_page.title -%}
<a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
{%- endif -%}
{%- endfor -%}
<a href="{{ 'feed.xml' | relative_url }}">
<svg class="svg-icon orange">
<use xlink:href="{{ 'assets/minima-social-icons.svg#rss' | relative_url }}"></use>
</svg><span>Subscribe</span>
</a>
</div>
</nav>
{%- endif -%}
<nav class="navbar navbar-expand-lg navbar-dark bg-dark header-bottom">
{%- assign default_paths = site.pages | map: "path" -%}
{%- assign page_paths = site.header_pages | default: default_paths -%}
{%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
<div class="container">
<a class="navbar-brand" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
{%- for path in page_paths -%}
{%- assign my_page = site.pages | where: "path", path | first -%}
{%- if my_page.title -%}
<li class="nav-item">
<a class="nav-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
</li>
{%- endif -%}
{%- endfor -%}
</ul>
</div>
</div>
</header>
</nav>
38 changes: 27 additions & 11 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,36 @@
<!DOCTYPE html>
<html lang="{{ page.lang | default: site.lang | default: "en" }}">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="" />
<meta name="author" content="" />
<title>tacticalnerdery.com</title>
<!-- Favicon-->
<link rel="icon" type="image/x-icon" href="/assets/favicon.ico" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="/assets/css/styles.css" rel="stylesheet" />
<link href="/assets/css/extra.css" rel="stylesheet" />
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
</head>
<body class="d-flex flex-column min-vh-100 bg-dark">

{%- include head.html -%}
{%- include header.html -%}

<body>
<!-- Page content-->
<div class="container mt-5">
<div class="row">
<div class="col-lg-12">

{%- include header.html -%}
{{ content }}

<main class="page-content" aria-label="Content">
<div class="wrapper">
{{ content }}
</div>
</main>
</div>
</div>
</div>

{%- include footer.html -%}

</body>
{%- include footer.html -%}

<!-- Bootstrap core JS-->
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion _layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<article class="post">

<header class="post-header">
<h1 class="post-title">{{ page.title sdfsdf | escape }}</h1>
<h1 class="post-title">{{ page.title | escape }}</h1>
</header>

<div class="post-content">
Expand Down
32 changes: 26 additions & 6 deletions assets/css/extra.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
.footer-text {
text-align: center;
.header-bottom {
border-bottom: 1px solid #404040;
}

.site-footer {
margin-top: auto;
padding: 5px;
padding-bottom: calc(1em + env(safe-area-inset-bottom));
.footer-top {
border-top: 1px solid #404040;
}

body {
color: #bbb;
}

a {
color: #79b8ff;
text-decoration: none;
}

.post-meta {
font-size: 14px;
color: #999;
}

.post-title {
font-size: 2.625rem;
}

pre code {
color: #d63384;
}
Loading

0 comments on commit 2aa6876

Please sign in to comment.