From 049dc247a677e29ab2cd68b51aa98a162daa847a Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Mon, 11 Feb 2019 09:08:27 -0500 Subject: [PATCH] Setup menu - split hero into title, nav. bar and logo - put top-level pages directly in layout dir. vs. individ. sections - converted toml config to yaml - modified meta description --- assets/sass/main.scss | 13 ++++++ config.toml => config.toml_ | 2 +- config.yaml | 23 +++++++++++ content/{config/_index.md => config.md} | 0 content/credits.md | 6 +++ content/credits/_index.md | 13 ------ content/resume.md | 5 +++ ideas.md | 2 +- layouts/_default/baseof.html | 6 ++- layouts/index-old.html | 5 --- layouts/partials/base16-logo.html | 3 ++ layouts/partials/hero.html | 41 ++----------------- layouts/partials/nav-bar.html | 12 ++++++ layouts/partials/site-title.html | 7 ++++ layouts/partials/tagline.html | 7 ++++ ...s_f300667da4f5b5f84e1a9e0702b2fdde.content | 7 ++++ 16 files changed, 93 insertions(+), 59 deletions(-) rename config.toml => config.toml_ (63%) create mode 100644 config.yaml rename content/{config/_index.md => config.md} (100%) create mode 100644 content/credits.md delete mode 100644 content/credits/_index.md create mode 100644 content/resume.md delete mode 100644 layouts/index-old.html create mode 100644 layouts/partials/base16-logo.html create mode 100644 layouts/partials/nav-bar.html create mode 100644 layouts/partials/site-title.html create mode 100644 layouts/partials/tagline.html diff --git a/assets/sass/main.scss b/assets/sass/main.scss index c32a0e8..a8266b8 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -446,6 +446,19 @@ h1.site-title {// {{{ // margin-top: .75em; @include vert-padding-rem(1); + .caret { + color: #f2f0ec; + margin-right: .75rem; + } + + .nav-bar-links { + display: inline; + + .nav-bar-link { + padding-right: .5em; + } + } + @media (max-width: $phone-width) { // font-size: .9em; font-size: .8em; diff --git a/config.toml b/config.toml_ similarity index 63% rename from config.toml rename to config.toml_ index d4f2045..a755aa0 100644 --- a/config.toml +++ b/config.toml_ @@ -8,4 +8,4 @@ enableRobotsTXT = "true" [params] author = "Kevin Mok" - description = "I'm Kevin Mok - a CS (Computer Science) student at the University of Toronto. Come check out my personal website!" + description = "I'm a Computer Science (CS) student at the University of Toronto and an avid Linux/FOSS user. Come check out my personal site!" diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..6db343a --- /dev/null +++ b/config.yaml @@ -0,0 +1,23 @@ +# baseURL: http://localhost:1313/ +baseURL: https://kevin-mok.com/ +# baseURL: /home/kevin/coding/mf-site/public +languageCode: en-us +title: Kevin Mok's Website +# theme: base16 +enableRobotsTXT: true + +params: + author: Kevin Mok + description: I'm a Computer Science (CS) student at the University of Toronto and an avid Linux/FOSS user. Come check out my personal site! + +menu: + main: + - name: resume + url: /resume + weight: 5 + # - name: credits + # url: /credits + # weight: 10 + # - name: config + # url: /config + diff --git a/content/config/_index.md b/content/config.md similarity index 100% rename from content/config/_index.md rename to content/config.md diff --git a/content/credits.md b/content/credits.md new file mode 100644 index 0000000..12ebe01 --- /dev/null +++ b/content/credits.md @@ -0,0 +1,6 @@ +--- +title: "Credits" +date: 2019-02-11T03:10:25-05:00 +draft: true +layout: single +--- diff --git a/content/credits/_index.md b/content/credits/_index.md deleted file mode 100644 index 8f7a7aa..0000000 --- a/content/credits/_index.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: "Credits" -date: 2019-01-31T03:10:25-05:00 -draft: false -layout: single ---- - - Icons made by Freepik from www.flaticon.com is licensed by CC 3.0 BY - diff --git a/content/resume.md b/content/resume.md new file mode 100644 index 0000000..5bf6ca3 --- /dev/null +++ b/content/resume.md @@ -0,0 +1,5 @@ +--- +title: "Resume" +date: 2019-02-11T07:50:51-05:00 +draft: true +--- diff --git a/ideas.md b/ideas.md index d75271f..d3e1d1a 100644 --- a/ideas.md +++ b/ideas.md @@ -33,8 +33,8 @@ # Tiny - SEO - - be more specific with robots.txt when have content - add/redirect aliases + - be more specific with robots.txt when have content Break> {{{ > }}} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 6455805..753aa8b 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,6 +1,10 @@ {{ partial "header.html" . }} -{{ partial "hero.html" . }} +{{ partial "site-title.html" . }} + +{{ partial "nav-bar.html" . }} + +{{ partial "base16-logo.html" . }} {{ block "main" . }} {{ end }} diff --git a/layouts/index-old.html b/layouts/index-old.html deleted file mode 100644 index a18a2bf..0000000 --- a/layouts/index-old.html +++ /dev/null @@ -1,5 +0,0 @@ -{{ partial "header.html" . }} - - - -{{ partial "footer.html" . }} diff --git a/layouts/partials/base16-logo.html b/layouts/partials/base16-logo.html new file mode 100644 index 0000000..8e90c95 --- /dev/null +++ b/layouts/partials/base16-logo.html @@ -0,0 +1,3 @@ + diff --git a/layouts/partials/hero.html b/layouts/partials/hero.html index 801c594..b9af976 100644 --- a/layouts/partials/hero.html +++ b/layouts/partials/hero.html @@ -1,42 +1,7 @@ {{ $baseurl := .Site.BaseURL }} -

- - [Kevin Mok] # _ - -

- +{{ partial "site-title.html" . }} -
-
+{{ partial "nav-bar.html" . }} - - - - - - - - - +{{ partial "base16-logo.html" . }} diff --git a/layouts/partials/nav-bar.html b/layouts/partials/nav-bar.html new file mode 100644 index 0000000..4626d95 --- /dev/null +++ b/layouts/partials/nav-bar.html @@ -0,0 +1,12 @@ + diff --git a/layouts/partials/site-title.html b/layouts/partials/site-title.html new file mode 100644 index 0000000..25c4671 --- /dev/null +++ b/layouts/partials/site-title.html @@ -0,0 +1,7 @@ +

+ [Kevin Mok] # _ +

diff --git a/layouts/partials/tagline.html b/layouts/partials/tagline.html new file mode 100644 index 0000000..156e0b1 --- /dev/null +++ b/layouts/partials/tagline.html @@ -0,0 +1,7 @@ +
+
+ +

Live, love and linux-icon.

+
diff --git a/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content index 76be848..b6220eb 100644 --- a/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content +++ b/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content @@ -325,6 +325,13 @@ h1.site-title { margin-left: .5em; padding-top: 1rem; padding-bottom: 1rem; } + .nav-bar .caret { + color: #f2f0ec; + margin-right: .75rem; } + .nav-bar .nav-bar-links { + display: inline; } + .nav-bar .nav-bar-links .nav-bar-link { + padding-right: .5em; } @media (max-width: 800px) { .nav-bar { font-size: .8em; } }