From 4d7f767451bc275f7cd4f1d9ad030f3c62dfffe9 Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Sun, 19 Apr 2020 11:37:40 -0400
Subject: [PATCH] Make a tweak to the site layout
---
_includes/head.html | 2 +-
_layouts/about.html | 35 ------------------------------
_layouts/events.html | 10 +++++----
_layouts/page.html | 9 ++++----
_layouts/portfolio.html | 48 +++++++++++++++++++++++++++++++++++++++++
_layouts/post.html | 30 ++++++++------------------
_layouts/posts.html | 7 +++---
about.md | 3 ++-
assets/css/main.css | 16 ++++++++++++++
blog/index.md | 1 +
events.md | 2 ++
index.md | 1 +
music.md | 1 +
portfolio.md | 5 +++++
14 files changed, 100 insertions(+), 70 deletions(-)
delete mode 100644 _layouts/about.html
create mode 100644 _layouts/portfolio.html
create mode 100644 portfolio.md
diff --git a/_includes/head.html b/_includes/head.html
index d10dfa6..50a7f3d 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,5 +1,5 @@
<head>
- <title>{{ site.title }}</title>
+ <title>{{page.title}} | {{ site.title }}</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
diff --git a/_layouts/about.html b/_layouts/about.html
deleted file mode 100644
index d219b00..0000000
--- a/_layouts/about.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% include head.html %}
-
-<body>
-
- <div class="site-ctr">
- <!-- Navbar -->
- {% include nav.html %}
- <!-- <div style="height:5vh"></div> -->
-
- <div class="reactive-bg">
- <div class="post container" style="min-height:100vh">
- <h1>About Me</h1>
- <hr>
- {{content}}
- </div>
- </div>
-
- </div>
- <br>
-
- <div class="reactive-bg">
- <div class="post container" id="advert">
- <span >
- Site design by: <a href="https://retrylife.ca">Evan Pratten</a> |
-
- This site was last updated at: {{site.time}}
- </span>
- </div>
- </div>
-
- {% include footer.html %}
-
-
-
-</body>
\ No newline at end of file
diff --git a/_layouts/events.html b/_layouts/events.html
index accad72..a82e9aa 100644
--- a/_layouts/events.html
+++ b/_layouts/events.html
@@ -7,11 +7,13 @@
{% include nav.html %}
<div class="reactive-bg">
- <div class="post container">
- <h1>Events</h1>
- <p>Here is a list of notable events I am attending / have attended</p>
- <hr>
+ <div class="title container">
+ <h1>{{page.title}}</h1>
+ <h4>{{page.description}}</h4>
+ </div><br>
+
+ <div class="post container">
<div class="list-group" id="posts">
{% for event in site.data.events %}
diff --git a/_layouts/page.html b/_layouts/page.html
index 1b81e0f..14300cd 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -7,13 +7,12 @@
{% include nav.html %}
<div class="reactive-bg">
- <div class="post container">
+
+ <div class="title container">
<h1>{{page.title}}</h1>
+ </div><br>
- <hr>
-
- <br>
-
+ <div class="post container">
{{content}}
</div>
</div>
diff --git a/_layouts/portfolio.html b/_layouts/portfolio.html
new file mode 100644
index 0000000..926e2b5
--- /dev/null
+++ b/_layouts/portfolio.html
@@ -0,0 +1,48 @@
+{% include head.html %}
+
+<body>
+
+ <div class="site-ctr">
+ <!-- Navbar -->
+ {% include nav.html %}
+
+ <div class="reactive-bg">
+
+ <div class="title container">
+ <h1>{{page.title}}</h1>
+ </div>
+
+ <br>
+
+ <div class="post container">
+
+ <div id="carouselExampleControls" class="carousel slide" data-ride="carousel" data-interval="">
+ <div class="carousel-inner">
+ <div class="carousel-item active">
+ <img src="https://scontent-yyz1-1.cdninstagram.com/v/t51.2885-15/e35/92883275_1027088314352400_5268990124422184925_n.jpg?_nc_ht=scontent-yyz1-1.cdninstagram.com&_nc_cat=100&_nc_ohc=VG8O-JDDnFIAX8F34ZK&oh=a18700b43d9c251b62bc4d034dec772b&oe=5EC66F96" class="d-block w-100" alt="...">
+ </div>
+ <div class="carousel-item">
+ <img src="..." class="d-block w-100" alt="...">
+ </div>
+ <div class="carousel-item">
+ <img src="..." class="d-block w-100" alt="...">
+ </div>
+ </div>
+ <a class="carousel-control-prev" href="#carouselExampleControls" role="button" data-slide="prev">
+ <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+ <span class="sr-only">Previous</span>
+ </a>
+ <a class="carousel-control-next" href="#carouselExampleControls" role="button" data-slide="next">
+ <span class="carousel-control-next-icon" aria-hidden="true"></span>
+ <span class="sr-only">Next</span>
+ </a>
+ </div>
+
+ </div>
+ </div>
+
+ </div>
+ {% include footer.html %}
+
+
+</body>
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index e1dc270..8b0b8fe 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -6,27 +6,17 @@
<div class="site-ctr">
<!-- Navbar -->
{% include nav.html %}
- <!-- <div style="height:5vh"></div> -->
-
- <!-- Header -->
- <!-- <div class="header">
- <div class="container">
- <div class="content">
- </div>
- </div>
- <div class="header-gap"></div>
- </div> -->
<div class="reactive-bg">
+
+ <div class="title container">
+ <h1>{{page.title}}</h1>
+ <h4>{{page.description}}</h4>
+ </div><br>
+
+
<div class="post container">
- <h1>{{page.title}}
-
- </h1>
- <h4>{{page.description}}
-
- </h4>
- <hr>
- <p>
+ <p class="post-date">
<em>
<!-- Date -->
{{page.date}}
@@ -38,14 +28,12 @@
<!-- Permalink -->
{% if page.redirect_from %}
- <a href="{{site.baseurl}}{{page.redirect_from[0]}}"><i class="fas fa-link"></i></a>
+ <!-- <a href="{{site.baseurl}}{{page.redirect_from[0]}}"><i class="fas fa-link"></i></a> -->
{% endif %}
</em>
</p>
- <br>
-
{{content}}
</div>
</div>
diff --git a/_layouts/posts.html b/_layouts/posts.html
index f0cd3a0..8bbdde6 100644
--- a/_layouts/posts.html
+++ b/_layouts/posts.html
@@ -17,10 +17,11 @@
</div> -->
<div class="reactive-bg">
- <div class="post container">
- <h1>Posts</h1>
- <hr>
+ <div class="title container">
+ <h1>{{page.title}}</h1>
+ </div><br>
+ <div class="post container">
<div class="list-group" id="posts">
<a href="#posts"
class="feature list-group-item list-group-item-action list-group-item-dark ">Featured
diff --git a/about.md b/about.md
index 94c765f..5974f9d 100644
--- a/about.md
+++ b/about.md
@@ -1,5 +1,6 @@
---
-layout: about
+title: About Me
+layout: page
permalink: /about/
---
{{site.about}}
diff --git a/assets/css/main.css b/assets/css/main.css
index 8c10b12..dbebde5 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -280,6 +280,22 @@ a h5 {
background-color: #fff;
}
+.title.container{
+ text-align:center;
+ padding-top:15px;
+ padding-bottom:15px;
+ padding-left: 20px;
+ font-family: 'IBM Plex Sans', sans-serif;
+ box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.4), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+ border-radius: 5px;
+ /* transform: translateY(-30px); */
+ background-color: #fff;
+}
+
+.post-date{
+ color:rgba(182, 182, 182, 0.602);
+}
+
#advert {
/* background-color: #343a40; */
/* color:#fff; */
diff --git a/blog/index.md b/blog/index.md
index 4d92b47..3914285 100644
--- a/blog/index.md
+++ b/blog/index.md
@@ -1,3 +1,4 @@
---
+title: Blog Posts
layout: posts
---
\ No newline at end of file
diff --git a/events.md b/events.md
index 53d5c0d..96d76c1 100644
--- a/events.md
+++ b/events.md
@@ -1,3 +1,5 @@
---
+title: Events
+description: Notable events I am attending / have attended
layout: events
---
\ No newline at end of file
diff --git a/index.md b/index.md
index 0671507..83f1d34 100644
--- a/index.md
+++ b/index.md
@@ -2,5 +2,6 @@
# Feel free to add content and custom Front Matter to this file.
# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+title: Home
layout: home
---
diff --git a/music.md b/music.md
index 17f5efa..e37c9e1 100644
--- a/music.md
+++ b/music.md
@@ -1,3 +1,4 @@
---
+title: Music
layout: music
---
diff --git a/portfolio.md b/portfolio.md
new file mode 100644
index 0000000..a53efe2
--- /dev/null
+++ b/portfolio.md
@@ -0,0 +1,5 @@
+---
+title: Portfolio
+layout: portfolio
+---
+