From 3a73abad083c9d553cd9ef30ed4495a5d47e247f Mon Sep 17 00:00:00 2001 From: squidfunk Date: Thu, 15 Dec 2016 20:04:30 +0100 Subject: [PATCH] Added breadcrumbs in header --- mkdocs.yml | 1 + src/assets/stylesheets/layout/_header.scss | 17 +++++++++++++++++ src/assets/stylesheets/layout/_search.scss | 2 +- src/base.html | 5 +++-- src/partials/header.html | 17 ++++++++++++----- src/partials/source.html | 2 +- 6 files changed, 35 insertions(+), 9 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 5d542d3ef..d5ff488d0 100755 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -27,6 +27,7 @@ site_url: http://squidfunk.github.io/mkdocs-material/ # Repository repo_name: squidfunk/mkdocs-material repo_url: https://github.com/squidfunk/mkdocs-material +edit_uri: edit/master/docs/ # Copyright copyright: 'Copyright © 2016 Martin Donath' diff --git a/src/assets/stylesheets/layout/_header.scss b/src/assets/stylesheets/layout/_header.scss index 3d0ad93a0..be53874e7 100644 --- a/src/assets/stylesheets/layout/_header.scss +++ b/src/assets/stylesheets/layout/_header.scss @@ -100,6 +100,23 @@ line-height: 4.8rem; } + // Parent page title + &__parent { + color: $md-color-white--light; + + // Ancestor separator + &::after { + display: inline; + color: $md-color-white--lighter; + content: "/"; + } + + // [mobile portrait -]: Hide on very small screens + @include break-to-device(mobile portrait) { + display: none; + } + } + // Repository containing source &__source { display: none; diff --git a/src/assets/stylesheets/layout/_search.scss b/src/assets/stylesheets/layout/_search.scss index be68d488b..d794316ed 100644 --- a/src/assets/stylesheets/layout/_search.scss +++ b/src/assets/stylesheets/layout/_search.scss @@ -34,8 +34,8 @@ // [tablet landscape +]: Header-embedded search @include break-from-device(tablet landscape) { + margin-right: 2.8rem; padding: 0.4rem; - padding-right: 3.2rem; } // Search modal overlay diff --git a/src/base.html b/src/base.html index f11d75f12..2944d1c3b 100644 --- a/src/base.html +++ b/src/base.html @@ -153,8 +153,9 @@ {% block content %} - {% if edit_uri %} - + {% if config.edit_uri %} + Edit {% endif %} diff --git a/src/partials/header.html b/src/partials/header.html index c8b4b3b07..719337b6a 100644 --- a/src/partials/header.html +++ b/src/partials/header.html @@ -46,7 +46,14 @@
- {%- block site_name -%} + {% block site_name %} + {% if page %} + {% for parent in page.ancestors %} + + {{ parent.title }} + + {% endfor %} + {% endif %} {{ page.title | default(config.site_name, true) }} {% endblock %} @@ -54,9 +61,9 @@
- {%- block search_box -%} -