From 070c6f0d409088ff5b61cb80222d6a9541c73b92 Mon Sep 17 00:00:00 2001 From: Finnder Date: Thu, 24 Mar 2022 19:41:29 -0400 Subject: [PATCH 1/6] test --- content/about.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about.md b/content/about.md index 28961f6..a52e05c 100644 --- a/content/about.md +++ b/content/about.md @@ -2,4 +2,4 @@ title="About Us" +++ -This is an about us page +This is an about us page From d19460fa1e9c698938ddeddf0abf9b11275a74c9 Mon Sep 17 00:00:00 2001 From: Finnder Date: Thu, 24 Mar 2022 22:13:37 -0400 Subject: [PATCH 2/6] Re colored everything to darker colors --- content/about.md | 3 ++- sass/main.scss | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/content/about.md b/content/about.md index a52e05c..5b15c91 100644 --- a/content/about.md +++ b/content/about.md @@ -1,5 +1,6 @@ +++ title="About Us" +++ +
+We like linux :) -This is an about us page diff --git a/sass/main.scss b/sass/main.scss index eb921eb..f9bf05a 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -1,6 +1,6 @@ $sidebar_width: 20%; -$sidebar_background: rgba(255, 0, 0, .1); -$body_background: rgba(0, 255, 0, .1); +$sidebar_background: rgba(45, 45, 45, 1); +$body_background: rgba(30, 30, 30, 1); body { margin: 0; @@ -18,16 +18,19 @@ body { padding: 0 16px 0 16px; } } + main { height: 100%; box-sizing: border-box; margin-left: $sidebar_width; background: $body_background; - padding-top: 50px; + padding-top: 32px; + color: white; + article { margin: auto; - border: 1px solid blue; - padding: 16px; + border: 1px solid white; + padding: 13px; max-width: 1000px; } } From a6bfc73895e16382221497cb0a1746b0f21c8592 Mon Sep 17 00:00:00 2001 From: Finnder Date: Thu, 24 Mar 2022 23:14:52 -0400 Subject: [PATCH 3/6] Made some tab hovering effects, and some general touch ups --- content/about.md | 3 ++- sass/main.scss | 31 ++++++++++++++++++++++++++----- templates/sidebar.html | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/content/about.md b/content/about.md index 5b15c91..e29a3a7 100644 --- a/content/about.md +++ b/content/about.md @@ -2,5 +2,6 @@ title="About Us" +++
-We like linux :) +We like linux :) + diff --git a/sass/main.scss b/sass/main.scss index f9bf05a..1150ec9 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -1,9 +1,15 @@ -$sidebar_width: 20%; +@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@300&display=swap'); + +$sidebar_width: 15%; $sidebar_background: rgba(45, 45, 45, 1); $body_background: rgba(30, 30, 30, 1); +$content_background: rgb(35, 35, 35); body { margin: 0; + font-family: 'Fira Code', monospace; + + // Sidebar nav { height: 100%; position: fixed; @@ -11,12 +17,26 @@ body { background: $sidebar_background; padding-top: 32px; padding-bottom: 16px; - img { - width: 100%; - } + border-right-style: solid; + border-width: 2px; + border-color: black; + color: white; + div { padding: 0 16px 0 16px; } + + // Refrence to the tab interface + .tabs { + a { + text-decoration: none; + color: grey; + &:hover { + color: white; + background-color: rgba(40, 40, 40, 0.5); + } + } + } } main { @@ -31,7 +51,8 @@ body { margin: auto; border: 1px solid white; padding: 13px; - max-width: 1000px; + max-width: 92%; + background: $content_background; } } } diff --git a/templates/sidebar.html b/templates/sidebar.html index c4f6072..83ea66a 100644 --- a/templates/sidebar.html +++ b/templates/sidebar.html @@ -2,7 +2,7 @@
-
+
    {% for page in config.extra.toolbar_pages %}
  • From c8ab30b5caa27c31c196b623666dc915e0af8fd0 Mon Sep 17 00:00:00 2001 From: Finnder Date: Thu, 24 Mar 2022 23:20:33 -0400 Subject: [PATCH 4/6] Small sizing change --- sass/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass/main.scss b/sass/main.scss index 1150ec9..d2be8a1 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -51,7 +51,7 @@ body { margin: auto; border: 1px solid white; padding: 13px; - max-width: 92%; + max-width: 1500px; background: $content_background; } } From 5239befe18c1b7cf18221eed177157ebeef7bb2f Mon Sep 17 00:00:00 2001 From: Finnder Date: Thu, 24 Mar 2022 23:25:17 -0400 Subject: [PATCH 5/6] Changed sizing of image for now (no image added yet), now can see tabs --- sass/main.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sass/main.scss b/sass/main.scss index d2be8a1..4f85383 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -25,6 +25,10 @@ body { div { padding: 0 16px 0 16px; } + + img { + width: auto; + } // Refrence to the tab interface .tabs { From 3a223fa95ea60e87776d5568a17b23c50011bf1b Mon Sep 17 00:00:00 2001 From: Finnder Date: Thu, 24 Mar 2022 23:39:47 -0400 Subject: [PATCH 6/6] Tweaks to tab text, was to dark --- sass/main.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sass/main.scss b/sass/main.scss index 4f85383..246c75b 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -34,7 +34,8 @@ body { .tabs { a { text-decoration: none; - color: grey; + color: rgb(190, 190, 190); + &:hover { color: white; background-color: rgba(40, 40, 40, 0.5); @@ -54,6 +55,7 @@ body { article { margin: auto; border: 1px solid white; + border-radius: 3px; padding: 13px; max-width: 1500px; background: $content_background;