From 3a1648e238e3e92faf322ee48e892cf7c19977d3 Mon Sep 17 00:00:00 2001 From: Wouter Groeneveld Date: Tue, 6 Jun 2017 16:29:48 +0200 Subject: [PATCH] updates in disqus, navigation and footer --- brainbaking.sublime-workspace | 418 +++++++++++++++--- config.toml | 35 +- content/books.md | 15 + content/page/about.md | 13 - content/talks.md | 3 + .../layouts/partials/disqus.html | 21 +- .../layouts/partials/footer.html | 2 +- .../layouts/partials/head.html | 2 +- .../beautifulbaking/layouts/partials/nav.html | 2 +- .../layouts/partials/page.html | 5 - .../layouts/partials/post.html | 18 +- themes/beautifulbaking/static/css/main.css | 66 ++- 12 files changed, 443 insertions(+), 157 deletions(-) create mode 100644 content/books.md delete mode 100644 content/page/about.md create mode 100644 content/talks.md diff --git a/brainbaking.sublime-workspace b/brainbaking.sublime-workspace index 4f355234..b1de496b 100644 --- a/brainbaking.sublime-workspace +++ b/brainbaking.sublime-workspace @@ -480,21 +480,86 @@ "buffers": [ { - "file": "themes/beautifulbaking/layouts/partials/footer.html", + "file": "content/about.md", "settings": { - "buffer_size": 7267, + "buffer_size": 913, + "encoding": "UTF-8", "line_ending": "Windows" } }, { - "file": "/C/Development/github/productivity-course/talk.md", + "file": "content/talks.md", "settings": { - "buffer_size": 8438, + "buffer_size": 14, "encoding": "UTF-8", "line_ending": "Windows" } + }, + { + "file": "themes/beautifulbaking/layouts/partials/disqus.html", + "settings": + { + "buffer_size": 1013, + "encoding": "UTF-8", + "line_ending": "Windows" + } + }, + { + "file": "themes/beautifulbaking/layouts/partials/post.html", + "settings": + { + "buffer_size": 1180, + "encoding": "UTF-8", + "line_ending": "Windows" + } + }, + { + "contents": "ff", + "file": "content/page/about.md", + "file_size": 2, + "file_write_time": 131412245547019658, + "settings": + { + "buffer_size": 2, + "line_ending": "Windows" + } + }, + { + "file": "config.toml", + "settings": + { + "buffer_size": 1500, + "encoding": "UTF-8", + "line_ending": "Windows" + } + }, + { + "file": "docs/index.html", + "settings": + { + "buffer_size": 21341, + "encoding": "UTF-8", + "line_ending": "Windows" + } + }, + { + "file": "themes/beautifulbaking/static/css/main.css", + "settings": + { + "buffer_size": 14350, + "encoding": "UTF-8", + "line_ending": "Windows" + } + }, + { + "file": "themes/beautifulbaking/layouts/section/wiki.html", + "settings": + { + "buffer_size": 3048, + "line_ending": "Windows" + } } ], "build_system": "", @@ -562,18 +627,33 @@ "expanded_folders": [ "/C/Development/github/brainbaking", + "/C/Development/github/brainbaking/content", "/C/Development/github/brainbaking/static", "/C/Development/github/brainbaking/themes", "/C/Development/github/brainbaking/themes/beautifulbaking", + "/C/Development/github/brainbaking/themes/beautifulbaking/archetypes", + "/C/Development/github/brainbaking/themes/beautifulbaking/images", "/C/Development/github/brainbaking/themes/beautifulbaking/layouts", - "/C/Development/github/brainbaking/themes/beautifulbaking/layouts/_default" + "/C/Development/github/brainbaking/themes/beautifulbaking/layouts/partials" ], "file_history": [ + "/C/Development/github/brainbaking/themes/beautifulbaking/layouts/partials/head.html", + "/C/Development/github/brainbaking/themes/beautifulbaking/layouts/partials/footer.html", + "/C/Development/github/brainbaking/themes/beautifulbaking/layouts/partials/page.html", + "/C/Development/github/brainbaking/themes/beautifulbaking/layouts/partials/nav.html", + "/C/Development/github/brainbaking/themes/beautifulbaking/layouts/partials/talks.html", + "/C/Development/github/brainbaking/themes/beautifulbaking/static/css/main.css", + "/C/Development/github/brainbaking/docs/css/main.css", + "/C/Development/github/brainbaking/content/post/teaching-yourself-to-draw.md", + "/C/Development/github/brainbaking/content/post/drawing-week-04.md", + "/C/Development/github/brainbaking/content/post/drawing-week-03.md", + "/C/Development/github/brainbaking/content/post/drawing-week-02.md", + "/C/Development/github/brainbaking/content/post/drawing-week-01.md", + "/C/Development/github/productivity-course/talk.md", "/C/Development/github/brainbaking/themes/beautifulbaking/layouts/index.html", "/C/Development/github/brainbaking/config.toml", "/C/Sources/PerformanceInput/ModPerformanceInput.Domain/Occupation/OccupationRepository.cs", - "/C/Development/github/productivity-course/talk.md", "/C/Sources/WorkB_Trunk/PFW.WorkB_Base/PFW.WorkB.Database.Console/updateintegrationdev.bat", "/Users/jefklak/development/PratoGame/package.json", "/Users/jefklak/development/PratoGame/index.html", @@ -685,19 +765,7 @@ "/Users/jefklak/development/hugotest/content/pages/_index.md", "/Users/jefklak/development/hugotest/themes/beautifulhugo/layouts/partials/page.html", "/Users/jefklak/development/hugotest/themes/beautifulhugo/theme.toml", - "/Users/jefklak/development/hugotest/themes/beautifulhugo/exampleSite/config.toml", - "/Users/jefklak/development/hugotest/themes/beautifulhugo/archetypes/default.md", - "/Users/jefklak/Desktop/Stiens ei/stijlblad.css", - "/Users/jefklak/Desktop/Stiens ei/bottles.css", - "/Users/jefklak/Desktop/Stiens ei/nastybottles.html", - "/Users/jefklak/Desktop/Stiens ei/bootstraptest.html", - "/Users/jefklak/development/dokuwiki-to-hugo/src/markdown/links.py", - "/Users/jefklak/development/brainbaking/posts/unit-testing-extjs-ui.md", - "/Users/jefklak/Desktop/Stiens ei/Home.html", - "/Users/jefklak/development/hugotest/content/pages/code/csharp/testing.md", - "/Users/jefklak/development/hugotest/content/pages/test2.md", - "/Users/jefklak/development/hugotest/content/pages/code/csharp/resources.md", - "/Users/jefklak/Downloads/pages/code/javascript/inleiding.txt" + "/Users/jefklak/development/hugotest/themes/beautifulhugo/exampleSite/config.toml" ], "find": { @@ -708,6 +776,7 @@ "height": 93.0, "where_history": [ + "", "/Users/jefklak/development/PratoGame/public", "", "subtitle: ", @@ -720,6 +789,8 @@ "case_sensitive": false, "find_history": [ + ".navbar-custom .nav .navlinks-container {", + "\"", "CreateOccupationQueryOver", "googleAnalytics", "console", @@ -845,9 +916,7 @@ "background-co", "backgroundc-", "password_", - "mail", - "verzend", - "retour" + "mail" ], "highlight": true, "in_selection": false, @@ -855,6 +924,7 @@ "regex": false, "replace_history": [ + "\"\"", "wiki/", "subtitle:", ";", @@ -870,24 +940,108 @@ "groups": [ { - "selected": 1, + "selected": 3, "sheets": [ { "buffer": 0, - "file": "themes/beautifulbaking/layouts/partials/footer.html", + "file": "content/about.md", "semi_transient": false, "settings": { - "buffer_size": 7267, + "buffer_size": 913, "regions": { }, "selection": [ [ - 6909, - 6909 + 913, + 913 + ] + ], + "settings": + { + "syntax": "Packages/Markdown/Markdown.sublime-syntax" + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "stack_index": 5, + "type": "text" + }, + { + "buffer": 1, + "file": "content/talks.md", + "semi_transient": false, + "settings": + { + "buffer_size": 14, + "regions": + { + }, + "selection": + [ + [ + 14, + 14 + ] + ], + "settings": + { + "syntax": "Packages/Markdown/Markdown.sublime-syntax" + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "stack_index": 7, + "type": "text" + }, + { + "buffer": 2, + "file": "themes/beautifulbaking/layouts/partials/disqus.html", + "semi_transient": false, + "settings": + { + "buffer_size": 1013, + "regions": + { + }, + "selection": + [ + [ + 64, + 64 + ] + ], + "settings": + { + "syntax": "Packages/HTML/HTML.sublime-syntax" + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "stack_index": 6, + "type": "text" + }, + { + "buffer": 3, + "file": "themes/beautifulbaking/layouts/partials/post.html", + "semi_transient": false, + "settings": + { + "buffer_size": 1180, + "regions": + { + }, + "selection": + [ + [ + 629, + 629 ] ], "settings": @@ -897,27 +1051,27 @@ "translate_tabs_to_spaces": true }, "translation.x": 0.0, - "translation.y": 0.0, + "translation.y": 60.0, "zoom_level": 1.0 }, - "stack_index": 1, + "stack_index": 0, "type": "text" }, { - "buffer": 1, - "file": "/C/Development/github/productivity-course/talk.md", + "buffer": 4, + "file": "content/page/about.md", "semi_transient": false, "settings": { - "buffer_size": 8438, + "buffer_size": 2, "regions": { }, "selection": [ [ - 2800, - 2800 + 2, + 2 ] ], "settings": @@ -925,10 +1079,130 @@ "syntax": "Packages/Markdown/Markdown.sublime-syntax" }, "translation.x": 0.0, - "translation.y": 3017.0, + "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 0, + "stack_index": 4, + "type": "text" + }, + { + "buffer": 5, + "file": "config.toml", + "semi_transient": false, + "settings": + { + "buffer_size": 1500, + "regions": + { + }, + "selection": + [ + [ + 1320, + 1340 + ] + ], + "settings": + { + "syntax": "Packages/Text/Plain text.tmLanguage", + "tab_size": 2, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "stack_index": 3, + "type": "text" + }, + { + "buffer": 6, + "file": "docs/index.html", + "semi_transient": false, + "settings": + { + "buffer_size": 21341, + "regions": + { + }, + "selection": + [ + [ + 671, + 596 + ] + ], + "settings": + { + "syntax": "Packages/HTML/HTML.sublime-syntax", + "tab_size": 2, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 180.0, + "zoom_level": 1.0 + }, + "stack_index": 1, + "type": "text" + }, + { + "buffer": 7, + "file": "themes/beautifulbaking/static/css/main.css", + "semi_transient": false, + "settings": + { + "buffer_size": 14350, + "regions": + { + }, + "selection": + [ + [ + 12795, + 12775 + ] + ], + "settings": + { + "syntax": "Packages/CSS/CSS.sublime-syntax", + "tab_size": 2, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 12617.0, + "zoom_level": 1.0 + }, + "stack_index": 2, + "type": "text" + }, + { + "buffer": 8, + "file": "themes/beautifulbaking/layouts/section/wiki.html", + "semi_transient": false, + "settings": + { + "buffer_size": 3048, + "regions": + { + }, + "selection": + [ + [ + 1008, + 1012 + ] + ], + "settings": + { + "syntax": "Packages/HTML/HTML.sublime-syntax", + "tab_size": 2, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 540.0, + "zoom_level": 1.0 + }, + "stack_index": 8, "type": "text" } ] @@ -986,6 +1260,42 @@ "last_filter": "", "selected_items": [ + [ + "main.css", + "themes\\beautifulbaking\\static\\css\\main.css" + ], + [ + "foo", + "themes\\beautifulbaking\\layouts\\partials\\footer.html" + ], + [ + "abou", + "content\\about.md" + ], + [ + "hea", + "themes\\beautifulbaking\\layouts\\partials\\head.html" + ], + [ + "ind", + "docs\\index.html" + ], + [ + "wiki", + "themes\\beautifulbaking\\layouts\\section\\wiki.html" + ], + [ + "nav.h", + "themes\\beautifulbaking\\layouts\\partials\\nav.html" + ], + [ + "head", + "themes\\beautifulbaking\\layouts\\partials\\head.html" + ], + [ + "confi", + "config.toml" + ], [ "foot", "themes\\beautifulbaking\\layouts\\partials\\footer.html" @@ -994,10 +1304,6 @@ "index.js", "index.js" ], - [ - "main.css", - "themes/beautifulbaking/static/css/main.css" - ], [ "main", "docs/css/main.css" @@ -1030,10 +1336,6 @@ "doos.conf", "domain/doos.conf.php" ], - [ - "head", - "templates/head.html" - ], [ "index", "index.php" @@ -1078,10 +1380,6 @@ "kapo", "kapot.htaccess" ], - [ - "ind", - "index.php" - ], [ "bestel.", "bestel.php" @@ -1382,10 +1680,6 @@ "doo", "js/doos.js" ], - [ - "hea", - "templates/head.html" - ], [ "recep", "recept.php" @@ -1470,10 +1764,6 @@ "bestelling", "domain/bestelling.php" ], - [ - "foo", - "templates/footer.html" - ], [ "doos.js", "js/doos.js" @@ -1481,22 +1771,6 @@ [ ".ht", ".htaccess" - ], - [ - "bedank", - "bedankt.php" - ], - [ - "jamm", - "jammer.php" - ], - [ - "bedankt", - "bedankt.php" - ], - [ - "maile", - "domain/mailer.php" ] ], "width": 0.0 diff --git a/config.toml b/config.toml index 51b3e217..996bb4ac 100644 --- a/config.toml +++ b/config.toml @@ -36,36 +36,35 @@ tag = "tags" goodreads = "5451893-wouter" [[menu.main]] - name = "Blog" + name = "Menu" url = "/" weight = 1 + pre = "" [[menu.main]] name = "Wiki" + parent = "Menu" url = "/wiki/" - weight = 2 + pre = "" + weight = 1 [[menu.main]] name = "Tags" + parent = "Menu" url = "/tags" - weight = 3 + pre = "" + weight = 2 [[menu.main]] name = "About me" + parent = "Menu" url = "/about" + pre = "" + weight = 3 + +[[menu.main]] + name = "Talks" + pre = "" + parent = "Menu" + url = "/talks" weight = 4 - -#[[menu.main]] -# identifier = "samples" -# name = "Samples" -# weight = 3 - -#[[menu.main]] -# parent = "samples" -# name = "Code Sample" -# url = "/post/2016-03-08-code-sample" - -#[[menu.main]] -# parent = "samples" -# name = "Test Markdown" -# url = "/post/2015-02-20-test-markdown" diff --git a/content/books.md b/content/books.md new file mode 100644 index 00000000..ba88a696 --- /dev/null +++ b/content/books.md @@ -0,0 +1,15 @@ +# Books + +I keep an active Goodreads account where I manage everything I've read and want to read. I invite you to join the community there. Marking a book as read and writing a (short) review never was that satisfying... + +I used to be almost exclusively a fantasy reader. Now I mostly read non-fiction on the most diverse topics, but I do have a soft spot for things like philosophy, art, mindful food and software engineering. + +These are the latest 52 books I've read: + +
+
+ + + + + diff --git a/content/page/about.md b/content/page/about.md deleted file mode 100644 index 11757214..00000000 --- a/content/page/about.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -bigimg: /img/About Me.jpg ---- - -# About Me - -Hi! I’m Wouter Groeneveld, a software developer with a deep passion to inspire others on everything that drives me. That includes lots of goodness, but here are the key facts: - -* Test your stuff before writing your code! I’m a heavy Test Driven Development (TDD) fanboy and I bark at those who don’t! I teach agile software engineering on multiple occasions, ranging from colleagues to schools. -* I love dynamic languages. I also love converting the haters to the dark side. I teach javascript as a dynamic and functional language - it helps to create your own funky labs to people get more engaged. -* Pair programming used as a tool to learn from each other and to improve code quality are two values I believe in. -* Don’t limit yourself to your specialty. I like constantly improving my own (and others’) skills by trying out something new, reading, and writing. - diff --git a/content/talks.md b/content/talks.md new file mode 100644 index 00000000..560c0ff9 --- /dev/null +++ b/content/talks.md @@ -0,0 +1,3 @@ +# Talks + +TODO diff --git a/themes/beautifulbaking/layouts/partials/disqus.html b/themes/beautifulbaking/layouts/partials/disqus.html index 2811bb44..89a94060 100644 --- a/themes/beautifulbaking/layouts/partials/disqus.html +++ b/themes/beautifulbaking/layouts/partials/disqus.html @@ -1,5 +1,22 @@ {{ if .Site.DisqusShortname }} -
- {{ template "_internal/disqus.html" . }} +
+ +
+ + + comments powered by Disqus +
{{ end }} \ No newline at end of file diff --git a/themes/beautifulbaking/layouts/partials/footer.html b/themes/beautifulbaking/layouts/partials/footer.html index efd46906..646b75b0 100644 --- a/themes/beautifulbaking/layouts/partials/footer.html +++ b/themes/beautifulbaking/layouts/partials/footer.html @@ -145,7 +145,7 @@

- {{ .Site.Author.name }} + {{ .Site.Author.name }}  •  No copyright - Hack away! diff --git a/themes/beautifulbaking/layouts/partials/head.html b/themes/beautifulbaking/layouts/partials/head.html index 32ae1ead..357cf366 100644 --- a/themes/beautifulbaking/layouts/partials/head.html +++ b/themes/beautifulbaking/layouts/partials/head.html @@ -11,7 +11,7 @@ - + diff --git a/themes/beautifulbaking/layouts/partials/nav.html b/themes/beautifulbaking/layouts/partials/nav.html index 46d465d1..375d7e61 100644 --- a/themes/beautifulbaking/layouts/partials/nav.html +++ b/themes/beautifulbaking/layouts/partials/nav.html @@ -23,7 +23,7 @@ {{ .Name }}

{{ range .Children }} - {{ .Name }} + {{ .Pre }}  {{ .Name }} {{ end }}
diff --git a/themes/beautifulbaking/layouts/partials/page.html b/themes/beautifulbaking/layouts/partials/page.html index e0eb4df4..9463ed38 100644 --- a/themes/beautifulbaking/layouts/partials/page.html +++ b/themes/beautifulbaking/layouts/partials/page.html @@ -2,11 +2,6 @@
{{ .Content }} - {{ if .Site.DisqusShortname }} -
- {{ template "_internal/disqus.html" . }} -
- {{ end }}
diff --git a/themes/beautifulbaking/layouts/partials/post.html b/themes/beautifulbaking/layouts/partials/post.html index 6c1845f1..13417a7a 100644 --- a/themes/beautifulbaking/layouts/partials/post.html +++ b/themes/beautifulbaking/layouts/partials/post.html @@ -7,24 +7,22 @@ {{ .Content }} -