From 00bbe19901e1ca5ce41c51dc848d646acac426ac Mon Sep 17 00:00:00 2001 From: Bill Nibz Date: Sat, 13 Jan 2018 15:34:13 -0500 Subject: [PATCH 1/2] Implement topic list in menu bar --- _includes/cor_menu.html | 50 +++++++++++++++++++++++++++++++ _includes/topics.html | 2 +- _layouts/corrupt_collection.html | 47 +---------------------------- _layouts/corrupt_index.html | 51 ++------------------------------ _layouts/corrupt_post.html | 47 +---------------------------- index.html | 2 +- src/styles/corrupt.css | 38 ++++++++++++++++++------ 7 files changed, 86 insertions(+), 151 deletions(-) create mode 100644 _includes/cor_menu.html diff --git a/_includes/cor_menu.html b/_includes/cor_menu.html new file mode 100644 index 0000000..428a75a --- /dev/null +++ b/_includes/cor_menu.html @@ -0,0 +1,50 @@ +
+
+
Home
+ {% for topic in topics %} +
{{ topic.title }}
+ {% endfor %} +
+ +
diff --git a/_includes/topics.html b/_includes/topics.html index 8b9a412..d62188a 100644 --- a/_includes/topics.html +++ b/_includes/topics.html @@ -6,7 +6,7 @@
{{ post.pub }}
{% for topic in post.topics %} - {{topic}} + {{topic}} {% endfor %}
diff --git a/_layouts/corrupt_collection.html b/_layouts/corrupt_collection.html index 2315f22..0df50e7 100644 --- a/_layouts/corrupt_collection.html +++ b/_layouts/corrupt_collection.html @@ -22,52 +22,7 @@ {{ content }} -
-
-
- -
+ {% include cor_menu.html %} diff --git a/_layouts/corrupt_index.html b/_layouts/corrupt_index.html index b886ae2..1f9ee61 100644 --- a/_layouts/corrupt_index.html +++ b/_layouts/corrupt_index.html @@ -19,57 +19,12 @@
{{ content }} -
-
- All Posts -
- -
-
-
- + {% include cor_menu.html %}
diff --git a/_layouts/corrupt_post.html b/_layouts/corrupt_post.html index f9e7be0..4ea4a2d 100644 --- a/_layouts/corrupt_post.html +++ b/_layouts/corrupt_post.html @@ -22,52 +22,7 @@

[{{ page.author }}][{{ page.pub }}][{{ page.tags }}]

-
-
-
- -
+ {% include cor_menu.html %} diff --git a/index.html b/index.html index 1dfb6b8..ca7c746 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@
{{ post.pub }}
{% for topic in post.topics %} - {{topic}} + {{topic}} {% endfor %}
diff --git a/src/styles/corrupt.css b/src/styles/corrupt.css index 0780299..2ffc6ad 100644 --- a/src/styles/corrupt.css +++ b/src/styles/corrupt.css @@ -66,6 +66,8 @@ a:hover { display: flex; background-color: #202020; z-index: 2; width: 100%; + border-top: 1px solid var(--hilite); + box-shadow: 0px 0px 30px 0px var(--hilite); } .cor_menu a:link,a:visited,a:focus { @@ -78,11 +80,22 @@ a:hover { color: white; } +.cor_topics { + display: flex; flex-flow: row wrap; justify-content: center; + width: 100%; + font: 1.0em "Lucida Sans Unicode", "Lucida Grande", sans-serif; + text-align: center; color: darkgrey; letter-spacing: 0.6em; line-height: 2.0em; + padding: 10px; +} + +.cor_topics div { + padding: 1em 1em 0em 1em; +} + .cor_footer { display: flex; flex-flow: row wrap; + width: 100%; text-align: center; - border-top: 1px solid var(--hilite); - box-shadow: 0px 0px 30px 0px var(--hilite); } .cor_footer #about { @@ -219,14 +232,16 @@ a:hover { } /* Mobile First */ -@media only screen and (min-width: 1250px) and (min-height: 750px) { - .title div { - font: 1.2em "Lucida Sans Unicode", "Lucida Grande", sans-serif; +@media only screen and (min-width: 768px) { + .title div { font: 1.2em "Lucida Sans Unicode", "Lucida Grande", sans-serif; color: darkgrey; letter-spacing: 1.2em; } .title div::first-letter { font: 1.2em "Lucida Sans Unicode", "Lucida Grande", sans-serif; } +} + +@media only screen and (min-width: 1250px) and (min-height: 750px) { .cor_content { width: 80%; } @@ -243,11 +258,16 @@ a:hover { } .cor_menu { width: 20%; - } - .cor_footer { - position: fixed; - bottom: 0; border: none; box-shadow: unset; } + .cor_topics { + position: fixed; top: 75px; right: 0px; + font: 1.0em "Lucida Sans Unicode", "Lucida Grande", sans-serif; + text-align: right; color: darkgrey; letter-spacing: 0.6em; line-height: 2.0em; + padding: 10px; + } + .cor_footer { + position: fixed; bottom: 0; width: unset; + } } From b34103e286039ac568584fb52a1f19e0051d3a63 Mon Sep 17 00:00:00 2001 From: Bill Niblock Date: Sat, 13 Jan 2018 21:57:42 -0500 Subject: [PATCH 2/2] Topics: Finalize styles --- _includes/cor_menu.html | 4 ++-- src/styles/corrupt.css | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/_includes/cor_menu.html b/_includes/cor_menu.html index 428a75a..3e3a42b 100644 --- a/_includes/cor_menu.html +++ b/_includes/cor_menu.html @@ -1,7 +1,7 @@
-
Home
- {% for topic in topics %} +
home
+ {% for topic in site.topics %}
{{ topic.title }}
{% endfor %}
diff --git a/src/styles/corrupt.css b/src/styles/corrupt.css index 2ffc6ad..c521a89 100644 --- a/src/styles/corrupt.css +++ b/src/styles/corrupt.css @@ -14,7 +14,7 @@ html { } body { - background-color: #202020; + background-color: #3B3B3B; margin: 0; } @@ -64,6 +64,7 @@ a:hover { /* Sidebar */ .cor_menu { display: flex; + flex-flow: column wrap; background-color: #202020; z-index: 2; width: 100%; border-top: 1px solid var(--hilite); @@ -82,14 +83,22 @@ a:hover { .cor_topics { display: flex; flex-flow: row wrap; justify-content: center; - width: 100%; font: 1.0em "Lucida Sans Unicode", "Lucida Grande", sans-serif; text-align: center; color: darkgrey; letter-spacing: 0.6em; line-height: 2.0em; - padding: 10px; } .cor_topics div { - padding: 1em 1em 0em 1em; + padding: 10px 10px 0px 10px; +} + +.cor_topics a,a:visited,a:link,a:focus { + color: darkgrey; + text-decoration: none; +} + +.cor_topics a:hover { + font-style: normal; + color: white; } .cor_footer { @@ -262,10 +271,9 @@ a:hover { box-shadow: unset; } .cor_topics { - position: fixed; top: 75px; right: 0px; + position: fixed; top: 75px; right: 0px; display: unset; font: 1.0em "Lucida Sans Unicode", "Lucida Grande", sans-serif; text-align: right; color: darkgrey; letter-spacing: 0.6em; line-height: 2.0em; - padding: 10px; } .cor_footer { position: fixed; bottom: 0; width: unset;