From 0b8e3ffd2acae8d7caac5365516902bcc1586758 Mon Sep 17 00:00:00 2001 From: Tom Wiesing <tkw01536@gmail.com> Date: Tue, 9 May 2017 05:24:17 +0200 Subject: [PATCH] Make the menu look nice --- _config.yml | 7 +++++ _includes/header.html | 56 ++++++++++++++++++++-------------- people/mkohlhase-activities.md | 1 + people/mkohlhase-cv.md | 1 + public/css/main.css | 40 +++++++++++++++++++++++- 5 files changed, 81 insertions(+), 24 deletions(-) diff --git a/_config.yml b/_config.yml index ef64952..38aa75b 100644 --- a/_config.yml +++ b/_config.yml @@ -56,3 +56,10 @@ menu: folder: 'students' - title: 'Teaching' folder: 'teaching' + +defaults: + - + scope: + path: "" # an empty string here means all files in the project + values: + hidden: false \ No newline at end of file diff --git a/_includes/header.html b/_includes/header.html index a5ae924..cc8cc85 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -25,32 +25,42 @@ {% assign url_parts = page.url | split: '/' %} {% assign base_url = url_parts | last %} + {% assign base_folder = url_parts[1] %} {% assign sorted_pages = site.pages | sort:"menu_order" %} - {% for node in site.menu %} - - <li><div class="divider"></div></li> - <li><a class="subheader">{{ node.title }}</a></li> - - {% for sub in sorted_pages %} - - {% assign sub_parts = sub.url | split: '/' %} - {% assign sub_url = sub_parts | last %} - {% assign sub_folder = sub_parts[1] %} - - {% if sub_folder == node.folder %} - <li> - <a class="waves-effect {% if sub_url == base_url %}active{% endif %}" href="{{ sub.url }}"> - {% if sub.menu_title %} - {{ sub.menu_title }} - {% else %} - {{ sub.title }} - {% endif %} - </a> + <li class="no-padding"> + <ul class="collapsible collapsible-accordion"> + {% for node in site.menu %} + <li class="bold"> + <a class="collapsible-header {% if base_folder == node.folder %}active{% endif %}">{{ node.title }}</a> + <div class="collapsible-body"> + <ul> + {% for sub in sorted_pages %} + + {% assign sub_parts = sub.url | split: '/' %} + {% assign sub_url = sub_parts | last %} + {% assign sub_folder = sub_parts[1] %} + + {% if sub_folder == node.folder %} + {% if sub.hidden == false %} + <li {% if sub_url == base_url %}class="active"{% endif %}> + <a href="{{ sub.url }}"> + {% if sub.menu_title %} + {{ sub.menu_title }} + {% else %} + {{ sub.title }} + {% endif %} + </a> + </li> + {% endif%} + {% endif %} + {% endfor %} + </ul> + </div> </li> - {% endif %} - {% endfor %} - {% endfor %} + {% endfor %} + </ul> + </li> <li><div class="divider"></div></li> <li><a class="waves-effect" href="{{ site.baseurl }}/news/">News</a></li> diff --git a/people/mkohlhase-activities.md b/people/mkohlhase-activities.md index 95257da..577cf4c 100644 --- a/people/mkohlhase-activities.md +++ b/people/mkohlhase-activities.md @@ -1,5 +1,6 @@ --- layout: page +hidden: true --- ## Academic Activities diff --git a/people/mkohlhase-cv.md b/people/mkohlhase-cv.md index 4cf38d8..be5acc4 100644 --- a/people/mkohlhase-cv.md +++ b/people/mkohlhase-cv.md @@ -1,5 +1,6 @@ --- layout: page +hidden: true --- ## CV Michael Kohlhase diff --git a/public/css/main.css b/public/css/main.css index 4c3aed8..fb9b017 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -37,7 +37,7 @@ h1, h2, h3, h4, h5, h6 { /* background color */ -.page-footer, nav { +.page-footer, nav, .side-nav .collapsible-body > ul:not(.collapsible) > li.active, .side-nav.fixed .collapsible-body > ul:not(.collapsible) > li.active { background-color: #5B78FD; } @@ -107,3 +107,41 @@ footer { footer a, footer a:hover { color: #000; } + +/* side bar */ + +ul.side-nav.fixed { + overflow: hidden +} + +ul.side-nav.fixed li { + line-height: 44px +} + +ul.side-nav.fixed li.active { + background-color: rgba(0, 0, 0, 0.05) +} + +ul.side-nav.fixed li a { + font-size: 13px; + line-height: 44px; + height: 44px; + padding: 0 30px +} + +ul.side-nav.fixed ul.collapsible-accordion { + background-color: #FFF +} + +ul.side-nav.fixed ul.collapsible-accordion a.collapsible-header { + padding: 0 30px +} + +ul.side-nav.fixed ul.collapsible-accordion .collapsible-body li a { + font-weight: 400; + padding: 0 37.5px 0 45px +} + +ul.side-nav.fixed:hover { + overflow-y: auto +} -- GitLab