From c31f1c6125eb36e7f1676abb0dbffdb9cc1a4690 Mon Sep 17 00:00:00 2001 From: Brendan Abbott Date: Fri, 16 Dec 2016 10:46:52 +1000 Subject: [PATCH] Build the assets so the edit link work, change base to 'rework' branch (for now) --- material/assets/stylesheets/application.css | 23 ++++++++++++++------- material/base.html | 4 ++-- mkdocs.yml | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/material/assets/stylesheets/application.css b/material/assets/stylesheets/application.css index cc44db127..55aba2966 100644 --- a/material/assets/stylesheets/application.css +++ b/material/assets/stylesheets/application.css @@ -414,6 +414,12 @@ hr { padding: 0 2.0rem; font-size: 1.8rem; line-height: 4.8rem; } + .md-header-nav__parent { + color: rgba(255, 255, 255, 0.7); } + .md-header-nav__parent::after { + display: inline; + color: rgba(255, 255, 255, 0.3); + content: "/"; } .md-header-nav__source { display: none; } @@ -1556,8 +1562,8 @@ hr { padding-right: 1.2rem; } .md-search { - padding: 0.4rem; - padding-right: 3.2rem; } + margin-right: 2.8rem; + padding: 0.4rem; } .md-search__inner { display: table; @@ -1710,13 +1716,11 @@ hr { .md-sidebar__inner { border-right: 0.1rem solid rgba(0, 0, 0, 0.07); } } -@media only screen and (min-width: 30em) { - - .md-footer-nav__link { - width: 50%; } } - @media only screen and (max-width: 29.9375em) { + .md-header-nav__parent { + display: none; } + .md-footer-nav__link--prev .md-footer-nav__title { display: none; } @@ -1724,6 +1728,11 @@ hr { -webkit-transform: scale(45); transform: scale(45); } } +@media only screen and (min-width: 30em) { + + .md-footer-nav__link { + width: 50%; } } + @media only screen and (min-width: 30em) and (max-width: 44.9375em) { [data-md-toggle="search"]:checked ~ .md-header .md-search__overlay { diff --git a/material/base.html b/material/base.html index bcdb9c4e3..7b09930ee 100644 --- a/material/base.html +++ b/material/base.html @@ -74,8 +74,8 @@
{% block content %} - {% if edit_uri %} - + {% if config.edit_uri %} + Edit {% endif %} diff --git a/mkdocs.yml b/mkdocs.yml index d5ff488d0..d669b57bb 100755 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -27,7 +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/ +edit_uri: edit/rework/docs/ # Copyright copyright: 'Copyright © 2016 Martin Donath'