From 3e9024451e602949807487702bb69ba3d0673c12 Mon Sep 17 00:00:00 2001 From: Awstin Date: Sun, 7 Jul 2024 08:16:21 -0400 Subject: [PATCH] Changed navbar to icons, moved content div into base template --- assets/main.css | 72 +++++++++++++++++++++-------------- templates/about.html | 2 - templates/article.html | 7 +--- templates/base.html | 84 +++++++++++++++++++++++++++++++++++------ templates/blog.html | 5 --- templates/contact.html | 2 - templates/gifts.html | 2 - templates/home.html | 1 + templates/now.html | 2 - templates/projects.html | 4 -- templates/uses.html | 2 - 11 files changed, 119 insertions(+), 64 deletions(-) diff --git a/assets/main.css b/assets/main.css index 81f00b6..7fa2d86 100644 --- a/assets/main.css +++ b/assets/main.css @@ -41,11 +41,6 @@ html { padding: 0.25rem; } -body { - width: 60%; - margin: auto; -} - h1 { font-size: 2.25rem; /* 36px */ line-height: 2.5rem; /* 40px */ @@ -63,7 +58,7 @@ h3 { } a { - color: var(--orange); + color: var(--blue); text-decoration: none; } @@ -77,23 +72,7 @@ p { } code { - color: var(--blue); -} - -.navbar { - overflow: hidden; - text-align: center; - margin: 0px; -} - -.navbar-list { - paddign: 0px; - display: flex; - justify-content: space-between; - list-style-type: none; - font-size: 1.5rem; /* 24px */ - line-height: 2rem; /* 32px */ - color: var(--red); + color: var(--purple); } img { @@ -105,6 +84,36 @@ img { font-weight: bold; } +.container { + display: flex; +} + +.sidebar { + width: 250px; + height: 100vh; + padding-top: 20px; + position: fixed; +} + +.sidebar ul { + list-style-type: none; + padding: 0; +} + +.sidebar ul li { + padding: 10px; +} + +.sidebar ul li a { + text-decoration: none; +} + +.content { + width: 60%; + margin: auto; + padding: 20px; +} + @media (max-width: 1024px) { html { line-height: 1.75rem; @@ -112,7 +121,17 @@ img { padding: 0.25rem; } - body { + .container { + flex-direction: column; + } + + .sidebar { + width: 100%; + height: auto; + position: static; + } + + .content { width: 90%; } @@ -130,9 +149,4 @@ img { font-size: 1rem; /* 16px */ line-height: 1.5rem; /* 24px */ } - - .navbar-list { - font-size: 1.125rem; /* 18px */ - line-height: 1.75rem; /* 28px */ - } } diff --git a/templates/about.html b/templates/about.html index 438ddbe..1686378 100644 --- a/templates/about.html +++ b/templates/about.html @@ -2,7 +2,6 @@ {% extends "base.html" %} {% block content %} -

General

My greatest joy in life is learning new things. @@ -58,5 +57,4 @@ Trying to live more in line with what feels right internally. A wonderful exploration and adventure.

-
{% endblock %} diff --git a/templates/article.html b/templates/article.html index 73ba9ae..fdf4904 100755 --- a/templates/article.html +++ b/templates/article.html @@ -2,11 +2,8 @@ {% extends "base.html" %} {% block content %} -
{{content|safe}} -
- - {% endblock %} diff --git a/templates/base.html b/templates/base.html index 2bcce53..aa4655f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,18 +11,80 @@ -

Awstin Chubb

-
- +
+ +
+ {% block content %}{% endblock %} +
- {% block content %}{% endblock %} - Top diff --git a/templates/blog.html b/templates/blog.html index 504b869..c210ed5 100644 --- a/templates/blog.html +++ b/templates/blog.html @@ -2,12 +2,7 @@ {% extends "base.html" %} {% block content %} -
-
    {{article_list|safe}}
- -
- {% endblock %} diff --git a/templates/contact.html b/templates/contact.html index e62a41f..1fc8190 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -2,10 +2,8 @@ {% extends "base.html" %} {% block content %} -

I am always happy to meet new people. I can be contacted by email at awstin@achubb.com.

-
{% endblock %} diff --git a/templates/gifts.html b/templates/gifts.html index b2b51ba..8db58ac 100644 --- a/templates/gifts.html +++ b/templates/gifts.html @@ -2,7 +2,6 @@ {% extends "base.html" %} {% block content %} -

Gifts

If you are here you are probably thinking of getting me a gift. @@ -27,5 +26,4 @@

Awstin

-
{% endblock %} diff --git a/templates/home.html b/templates/home.html index 43bd0a1..50c4935 100644 --- a/templates/home.html +++ b/templates/home.html @@ -3,6 +3,7 @@ {% block content %}
+

Awstin Chubb

About me

Short version

diff --git a/templates/now.html b/templates/now.html index b9d3d3b..f5c8c12 100644 --- a/templates/now.html +++ b/templates/now.html @@ -2,7 +2,6 @@ {% extends "base.html" %} {% block content %} -

Last updated: 2024-06-22

@@ -60,5 +59,4 @@

Awstin

-
{% endblock %} diff --git a/templates/projects.html b/templates/projects.html index c74313d..e74a50d 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -2,11 +2,7 @@ {% extends "base.html" %} {% block content %} -
-
    {{project_list|safe}}
- -
{% endblock %} diff --git a/templates/uses.html b/templates/uses.html index 96fbe3d..ae0313e 100644 --- a/templates/uses.html +++ b/templates/uses.html @@ -2,7 +2,6 @@ {% extends "base.html" %} {% block content %} -

Things I use

Analog stuff

    @@ -162,5 +161,4 @@ Language Learning: Duolingo
-
{% endblock %}