Skip to content

Commit

Permalink
Move stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
AlphaGameDeveloper committed Apr 14, 2024
1 parent 9ba9516 commit ed01b34
Show file tree
Hide file tree
Showing 3 changed files with 151 additions and 185 deletions.
58 changes: 58 additions & 0 deletions _includes/metadata.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<!-- BEGIN TEMPLATE metadata.html -->
{% if page.title %}
<!-- Using page.title as it is present -->
<title>{{ page.title }} &bull; {{ site.title }}</title>
{% else %}
<!-- page.title does not exist; Falling back to site.title -->
<title>{{ site.title }}</title>
{% endif %}

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="keywords" content="blog, accent, {{ site.author }}, {{ site.title }}, jekyll">
<meta name="author" content="{{ site.author }}">
{% if page.description %}
{% assign desc = page.description %}
{% else %}
{% assign desc = site.description %}
{% endif %}
{% if page.url %}
{% assign url = site.url | append: site.baseurl | append: page.url %}
{% else %}
{% assign url = site.url | append: site.baseurl | append: page.url %}
{% endif %}
<meta name="description" content="{{ desc }}">
<link href='https://fonts.googleapis.com/css?family=Inconsolata:400,700' rel='stylesheet' type='text/css'>
<link rel="alternate" type="application/rss+xml" title="{{ site.title }} RSS" href="/feed.xml" />
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
{% if site.favicon %}
<!-- Using site.favicon as it is defined -->
<link rel="icon" type="image/ico" href="{{ site.favicon_location }}">
<link rel="shortcut-icon" type="image/ico" href="{{ site.favicon_location }}">
{% endif %}
{% if site.twitter_username %}
<!-- Using site.twitter_username as it is defined -->
<link rel="author" href="https://twitter.com/{{ site.twitter_username }}">
{% endif %}
<!-- Facebook Open Graph -->
<meta name="og:description" content="{{ desc }}">
<meta name="og:title" content="{{ site.title }}">
<meta name="og:url" content="{{ url }}">
<meta name="og:type" content="article">
{% if site.og_image %}
<meta name="og:image" content="{{ site.og_image }}">
{% endif %}
{% if site.facebook_id %}
<meta name="fb:admins" content="{{ site.facebook_id }}">
{% endif %}
<!-- Twitter -->
<meta name="twitter:card" content="summary">
<meta name="twitter:title" content="{{ site.title }}">
<meta name="twitter:description" content="{{ desc }}">
<meta name="twitter:url" content="{{ url }}">
{% if site.twitter_image %}
<meta name="twitter:image" content="{{ site.twitter_image }}">
{% else %}
<meta name="twitter:image" content="{{ site.profile_picture }}">
{% endif %}
<!-- END TEMPLATE metadata.html -->
138 changes: 46 additions & 92 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,92 +1,46 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>{% if page.title %}{{ page.title }} &bull; {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="keywords" content="blog, accent, {{ site.author }}, {{ site.title }}, jekyll">
<meta name="author" content="{{ site.author }}">
{% if page.description %}
{% assign desc = page.description %}
{% else %}
{% assign desc = site.description %}
{% endif %}
{% if page.url %}
{% assign url = site.url | append: site.baseurl | append: page.url %}
{% else %}
{% assign url = site.url | append: site.baseurl | append: page.url %}
{% endif %}
<meta name="description" content="{{ desc }}">
<link href='https://fonts.googleapis.com/css?family=Inconsolata:400,700' rel='stylesheet' type='text/css'>
<link rel="alternate" type="application/rss+xml" title="{{ site.title }} RSS" href="/feed.xml" />
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
{% if site.favicon %}
<link rel="icon" type="image/ico" href="{{ site.favicon_location }}">
<link rel="shortcut-icon" type="image/ico" href="{{ site.favicon_location }}">
{% endif %}
{% if site.twitter_username %}
<link rel="author" href="https://twitter.com/{{ site.twitter_username }}">
{% endif %}
<!-- Facebook Open Graph -->
<meta name="og:description" content="{{ desc }}">
<meta name="og:title" content="{{ site.title }}">
<meta name="og:url" content="{{ url }}">
<meta name="og:type" content="article">
{% if site.og_image %}
<meta name="og:image" content="{{ site.og_image }}">
{% endif %}
{% if site.facebook_id %}
<meta name="fb:admins" content="{{ site.facebook_id }}">
{% endif %}
<!-- Twitter -->
<meta name="twitter:card" content="summary">
<meta name="twitter:title" content="{{ site.title }}">
<meta name="twitter:description" content="{{ desc }}">
<meta name="twitter:url" content="{{ url }}">
{% if site.twitter_image %}
<meta name="twitter:image" content="{{ site.twitter_image }}">
{% else %}
<meta name="twitter:image" content="{{ site.profile_picture }}">
{% endif %}
{% include head.html %}
{% include gtag.html %}
</head>
<body>
<div class="wrapper">
<div class="navbar container">
{% if site.ins_logo %}
<img id="ins-logo" src="{{ site.ins_logo }}" />
{% endif %}
<a id="author-name" class="alignable pull-left" href="{{ site.url }}{{ site.baseurl }}">{{ site.title }}</a>
<ul id="navlist" class="alignable pull-right navbar-ul">
{% for x in site.nav %}
{% if x.name == "Resume" %}
<li class="alignable pull-left nav-list"><a target="_blank" href="{{ x.link }}">{{ x.name }}</a>
{% else %}
<li class="alignable pull-left nav-list"><a href="{{ x.link }}">{{ x.name }}</a>
{% endif %}
{% if forloop.last == false %}
/
{% endif %}
</li>
{% endfor %}
</ul>
{% include message.html %}
{% include noscript.html %}
</div>
<div style="clear:both"></div>
<hr>
{% if page.is_contact == true %}
<div class="container content contact">
{% else %}
<div class="container content">
{% endif %}
{{ content }}
{% include footer.html %}
</div>
</div>

</body>
<footer>
</footer>
<!DOCTYPE html>
<html lang="en">
<head>

{% include metadata.html %}
{% include head.html %}
{% include gtag.html %}
</head>
<body>
<div class="wrapper">
<div class="navbar container">
{% if site.ins_logo %}
<img id="ins-logo" src="{{ site.ins_logo }}" />
{% endif %}
<a id="author-name" class="alignable pull-left" href="{{ site.url }}{{ site.baseurl }}">{{ site.title }}</a>
<ul id="navlist" class="alignable pull-right navbar-ul">
{% for x in site.nav %}
{% if x.name == "Resume" %}
<li class="alignable pull-left nav-list"><a target="_blank" href="{{ x.link }}">{{ x.name }}</a>
{% else %}
<li class="alignable pull-left nav-list"><a href="{{ x.link }}">{{ x.name }}</a>
{% endif %}
{% if forloop.last == false %}
/
{% endif %}
</li>
{% endfor %}
</ul>
{% include message.html %}
{% include noscript.html %}
</div>
<div style="clear:both"></div>
<hr>
{% if page.is_contact == true %}
<div class="container content contact">
{% else %}
<div class="container content">
{% endif %}
{{ content }}
{% include footer.html %}
</div>
</div>

</body>
<footer>
</footer>
140 changes: 47 additions & 93 deletions _layouts/post.html
Original file line number Diff line number Diff line change
@@ -1,93 +1,47 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>{% if page.title %}{{ page.title }} &bull; {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="keywords" content="blog, accent, {{ site.author }}, {{ site.title }}, jekyll">
<meta name="author" content="{{ site.author }}">
{% if page.description %}
{% assign desc = page.description %}
{% else %}
{% assign desc = site.description %}
{% endif %}
{% if page.url %}
{% assign url = site.url | append: site.baseurl | append: page.url %}
{% else %}
{% assign url = site.url | append: site.baseurl | append: page.url %}
{% endif %}
<meta name="description" content="{{ desc }}">
<link href='https://fonts.googleapis.com/css?family=Inconsolata:400,700' rel='stylesheet' type='text/css'>
<link rel="alternate" type="application/rss+xml" title="{{ site.title }} RSS" href="/feed.xml" />
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
{% if site.favicon %}
<link rel="icon" type="image/ico" href="{{ site.favicon_location }}">
<link rel="shortcut-icon" type="image/ico" href="{{ site.favicon_location }}">
{% endif %}
{% if site.twitter_username %}
<link rel="author" href="https://twitter.com/{{ site.twitter_username }}">
{% endif %}
<!-- Facebook Open Graph -->
<meta name="og:description" content="{{ desc }}">
<meta name="og:title" content="{{ site.title }}">
<meta name="og:url" content="{{ url }}">
<meta name="og:type" content="article">
{% if site.og_image %}
<meta name="og:image" content="{{ site.og_image }}">
{% endif %}
{% if site.facebook_id %}
<meta name="fb:admins" content="{{ site.facebook_id }}">
{% endif %}
<!-- Twitter -->
<meta name="twitter:card" content="summary">
<meta name="twitter:title" content="{{ site.title }}">
<meta name="twitter:description" content="{{ desc }}">
<meta name="twitter:url" content="{{ url }}">
{% if site.twitter_image %}
<meta name="twitter:image" content="{{ site.twitter_image }}">
{% else %}
<meta name="twitter:image" content="{{ site.profile_picture }}">
{% endif %}
{% include head.html %}
{% include gtag.html %}
</head>
<body>
<div class="wrapper">
<div class="navbar container">
{% if site.ins_logo %}
<img id="ins-logo" src="{{ site.ins_logo }}" />
{% endif %}
<a id="author-name" class="alignable pull-left" href="{{ site.url }}{{ site.baseurl }}">{{ site.title }}</a>
<ul id="navlist" class="alignable pull-right navbar-ul">
{% for x in site.nav %}
{% if x.name == "Resume" %}
<li class="alignable pull-left nav-list"><a target="_blank" href="{{ x.link }}">{{ x.name }}</a>
{% else %}
<li class="alignable pull-left nav-list"><a href="{{ x.link }}">{{ x.name }}</a>
{% endif %}
{% if forloop.last == false %}
/
{% endif %}
</li>
{% endfor %}
</ul>
{% include message.html %}
</div>
<div style="clear:both"></div>
<hr>
{% if page.is_contact == true %}
<div class="container content contact">
{% else %}
<div class="container content">
{% endif %}
<h1>{{ page.title }}</h1>
{{ content }}
{% include footer.html %}
{% include noscript.html %}
</div>
</div>
<script src="/assets/js/externalLink.js"></script>
</body>
<footer>
</footer>
<!DOCTYPE html>
<html lang="en">
<head>

{% include metadata.html %}
{% include head.html %}
{% include gtag.html %}
</head>
<body>
<div class="wrapper">
<div class="navbar container">
{% if site.ins_logo %}
<img id="ins-logo" src="{{ site.ins_logo }}" />
{% endif %}
<a id="author-name" class="alignable pull-left" href="{{ site.url }}{{ site.baseurl }}">{{ site.title }}</a>
<ul id="navlist" class="alignable pull-right navbar-ul">
{% for x in site.nav %}
{% if x.name == "Resume" %}
<li class="alignable pull-left nav-list"><a target="_blank" href="{{ x.link }}">{{ x.name }}</a>
{% else %}
<li class="alignable pull-left nav-list"><a href="{{ x.link }}">{{ x.name }}</a>
{% endif %}
{% if forloop.last == false %}
/
{% endif %}
</li>
{% endfor %}
</ul>
{% include message.html %}
</div>
<div style="clear:both"></div>
<hr>
{% if page.is_contact == true %}
<div class="container content contact">
{% else %}
<div class="container content">
{% endif %}
<h1>{{ page.title }}</h1>
{{ content }}
{% include footer.html %}
{% include noscript.html %}
</div>
</div>
<script src="/assets/js/externalLink.js"></script>
</body>
<footer>
</footer>

0 comments on commit ed01b34

Please sign in to comment.