diff --git a/Gulpfile.js b/Gulpfile.js index 13fc4133a..96baa6a44 100755 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -97,9 +97,9 @@ gulp.task('assets:stylesheets', function() { .pipe( sass({ includePaths: [ - 'bower_components/modular-scale/stylesheets', - 'bower_components/quantum-colors', - 'bower_components/quantum-shadows' + 'node_modules/modularscale-sass/stylesheets', + 'node_modules/material-design-color', + 'node_modules/material-shadows' ] })) .pipe( @@ -153,8 +153,7 @@ gulp.task('assets:javascripts', function() { resolve: { modulesDirectories: [ 'src/assets/javascripts', - 'node_modules', - 'bower_components' + 'node_modules' ], extensions: [ '', '.js' diff --git a/bower.json b/bower.json deleted file mode 100644 index c812ef7f4..000000000 --- a/bower.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "mkdocs-material", - "version": "0.2.1", - "description": "A material design theme for MkDocs", - "homepage": "http://squidfunk.github.io/mkdocs-material/", - "authors": [ - "squidfunk " - ], - "license": "MIT", - "moduleType": [ - "globals" - ], - "ignore": [ - "**/.*", - "bower_components", - "node_modules" - ], - "private": true, - "devDependencies": { - "modular-scale": "^2.1.1", - "quantum-colors": "^1.0.1", - "quantum-shadows": "^1.0.0" - } -} diff --git a/docs/getting-started.md b/docs/getting-started.md index 7bb1ca45b..b926efb69 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -270,9 +270,21 @@ This will print: More colors can be freely defined. -> MkDocs supports several [Markdown extensions][]. The following extensions are -> not enabled by default (see the link for which are enabled by default), so you -> have to switch them on explicitly. +!!! hint "hint, note default" + +!!! tip "tip, idea" + +!!! check "check, success" + +!!! warning + +!!! failure "fail, failure" + +!!! fatal "fatal, danger" + +!!! bug "error, bug" + +!!! bug ## Full example diff --git a/material/assets/javascripts/application-a7f7c32389.js b/material/assets/javascripts/application-e9877e2824.js similarity index 94% rename from material/assets/javascripts/application-a7f7c32389.js rename to material/assets/javascripts/application-e9877e2824.js index f95f41d54..69f14d3dc 100644 --- a/material/assets/javascripts/application-a7f7c32389.js +++ b/material/assets/javascripts/application-e9877e2824.js @@ -1,4 +1,4 @@ -!function(e){function t(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return e[i].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}var o=n(1),r=i(o),a=n(2),s=i(a),c=n(3),l=i(c);document.addEventListener("DOMContentLoaded",function(){Modernizr.addTest("ios",function(){return!!navigator.userAgent.match(/(iPad|iPhone|iPod)/g)}),Modernizr.addTest("standalone",function(){return!!navigator.standalone}),r["default"].attach(document.body);var e=window.matchMedia("(min-width: 1200px)"),t=function(){e.matches?n.listen():n.unlisten()},n=new s["default"](".md-sidebar--primary");t();var i=new s["default"](".md-sidebar--secondary");i.listen();var o=new l["default"](".md-nav--toc .md-nav__item a");o.listen(),window.addEventListener("resize",t)})},function(e,t,n){var i;!function(){"use strict";/** +!function(e){function t(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return e[i].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}var o=n(1),r=i(o),a=n(2),s=i(a),c=n(3),l=i(c);document.addEventListener("DOMContentLoaded",function(){Modernizr.addTest("ios",function(){return!!navigator.userAgent.match(/(iPad|iPhone|iPod)/g)}),Modernizr.addTest("standalone",function(){return!!navigator.standalone}),r["default"].attach(document.body);var e=window.matchMedia("(min-width: 1200px)"),t=function(){e.matches?n.listen():n.unlisten()},n=new s["default"](".md-sidebar--primary");t();var i=new s["default"](".md-sidebar--secondary");i.listen();var o=new l["default"](".md-nav--toc .md-nav__item a");o.listen(),window.addEventListener("resize",t);var a=0,c=document.getElementById("md-toggle-search");c.addEventListener("click",function(e){var t=document.body.classList,n=!matchMedia("only screen and (min-width: 960px)").matches;t.contains("md-js__body--locked")?(t.remove("md-js__body--locked"),n&&setTimeout(function(){window.scrollTo(0,a)},100)):(a=window.scrollY,n&&setTimeout(function(){window.scrollTo(0,0)},400),setTimeout(function(){this.checked&&(n&&t.add("md-js__body--locked"),setTimeout(function(){document.getElementById("md-search").focus()},200))}.bind(this),450))})})},function(e,t,n){var i;!function(){"use strict";/** * @preserve FastClick: polyfill to remove click delays on browsers with touch UIs. * * @codingstandard ftlabs-jsv2 diff --git a/material/assets/javascripts/application.js b/material/assets/javascripts/application.js index f95f41d54..69f14d3dc 100644 --- a/material/assets/javascripts/application.js +++ b/material/assets/javascripts/application.js @@ -1,4 +1,4 @@ -!function(e){function t(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return e[i].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}var o=n(1),r=i(o),a=n(2),s=i(a),c=n(3),l=i(c);document.addEventListener("DOMContentLoaded",function(){Modernizr.addTest("ios",function(){return!!navigator.userAgent.match(/(iPad|iPhone|iPod)/g)}),Modernizr.addTest("standalone",function(){return!!navigator.standalone}),r["default"].attach(document.body);var e=window.matchMedia("(min-width: 1200px)"),t=function(){e.matches?n.listen():n.unlisten()},n=new s["default"](".md-sidebar--primary");t();var i=new s["default"](".md-sidebar--secondary");i.listen();var o=new l["default"](".md-nav--toc .md-nav__item a");o.listen(),window.addEventListener("resize",t)})},function(e,t,n){var i;!function(){"use strict";/** +!function(e){function t(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return e[i].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}var o=n(1),r=i(o),a=n(2),s=i(a),c=n(3),l=i(c);document.addEventListener("DOMContentLoaded",function(){Modernizr.addTest("ios",function(){return!!navigator.userAgent.match(/(iPad|iPhone|iPod)/g)}),Modernizr.addTest("standalone",function(){return!!navigator.standalone}),r["default"].attach(document.body);var e=window.matchMedia("(min-width: 1200px)"),t=function(){e.matches?n.listen():n.unlisten()},n=new s["default"](".md-sidebar--primary");t();var i=new s["default"](".md-sidebar--secondary");i.listen();var o=new l["default"](".md-nav--toc .md-nav__item a");o.listen(),window.addEventListener("resize",t);var a=0,c=document.getElementById("md-toggle-search");c.addEventListener("click",function(e){var t=document.body.classList,n=!matchMedia("only screen and (min-width: 960px)").matches;t.contains("md-js__body--locked")?(t.remove("md-js__body--locked"),n&&setTimeout(function(){window.scrollTo(0,a)},100)):(a=window.scrollY,n&&setTimeout(function(){window.scrollTo(0,0)},400),setTimeout(function(){this.checked&&(n&&t.add("md-js__body--locked"),setTimeout(function(){document.getElementById("md-search").focus()},200))}.bind(this),450))})})},function(e,t,n){var i;!function(){"use strict";/** * @preserve FastClick: polyfill to remove click delays on browsers with touch UIs. * * @codingstandard ftlabs-jsv2 diff --git a/material/assets/javascripts/modernizr-31a00ebfc6.js b/material/assets/javascripts/modernizr-31a00ebfc6.js new file mode 100644 index 000000000..a4a69031d --- /dev/null +++ b/material/assets/javascripts/modernizr-31a00ebfc6.js @@ -0,0 +1 @@ +!function(e,t,n){function r(e,t){return typeof e===t}function o(){var e,t,n,o,i,a,s;for(var l in b)if(b.hasOwnProperty(l)){if(e=[],t=b[l],t.name&&(e.push(t.name.toLowerCase()),t.options&&t.options.aliases&&t.options.aliases.length))for(n=0;nf;f++)if(h=e[f],g=N.style[h],l(h,"-")&&(h=m(h)),N.style[h]!==n){if(i||r(o,"undefined"))return a(),"pfx"==t?h:!0;try{N.style[h]=o}catch(y){}if(N.style[h]!=g)return a(),"pfx"==t?h:!0}return a(),!1}function g(e,t,n){var o;for(var i in e)if(e[i]in t)return n===!1?e[i]:(o=t[e[i]],r(o,"function")?s(o,n||t):o);return!1}function v(e,t,n,o,i){var a=e.charAt(0).toUpperCase()+e.slice(1),s=(e+" "+P.join(a+" ")+a).split(" ");return r(t,"string")||r(t,"undefined")?h(s,t,o,i):(s=(e+" "+A.join(a+" ")+a).split(" "),g(s,t,n))}function y(e,t,r){return v(e,n,n,t,r)}var b=[],E={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,t){var n=this;setTimeout(function(){t(n[e])},0)},addTest:function(e,t,n){b.push({name:e,fn:t,options:n})},addAsyncTest:function(e){b.push({name:null,fn:e})}},S=function(){};S.prototype=E,S=new S;var x,w=[],C=t.documentElement,T="svg"===C.nodeName.toLowerCase();!function(){var e={}.hasOwnProperty;x=r(e,"undefined")||r(e.call,"undefined")?function(e,t){return t in e&&r(e.constructor.prototype[t],"undefined")}:function(t,n){return e.call(t,n)}}(),E._l={},E.on=function(e,t){this._l[e]||(this._l[e]=[]),this._l[e].push(t),S.hasOwnProperty(e)&&setTimeout(function(){S._trigger(e,S[e])},0)},E._trigger=function(e,t){if(this._l[e]){var n=this._l[e];setTimeout(function(){var e,r;for(e=0;e",r.insertBefore(n.lastChild,r.firstChild)}function r(){var e=C.elements;return"string"==typeof e?e.split(" "):e}function o(e,t){var n=C.elements;"string"!=typeof n&&(n=n.join(" ")),"string"!=typeof e&&(e=e.join(" ")),C.elements=n+" "+e,c(t)}function i(e){var t=w[e[S]];return t||(t={},x++,e[S]=x,w[x]=t),t}function a(e,n,r){if(n||(n=t),g)return n.createElement(e);r||(r=i(n));var o;return o=r.cache[e]?r.cache[e].cloneNode():E.test(e)?(r.cache[e]=r.createElem(e)).cloneNode():r.createElem(e),!o.canHaveChildren||b.test(e)||o.tagUrn?o:r.frag.appendChild(o)}function s(e,n){if(e||(e=t),g)return e.createDocumentFragment();n=n||i(e);for(var o=n.frag.cloneNode(),a=0,s=r(),l=s.length;l>a;a++)o.createElement(s[a]);return o}function l(e,t){t.cache||(t.cache={},t.createElem=e.createElement,t.createFrag=e.createDocumentFragment,t.frag=t.createFrag()),e.createElement=function(n){return C.shivMethods?a(n,e,t):t.createElem(n)},e.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+r().join().replace(/[\w\-:]+/g,function(e){return t.createElem(e),t.frag.createElement(e),'c("'+e+'")'})+");return n}")(C,t.frag)}function c(e){e||(e=t);var r=i(e);return!C.shivCSS||h||r.hasCSS||(r.hasCSS=!!n(e,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),g||l(e,r),e}function u(e){for(var t,n=e.getElementsByTagName("*"),o=n.length,i=RegExp("^(?:"+r().join("|")+")$","i"),a=[];o--;)t=n[o],i.test(t.nodeName)&&a.push(t.applyElement(f(t)));return a}function f(e){for(var t,n=e.attributes,r=n.length,o=e.ownerDocument.createElement(_+":"+e.nodeName);r--;)t=n[r],t.specified&&o.setAttribute(t.nodeName,t.nodeValue);return o.style.cssText=e.style.cssText,o}function d(e){for(var t,n=e.split("{"),o=n.length,i=RegExp("(^|[\\s,>+~])("+r().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),a="$1"+_+"\\:$2";o--;)t=n[o]=n[o].split("}"),t[t.length-1]=t[t.length-1].replace(i,a),n[o]=t.join("}");return n.join("{")}function p(e){for(var t=e.length;t--;)e[t].removeNode()}function m(e){function t(){clearTimeout(a._removeSheetTimer),r&&r.removeNode(!0),r=null}var r,o,a=i(e),s=e.namespaces,l=e.parentWindow;return!N||e.printShived?e:("undefined"==typeof s[_]&&s.add(_),l.attachEvent("onbeforeprint",function(){t();for(var i,a,s,l=e.styleSheets,c=[],f=l.length,p=Array(f);f--;)p[f]=l[f];for(;s=p.pop();)if(!s.disabled&&T.test(s.media)){try{i=s.imports,a=i.length}catch(m){a=0}for(f=0;a>f;f++)p.push(i[f]);try{c.push(s.cssText)}catch(m){}}c=d(c.reverse().join("")),o=u(e),r=n(e,c)}),l.attachEvent("onafterprint",function(){p(o),clearTimeout(a._removeSheetTimer),a._removeSheetTimer=setTimeout(t,500)}),e.printShived=!0,e)}var h,g,v="3.7.3",y=e.html5||{},b=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,E=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,S="_html5shiv",x=0,w={};!function(){try{var e=t.createElement("a");e.innerHTML="",h="hidden"in e,g=1==e.childNodes.length||function(){t.createElement("a");var e=t.createDocumentFragment();return"undefined"==typeof e.cloneNode||"undefined"==typeof e.createDocumentFragment||"undefined"==typeof e.createElement}()}catch(n){h=!0,g=!0}}();var C={elements:y.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:v,shivCSS:y.shivCSS!==!1,supportsUnknownElements:g,shivMethods:y.shivMethods!==!1,type:"default",shivDocument:c,createElement:a,createDocumentFragment:s,addElements:o};e.html5=C,c(t);var T=/^$|\b(?:all|print)\b/,_="html5shiv",N=!g&&function(){var n=t.documentElement;return!("undefined"==typeof t.namespaces||"undefined"==typeof t.parentWindow||"undefined"==typeof n.applyElement||"undefined"==typeof n.removeNode||"undefined"==typeof e.attachEvent)}();C.type+=" print",C.shivPrint=m,m(t),"object"==typeof module&&module.exports&&(module.exports=C)}("undefined"!=typeof e?e:this,t);var _={elem:c("modernizr")};S._q.push(function(){delete _.elem});var N={style:_.elem.style};S._q.unshift(function(){delete N.style});var k=(E.testProp=function(e,t,r){return h([e],n,t,r)},E.testStyles=f),j=function(){var e=navigator.userAgent,t=e.match(/applewebkit\/([0-9]+)/gi)&&parseFloat(RegExp.$1),n=e.match(/w(eb)?osbrowser/gi),r=e.match(/windows phone/gi)&&e.match(/iemobile\/([0-9])+/gi)&&parseFloat(RegExp.$1)>=9,o=533>t&&e.match(/android/gi);return n||o||r}();j?S.addTest("fontface",!1):k('@font-face {font-family:"font";src:url("https://")}',function(e,n){var r=t.getElementById("smodernizr"),o=r.sheet||r.styleSheet,i=o?o.cssRules&&o.cssRules[0]?o.cssRules[0].cssText:o.cssText||"":"",a=/src/i.test(i)&&0===i.indexOf(n.split(" ")[0]);S.addTest("fontface",a)});var z="Moz O ms Webkit",P=E._config.usePrefixes?z.split(" "):[];E._cssomPrefixes=P;var A=E._config.usePrefixes?z.toLowerCase().split(" "):[];E._domPrefixes=A,E.testAllProps=v,E.testAllProps=y;var F="CSS"in e&&"supports"in e.CSS,$="supportsCSS"in e;S.addTest("supports",F||$),S.addTest("csstransforms3d",function(){var e=!!y("perspective","1px",!0),t=S._config.usePrefixes;if(e&&(!t||"webkitPerspective"in C.style)){var n,r="#modernizr{width:0;height:0}";S.supports?n="@supports (perspective: 1px)":(n="@media (transform-3d)",t&&(n+=",(-webkit-transform-3d)")),n+="{#modernizr{width:7px;height:18px;margin:0;padding:0;border:0}}",k(r+n,function(t){e=7===t.offsetWidth&&18===t.offsetHeight})}return e}),S.addTest("checked",function(){return k("#modernizr {position:absolute} #modernizr input {margin-left:10px} #modernizr :checked {margin-left:20px;display:block}",function(e){var t=c("input");return t.setAttribute("type","checkbox"),t.setAttribute("checked","checked"),e.appendChild(t),20===t.offsetLeft})}),S.addTest("target",function(){var t=e.document;if(!("querySelectorAll"in t))return!1;try{return t.querySelectorAll(":target"),!0}catch(n){return!1}}),S.addTest("contains",r(String.prototype.contains,"function")),o(),i(w),delete E.addTest,delete E.addAsyncTest;for(var q=0;qu;u++)if(h=e[u],g=N.style[h],l(h,"-")&&(h=m(h)),N.style[h]!==n){if(i||r(o,"undefined"))return a(),"pfx"==t?h:!0;try{N.style[h]=o}catch(y){}if(N.style[h]!=g)return a(),"pfx"==t?h:!0}return a(),!1}function g(e,t,n){var o;for(var i in e)if(e[i]in t)return n===!1?e[i]:(o=t[e[i]],r(o,"function")?s(o,n||t):o);return!1}function v(e,t,n,o,i){var a=e.charAt(0).toUpperCase()+e.slice(1),s=(e+" "+z.join(a+" ")+a).split(" ");return r(t,"string")||r(t,"undefined")?h(s,t,o,i):(s=(e+" "+F.join(a+" ")+a).split(" "),g(s,t,n))}function y(e,t,r){return v(e,n,n,t,r)}var E=[],S={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,t){var n=this;setTimeout(function(){t(n[e])},0)},addTest:function(e,t,n){E.push({name:e,fn:t,options:n})},addAsyncTest:function(e){E.push({name:null,fn:e})}},b=function(){};b.prototype=S,b=new b;var w,C=[],x=t.documentElement,T="svg"===x.nodeName.toLowerCase();!function(){var e={}.hasOwnProperty;w=r(e,"undefined")||r(e.call,"undefined")?function(e,t){return t in e&&r(e.constructor.prototype[t],"undefined")}:function(t,n){return e.call(t,n)}}(),S._l={},S.on=function(e,t){this._l[e]||(this._l[e]=[]),this._l[e].push(t),b.hasOwnProperty(e)&&setTimeout(function(){b._trigger(e,b[e])},0)},S._trigger=function(e,t){if(this._l[e]){var n=this._l[e];setTimeout(function(){var e,r;for(e=0;e",r.insertBefore(n.lastChild,r.firstChild)}function r(){var e=x.elements;return"string"==typeof e?e.split(" "):e}function o(e,t){var n=x.elements;"string"!=typeof n&&(n=n.join(" ")),"string"!=typeof e&&(e=e.join(" ")),x.elements=n+" "+e,c(t)}function i(e){var t=C[e[b]];return t||(t={},w++,e[b]=w,C[w]=t),t}function a(e,n,r){if(n||(n=t),g)return n.createElement(e);r||(r=i(n));var o;return o=r.cache[e]?r.cache[e].cloneNode():S.test(e)?(r.cache[e]=r.createElem(e)).cloneNode():r.createElem(e),!o.canHaveChildren||E.test(e)||o.tagUrn?o:r.frag.appendChild(o)}function s(e,n){if(e||(e=t),g)return e.createDocumentFragment();n=n||i(e);for(var o=n.frag.cloneNode(),a=0,s=r(),l=s.length;l>a;a++)o.createElement(s[a]);return o}function l(e,t){t.cache||(t.cache={},t.createElem=e.createElement,t.createFrag=e.createDocumentFragment,t.frag=t.createFrag()),e.createElement=function(n){return x.shivMethods?a(n,e,t):t.createElem(n)},e.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+r().join().replace(/[\w\-:]+/g,function(e){return t.createElem(e),t.frag.createElement(e),'c("'+e+'")'})+");return n}")(x,t.frag)}function c(e){e||(e=t);var r=i(e);return!x.shivCSS||h||r.hasCSS||(r.hasCSS=!!n(e,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),g||l(e,r),e}function f(e){for(var t,n=e.getElementsByTagName("*"),o=n.length,i=RegExp("^(?:"+r().join("|")+")$","i"),a=[];o--;)t=n[o],i.test(t.nodeName)&&a.push(t.applyElement(u(t)));return a}function u(e){for(var t,n=e.attributes,r=n.length,o=e.ownerDocument.createElement(_+":"+e.nodeName);r--;)t=n[r],t.specified&&o.setAttribute(t.nodeName,t.nodeValue);return o.style.cssText=e.style.cssText,o}function d(e){for(var t,n=e.split("{"),o=n.length,i=RegExp("(^|[\\s,>+~])("+r().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),a="$1"+_+"\\:$2";o--;)t=n[o]=n[o].split("}"),t[t.length-1]=t[t.length-1].replace(i,a),n[o]=t.join("}");return n.join("{")}function p(e){for(var t=e.length;t--;)e[t].removeNode()}function m(e){function t(){clearTimeout(a._removeSheetTimer),r&&r.removeNode(!0),r=null}var r,o,a=i(e),s=e.namespaces,l=e.parentWindow;return!N||e.printShived?e:("undefined"==typeof s[_]&&s.add(_),l.attachEvent("onbeforeprint",function(){t();for(var i,a,s,l=e.styleSheets,c=[],u=l.length,p=Array(u);u--;)p[u]=l[u];for(;s=p.pop();)if(!s.disabled&&T.test(s.media)){try{i=s.imports,a=i.length}catch(m){a=0}for(u=0;a>u;u++)p.push(i[u]);try{c.push(s.cssText)}catch(m){}}c=d(c.reverse().join("")),o=f(e),r=n(e,c)}),l.attachEvent("onafterprint",function(){p(o),clearTimeout(a._removeSheetTimer),a._removeSheetTimer=setTimeout(t,500)}),e.printShived=!0,e)}var h,g,v="3.7.3",y=e.html5||{},E=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,S=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,b="_html5shiv",w=0,C={};!function(){try{var e=t.createElement("a");e.innerHTML="",h="hidden"in e,g=1==e.childNodes.length||function(){t.createElement("a");var e=t.createDocumentFragment();return"undefined"==typeof e.cloneNode||"undefined"==typeof e.createDocumentFragment||"undefined"==typeof e.createElement}()}catch(n){h=!0,g=!0}}();var x={elements:y.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:v,shivCSS:y.shivCSS!==!1,supportsUnknownElements:g,shivMethods:y.shivMethods!==!1,type:"default",shivDocument:c,createElement:a,createDocumentFragment:s,addElements:o};e.html5=x,c(t);var T=/^$|\b(?:all|print)\b/,_="html5shiv",N=!g&&function(){var n=t.documentElement;return!("undefined"==typeof t.namespaces||"undefined"==typeof t.parentWindow||"undefined"==typeof n.applyElement||"undefined"==typeof n.removeNode||"undefined"==typeof e.attachEvent)}();x.type+=" print",x.shivPrint=m,m(t),"object"==typeof module&&module.exports&&(module.exports=x)}("undefined"!=typeof e?e:this,t);var _={elem:c("modernizr")};b._q.push(function(){delete _.elem});var N={style:_.elem.style};b._q.unshift(function(){delete N.style});var j=(S.testProp=function(e,t,r){return h([e],n,t,r)},S.testStyles=u),P=function(){var e=navigator.userAgent,t=e.match(/applewebkit\/([0-9]+)/gi)&&parseFloat(RegExp.$1),n=e.match(/w(eb)?osbrowser/gi),r=e.match(/windows phone/gi)&&e.match(/iemobile\/([0-9])+/gi)&&parseFloat(RegExp.$1)>=9,o=533>t&&e.match(/android/gi);return n||o||r}();P?b.addTest("fontface",!1):j('@font-face {font-family:"font";src:url("https://")}',function(e,n){var r=t.getElementById("smodernizr"),o=r.sheet||r.styleSheet,i=o?o.cssRules&&o.cssRules[0]?o.cssRules[0].cssText:o.cssText||"":"",a=/src/i.test(i)&&0===i.indexOf(n.split(" ")[0]);b.addTest("fontface",a)});var k="Moz O ms Webkit",z=S._config.usePrefixes?k.split(" "):[];S._cssomPrefixes=z;var F=S._config.usePrefixes?k.toLowerCase().split(" "):[];S._domPrefixes=F,S.testAllProps=v,S.testAllProps=y;var $="CSS"in e&&"supports"in e.CSS,A="supportsCSS"in e;b.addTest("supports",$||A),b.addTest("csstransforms3d",function(){var e=!!y("perspective","1px",!0),t=b._config.usePrefixes;if(e&&(!t||"webkitPerspective"in x.style)){var n,r="#modernizr{width:0;height:0}";b.supports?n="@supports (perspective: 1px)":(n="@media (transform-3d)",t&&(n+=",(-webkit-transform-3d)")),n+="{#modernizr{width:7px;height:18px;margin:0;padding:0;border:0}}",j(r+n,function(t){e=7===t.offsetWidth&&18===t.offsetHeight})}return e}),b.addTest("target",function(){var t=e.document;if(!("querySelectorAll"in t))return!1;try{return t.querySelectorAll(":target"),!0}catch(n){return!1}}),b.addTest("contains",r(String.prototype.contains,"function")),o(),i(C),delete S.addTest,delete S.addAsyncTest;for(var q=0;qu;u++)if(h=e[u],g=N.style[h],l(h,"-")&&(h=m(h)),N.style[h]!==n){if(i||r(o,"undefined"))return a(),"pfx"==t?h:!0;try{N.style[h]=o}catch(y){}if(N.style[h]!=g)return a(),"pfx"==t?h:!0}return a(),!1}function g(e,t,n){var o;for(var i in e)if(e[i]in t)return n===!1?e[i]:(o=t[e[i]],r(o,"function")?s(o,n||t):o);return!1}function v(e,t,n,o,i){var a=e.charAt(0).toUpperCase()+e.slice(1),s=(e+" "+z.join(a+" ")+a).split(" ");return r(t,"string")||r(t,"undefined")?h(s,t,o,i):(s=(e+" "+F.join(a+" ")+a).split(" "),g(s,t,n))}function y(e,t,r){return v(e,n,n,t,r)}var E=[],S={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,t){var n=this;setTimeout(function(){t(n[e])},0)},addTest:function(e,t,n){E.push({name:e,fn:t,options:n})},addAsyncTest:function(e){E.push({name:null,fn:e})}},b=function(){};b.prototype=S,b=new b;var w,C=[],x=t.documentElement,T="svg"===x.nodeName.toLowerCase();!function(){var e={}.hasOwnProperty;w=r(e,"undefined")||r(e.call,"undefined")?function(e,t){return t in e&&r(e.constructor.prototype[t],"undefined")}:function(t,n){return e.call(t,n)}}(),S._l={},S.on=function(e,t){this._l[e]||(this._l[e]=[]),this._l[e].push(t),b.hasOwnProperty(e)&&setTimeout(function(){b._trigger(e,b[e])},0)},S._trigger=function(e,t){if(this._l[e]){var n=this._l[e];setTimeout(function(){var e,r;for(e=0;e",r.insertBefore(n.lastChild,r.firstChild)}function r(){var e=x.elements;return"string"==typeof e?e.split(" "):e}function o(e,t){var n=x.elements;"string"!=typeof n&&(n=n.join(" ")),"string"!=typeof e&&(e=e.join(" ")),x.elements=n+" "+e,c(t)}function i(e){var t=C[e[b]];return t||(t={},w++,e[b]=w,C[w]=t),t}function a(e,n,r){if(n||(n=t),g)return n.createElement(e);r||(r=i(n));var o;return o=r.cache[e]?r.cache[e].cloneNode():S.test(e)?(r.cache[e]=r.createElem(e)).cloneNode():r.createElem(e),!o.canHaveChildren||E.test(e)||o.tagUrn?o:r.frag.appendChild(o)}function s(e,n){if(e||(e=t),g)return e.createDocumentFragment();n=n||i(e);for(var o=n.frag.cloneNode(),a=0,s=r(),l=s.length;l>a;a++)o.createElement(s[a]);return o}function l(e,t){t.cache||(t.cache={},t.createElem=e.createElement,t.createFrag=e.createDocumentFragment,t.frag=t.createFrag()),e.createElement=function(n){return x.shivMethods?a(n,e,t):t.createElem(n)},e.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+r().join().replace(/[\w\-:]+/g,function(e){return t.createElem(e),t.frag.createElement(e),'c("'+e+'")'})+");return n}")(x,t.frag)}function c(e){e||(e=t);var r=i(e);return!x.shivCSS||h||r.hasCSS||(r.hasCSS=!!n(e,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),g||l(e,r),e}function f(e){for(var t,n=e.getElementsByTagName("*"),o=n.length,i=RegExp("^(?:"+r().join("|")+")$","i"),a=[];o--;)t=n[o],i.test(t.nodeName)&&a.push(t.applyElement(u(t)));return a}function u(e){for(var t,n=e.attributes,r=n.length,o=e.ownerDocument.createElement(_+":"+e.nodeName);r--;)t=n[r],t.specified&&o.setAttribute(t.nodeName,t.nodeValue);return o.style.cssText=e.style.cssText,o}function d(e){for(var t,n=e.split("{"),o=n.length,i=RegExp("(^|[\\s,>+~])("+r().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),a="$1"+_+"\\:$2";o--;)t=n[o]=n[o].split("}"),t[t.length-1]=t[t.length-1].replace(i,a),n[o]=t.join("}");return n.join("{")}function p(e){for(var t=e.length;t--;)e[t].removeNode()}function m(e){function t(){clearTimeout(a._removeSheetTimer),r&&r.removeNode(!0),r=null}var r,o,a=i(e),s=e.namespaces,l=e.parentWindow;return!N||e.printShived?e:("undefined"==typeof s[_]&&s.add(_),l.attachEvent("onbeforeprint",function(){t();for(var i,a,s,l=e.styleSheets,c=[],u=l.length,p=Array(u);u--;)p[u]=l[u];for(;s=p.pop();)if(!s.disabled&&T.test(s.media)){try{i=s.imports,a=i.length}catch(m){a=0}for(u=0;a>u;u++)p.push(i[u]);try{c.push(s.cssText)}catch(m){}}c=d(c.reverse().join("")),o=f(e),r=n(e,c)}),l.attachEvent("onafterprint",function(){p(o),clearTimeout(a._removeSheetTimer),a._removeSheetTimer=setTimeout(t,500)}),e.printShived=!0,e)}var h,g,v="3.7.3",y=e.html5||{},E=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,S=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,b="_html5shiv",w=0,C={};!function(){try{var e=t.createElement("a");e.innerHTML="",h="hidden"in e,g=1==e.childNodes.length||function(){t.createElement("a");var e=t.createDocumentFragment();return"undefined"==typeof e.cloneNode||"undefined"==typeof e.createDocumentFragment||"undefined"==typeof e.createElement}()}catch(n){h=!0,g=!0}}();var x={elements:y.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:v,shivCSS:y.shivCSS!==!1,supportsUnknownElements:g,shivMethods:y.shivMethods!==!1,type:"default",shivDocument:c,createElement:a,createDocumentFragment:s,addElements:o};e.html5=x,c(t);var T=/^$|\b(?:all|print)\b/,_="html5shiv",N=!g&&function(){var n=t.documentElement;return!("undefined"==typeof t.namespaces||"undefined"==typeof t.parentWindow||"undefined"==typeof n.applyElement||"undefined"==typeof n.removeNode||"undefined"==typeof e.attachEvent)}();x.type+=" print",x.shivPrint=m,m(t),"object"==typeof module&&module.exports&&(module.exports=x)}("undefined"!=typeof e?e:this,t);var _={elem:c("modernizr")};b._q.push(function(){delete _.elem});var N={style:_.elem.style};b._q.unshift(function(){delete N.style});var j=(S.testProp=function(e,t,r){return h([e],n,t,r)},S.testStyles=u),P=function(){var e=navigator.userAgent,t=e.match(/applewebkit\/([0-9]+)/gi)&&parseFloat(RegExp.$1),n=e.match(/w(eb)?osbrowser/gi),r=e.match(/windows phone/gi)&&e.match(/iemobile\/([0-9])+/gi)&&parseFloat(RegExp.$1)>=9,o=533>t&&e.match(/android/gi);return n||o||r}();P?b.addTest("fontface",!1):j('@font-face {font-family:"font";src:url("https://")}',function(e,n){var r=t.getElementById("smodernizr"),o=r.sheet||r.styleSheet,i=o?o.cssRules&&o.cssRules[0]?o.cssRules[0].cssText:o.cssText||"":"",a=/src/i.test(i)&&0===i.indexOf(n.split(" ")[0]);b.addTest("fontface",a)});var k="Moz O ms Webkit",z=S._config.usePrefixes?k.split(" "):[];S._cssomPrefixes=z;var F=S._config.usePrefixes?k.toLowerCase().split(" "):[];S._domPrefixes=F,S.testAllProps=v,S.testAllProps=y;var $="CSS"in e&&"supports"in e.CSS,A="supportsCSS"in e;b.addTest("supports",$||A),b.addTest("csstransforms3d",function(){var e=!!y("perspective","1px",!0),t=b._config.usePrefixes;if(e&&(!t||"webkitPerspective"in x.style)){var n,r="#modernizr{width:0;height:0}";b.supports?n="@supports (perspective: 1px)":(n="@media (transform-3d)",t&&(n+=",(-webkit-transform-3d)")),n+="{#modernizr{width:7px;height:18px;margin:0;padding:0;border:0}}",j(r+n,function(t){e=7===t.offsetWidth&&18===t.offsetHeight})}return e}),b.addTest("target",function(){var t=e.document;if(!("querySelectorAll"in t))return!1;try{return t.querySelectorAll(":target"),!0}catch(n){return!1}}),b.addTest("contains",r(String.prototype.contains,"function")),o(),i(C),delete S.addTest,delete S.addAsyncTest;for(var q=0;qf;f++)if(h=e[f],g=N.style[h],l(h,"-")&&(h=m(h)),N.style[h]!==n){if(i||r(o,"undefined"))return a(),"pfx"==t?h:!0;try{N.style[h]=o}catch(y){}if(N.style[h]!=g)return a(),"pfx"==t?h:!0}return a(),!1}function g(e,t,n){var o;for(var i in e)if(e[i]in t)return n===!1?e[i]:(o=t[e[i]],r(o,"function")?s(o,n||t):o);return!1}function v(e,t,n,o,i){var a=e.charAt(0).toUpperCase()+e.slice(1),s=(e+" "+P.join(a+" ")+a).split(" ");return r(t,"string")||r(t,"undefined")?h(s,t,o,i):(s=(e+" "+A.join(a+" ")+a).split(" "),g(s,t,n))}function y(e,t,r){return v(e,n,n,t,r)}var b=[],E={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,t){var n=this;setTimeout(function(){t(n[e])},0)},addTest:function(e,t,n){b.push({name:e,fn:t,options:n})},addAsyncTest:function(e){b.push({name:null,fn:e})}},S=function(){};S.prototype=E,S=new S;var x,w=[],C=t.documentElement,T="svg"===C.nodeName.toLowerCase();!function(){var e={}.hasOwnProperty;x=r(e,"undefined")||r(e.call,"undefined")?function(e,t){return t in e&&r(e.constructor.prototype[t],"undefined")}:function(t,n){return e.call(t,n)}}(),E._l={},E.on=function(e,t){this._l[e]||(this._l[e]=[]),this._l[e].push(t),S.hasOwnProperty(e)&&setTimeout(function(){S._trigger(e,S[e])},0)},E._trigger=function(e,t){if(this._l[e]){var n=this._l[e];setTimeout(function(){var e,r;for(e=0;e",r.insertBefore(n.lastChild,r.firstChild)}function r(){var e=C.elements;return"string"==typeof e?e.split(" "):e}function o(e,t){var n=C.elements;"string"!=typeof n&&(n=n.join(" ")),"string"!=typeof e&&(e=e.join(" ")),C.elements=n+" "+e,c(t)}function i(e){var t=w[e[S]];return t||(t={},x++,e[S]=x,w[x]=t),t}function a(e,n,r){if(n||(n=t),g)return n.createElement(e);r||(r=i(n));var o;return o=r.cache[e]?r.cache[e].cloneNode():E.test(e)?(r.cache[e]=r.createElem(e)).cloneNode():r.createElem(e),!o.canHaveChildren||b.test(e)||o.tagUrn?o:r.frag.appendChild(o)}function s(e,n){if(e||(e=t),g)return e.createDocumentFragment();n=n||i(e);for(var o=n.frag.cloneNode(),a=0,s=r(),l=s.length;l>a;a++)o.createElement(s[a]);return o}function l(e,t){t.cache||(t.cache={},t.createElem=e.createElement,t.createFrag=e.createDocumentFragment,t.frag=t.createFrag()),e.createElement=function(n){return C.shivMethods?a(n,e,t):t.createElem(n)},e.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+r().join().replace(/[\w\-:]+/g,function(e){return t.createElem(e),t.frag.createElement(e),'c("'+e+'")'})+");return n}")(C,t.frag)}function c(e){e||(e=t);var r=i(e);return!C.shivCSS||h||r.hasCSS||(r.hasCSS=!!n(e,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),g||l(e,r),e}function u(e){for(var t,n=e.getElementsByTagName("*"),o=n.length,i=RegExp("^(?:"+r().join("|")+")$","i"),a=[];o--;)t=n[o],i.test(t.nodeName)&&a.push(t.applyElement(f(t)));return a}function f(e){for(var t,n=e.attributes,r=n.length,o=e.ownerDocument.createElement(_+":"+e.nodeName);r--;)t=n[r],t.specified&&o.setAttribute(t.nodeName,t.nodeValue);return o.style.cssText=e.style.cssText,o}function d(e){for(var t,n=e.split("{"),o=n.length,i=RegExp("(^|[\\s,>+~])("+r().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),a="$1"+_+"\\:$2";o--;)t=n[o]=n[o].split("}"),t[t.length-1]=t[t.length-1].replace(i,a),n[o]=t.join("}");return n.join("{")}function p(e){for(var t=e.length;t--;)e[t].removeNode()}function m(e){function t(){clearTimeout(a._removeSheetTimer),r&&r.removeNode(!0),r=null}var r,o,a=i(e),s=e.namespaces,l=e.parentWindow;return!N||e.printShived?e:("undefined"==typeof s[_]&&s.add(_),l.attachEvent("onbeforeprint",function(){t();for(var i,a,s,l=e.styleSheets,c=[],f=l.length,p=Array(f);f--;)p[f]=l[f];for(;s=p.pop();)if(!s.disabled&&T.test(s.media)){try{i=s.imports,a=i.length}catch(m){a=0}for(f=0;a>f;f++)p.push(i[f]);try{c.push(s.cssText)}catch(m){}}c=d(c.reverse().join("")),o=u(e),r=n(e,c)}),l.attachEvent("onafterprint",function(){p(o),clearTimeout(a._removeSheetTimer),a._removeSheetTimer=setTimeout(t,500)}),e.printShived=!0,e)}var h,g,v="3.7.3",y=e.html5||{},b=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,E=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,S="_html5shiv",x=0,w={};!function(){try{var e=t.createElement("a");e.innerHTML="",h="hidden"in e,g=1==e.childNodes.length||function(){t.createElement("a");var e=t.createDocumentFragment();return"undefined"==typeof e.cloneNode||"undefined"==typeof e.createDocumentFragment||"undefined"==typeof e.createElement}()}catch(n){h=!0,g=!0}}();var C={elements:y.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:v,shivCSS:y.shivCSS!==!1,supportsUnknownElements:g,shivMethods:y.shivMethods!==!1,type:"default",shivDocument:c,createElement:a,createDocumentFragment:s,addElements:o};e.html5=C,c(t);var T=/^$|\b(?:all|print)\b/,_="html5shiv",N=!g&&function(){var n=t.documentElement;return!("undefined"==typeof t.namespaces||"undefined"==typeof t.parentWindow||"undefined"==typeof n.applyElement||"undefined"==typeof n.removeNode||"undefined"==typeof e.attachEvent)}();C.type+=" print",C.shivPrint=m,m(t),"object"==typeof module&&module.exports&&(module.exports=C)}("undefined"!=typeof e?e:this,t);var _={elem:c("modernizr")};S._q.push(function(){delete _.elem});var N={style:_.elem.style};S._q.unshift(function(){delete N.style});var k=(E.testProp=function(e,t,r){return h([e],n,t,r)},E.testStyles=f),j=function(){var e=navigator.userAgent,t=e.match(/applewebkit\/([0-9]+)/gi)&&parseFloat(RegExp.$1),n=e.match(/w(eb)?osbrowser/gi),r=e.match(/windows phone/gi)&&e.match(/iemobile\/([0-9])+/gi)&&parseFloat(RegExp.$1)>=9,o=533>t&&e.match(/android/gi);return n||o||r}();j?S.addTest("fontface",!1):k('@font-face {font-family:"font";src:url("https://")}',function(e,n){var r=t.getElementById("smodernizr"),o=r.sheet||r.styleSheet,i=o?o.cssRules&&o.cssRules[0]?o.cssRules[0].cssText:o.cssText||"":"",a=/src/i.test(i)&&0===i.indexOf(n.split(" ")[0]);S.addTest("fontface",a)});var z="Moz O ms Webkit",P=E._config.usePrefixes?z.split(" "):[];E._cssomPrefixes=P;var A=E._config.usePrefixes?z.toLowerCase().split(" "):[];E._domPrefixes=A,E.testAllProps=v,E.testAllProps=y;var F="CSS"in e&&"supports"in e.CSS,$="supportsCSS"in e;S.addTest("supports",F||$),S.addTest("csstransforms3d",function(){var e=!!y("perspective","1px",!0),t=S._config.usePrefixes;if(e&&(!t||"webkitPerspective"in C.style)){var n,r="#modernizr{width:0;height:0}";S.supports?n="@supports (perspective: 1px)":(n="@media (transform-3d)",t&&(n+=",(-webkit-transform-3d)")),n+="{#modernizr{width:7px;height:18px;margin:0;padding:0;border:0}}",k(r+n,function(t){e=7===t.offsetWidth&&18===t.offsetHeight})}return e}),S.addTest("checked",function(){return k("#modernizr {position:absolute} #modernizr input {margin-left:10px} #modernizr :checked {margin-left:20px;display:block}",function(e){var t=c("input");return t.setAttribute("type","checkbox"),t.setAttribute("checked","checked"),e.appendChild(t),20===t.offsetLeft})}),S.addTest("target",function(){var t=e.document;if(!("querySelectorAll"in t))return!1;try{return t.querySelectorAll(":target"),!0}catch(n){return!1}}),S.addTest("contains",r(String.prototype.contains,"function")),o(),i(w),delete E.addTest,delete E.addAsyncTest;for(var q=0;q {% endif %} {% endblock %} - - - + + + + {% for path in extra_css %} {% endfor %} - + @@ -87,7 +73,7 @@ var base_url = '{{ base_url }}'; var repo_url = '{{ repo_url }}'; - + {% for path in extra_javascript %} {% endfor %} diff --git a/material/header.html b/material/header.html index 5e41a917f..e17d336cf 100644 --- a/material/header.html +++ b/material/header.html @@ -9,13 +9,14 @@ {{ page_title | default(site_name, true) }} -
+
-
-
- - -
+
+
+ + + +
FOO
FOO
FOO
@@ -36,4 +37,6 @@
+ \ No newline at end of file diff --git a/material/manifest.json b/material/manifest.json index c9c960898..02f938d6d 100644 --- a/material/manifest.json +++ b/material/manifest.json @@ -1,6 +1,6 @@ { "assets/images/favicon.ico": "assets/images/favicon-e565ddfa3b.ico", - "assets/javascripts/application.js": "assets/javascripts/application-a7f7c32389.js", - "assets/javascripts/modernizr.js": "assets/javascripts/modernizr-d1e05123d4.js", - "assets/stylesheets/application.css": "assets/stylesheets/application-76344d4d6f.css" + "assets/javascripts/application.js": "assets/javascripts/application-e9877e2824.js", + "assets/javascripts/modernizr.js": "assets/javascripts/modernizr-31a00ebfc6.js", + "assets/stylesheets/application.css": "assets/stylesheets/application-8e9e9d1cff.css" } \ No newline at end of file diff --git a/package.json b/package.json index 7b7465c6b..18c360675 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "license": "MIT", "main": "Gulpfile.js", "scripts": { - "start": "gulp watch" + "start": "./node_modules/.bin/gulp watch --mkdocs", + "build": "./node_modules/.bin/gulp build --production" }, "repository": { "type": "git", @@ -18,6 +19,9 @@ "private": true, "dependencies": { "fastclick": "^1.0.6", + "material-colors": "^1.0.0", + "material-shadows": "^3.0.0", + "modularscale-sass": "^2.1.1", "whatwg-fetch": "^1.0.0" }, "devDependencies": { diff --git a/src/assets/fonts/icon.eot b/src/assets/fonts/icon.eot deleted file mode 100755 index 8f81638c2..000000000 Binary files a/src/assets/fonts/icon.eot and /dev/null differ diff --git a/src/assets/fonts/icon.json b/src/assets/fonts/icon.json deleted file mode 100644 index fc26e5702..000000000 --- a/src/assets/fonts/icon.json +++ /dev/null @@ -1,348 +0,0 @@ -{ -  "IcoMoonType": "selection", -  "icons": [ -    { -      "icon": { -        "paths": [ -          "M661.333 597.333h-33.92l-11.733-11.733c41.813-48.427 66.987-111.36 66.987-180.267 0-153.173-124.16-277.333-277.333-277.333s-277.333 124.16-277.333 277.333 124.16 277.333 277.333 277.333c68.907 0 131.84-25.173 180.267-66.773l11.733 11.733v33.707l213.333 212.907 63.573-63.573-212.907-213.333zM405.333 597.333c-106.027 0-192-85.973-192-192s85.973-192 192-192 192 85.973 192 192-85.973 192-192 192z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "search" -        ], -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "id": 0, -        "order": 7, -        "prevSize": 24, -        "code": 58880, -        "name": "search" -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 0 -    }, -    { -      "icon": { -        "paths": [ -          "M853.333 469.333h-519.253l238.293-238.293-60.373-60.373-341.333 341.333 341.333 341.333 60.373-60.373-238.293-238.293h519.253v-85.333z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "arrow-back" -        ], -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "id": 1, -        "order": 4, -        "prevSize": 24, -        "code": 58881, -        "name": "arrow-back" -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 1 -    }, -    { -      "icon": { -        "paths": [ -          "M426.667 256l-60.373 60.373 195.627 195.627-195.627 195.627 60.373 60.373 256-256z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "chevron-right" -        ], -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "id": 2, -        "order": 9, -        "prevSize": 24, -        "code": 58882, -        "name": "chevron-right" -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 2 -    }, -    { -      "icon": { -        "paths": [ -          "M810.667 273.707l-60.373-60.373-238.293 238.293-238.293-238.293-60.373 60.373 238.293 238.293-238.293 238.293 60.373 60.373 238.293-238.293 238.293 238.293 60.373-60.373-238.293-238.293z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "close" -        ], -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "id": 3, -        "order": 8, -        "prevSize": 24, -        "code": 58883, -        "name": "close" -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 3 -    }, -    { -      "icon": { -        "paths": [ -          "M128 768h768v-85.333h-768v85.333zM128 554.667h768v-85.333h-768v85.333zM128 256v85.333h768v-85.333h-768z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "menu" -        ], -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "id": 4, -        "order": 10, -        "prevSize": 24, -        "code": 58884, -        "name": "menu" -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 4 -    }, -    { -      "icon": { -        "paths": [ -          "M512 170.667l-60.373 60.373 238.293 238.293h-519.253v85.333h519.253l-238.293 238.293 60.373 60.373 341.333-341.333z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "arrow-forward" -        ], -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "id": 5, -        "order": 15, -        "prevSize": 24, -        "code": 58885, -        "name": "arrow-forward" -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 5 -    }, -    { -      "icon": { -        "paths": [ -          "M1024 194.418c-37.676 16.708-78.164 28.002-120.66 33.080 43.372-26 76.686-67.17 92.372-116.23-40.596 24.078-85.556 41.56-133.41 50.98-38.32-40.83-92.922-66.34-153.346-66.34-116.022 0-210.088 94.058-210.088 210.078 0 16.466 1.858 32.5 5.44 47.878-174.6-8.764-329.402-92.4-433.018-219.506-18.084 31.028-28.446 67.116-28.446 105.618 0 72.888 37.088 137.192 93.46 174.866-34.438-1.092-66.832-10.542-95.154-26.278-0.020 0.876-0.020 1.756-0.020 2.642 0 101.788 72.418 186.696 168.522 206-17.626 4.8-36.188 7.372-55.348 7.372-13.538 0-26.698-1.32-39.528-3.772 26.736 83.46 104.32 144.206 196.252 145.896-71.9 56.35-162.486 89.934-260.916 89.934-16.958 0-33.68-0.994-50.116-2.94 92.972 59.61 203.402 94.394 322.042 94.394 386.422 0 597.736-320.124 597.736-597.744 0-9.108-0.206-18.168-0.61-27.18 41.056-29.62 76.672-66.62 104.836-108.748z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "twitter", -          "brand", -          "tweet", -          "social" -        ], -        "defaultCode": 58525, -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "id": 6, -        "order": 9, -        "prevSize": 24, -        "code": 58886, -        "ligatures": "twitter, brand11", -        "name": "twitter" -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 6 -    }, -    { -      "icon": { -        "paths": [ -          "M810.667 384h-170.667v-256h-256v256h-170.667l298.667 298.667 298.667-298.667zM213.333 768v85.333h597.333v-85.333h-597.333z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "file-download" -        ], -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "id": 7, -        "order": 10, -        "prevSize": 24, -        "code": 58888, -        "name": "download" -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 7 -    }, -    { -      "icon": { -        "paths": [ -          "M512 736.853l263.68 159.147-69.973-299.947 232.96-201.813-306.773-26.027-119.893-282.88-119.893 282.88-306.773 26.027 232.96 201.813-69.973 299.947z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "star" -        ], -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "id": 8, -        "order": 9, -        "prevSize": 24, -        "code": 58889, -        "name": "star" -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 8 -    }, -    { -      "icon": { -        "paths": [ -          "M512.008 12.642c-282.738 0-512.008 229.218-512.008 511.998 0 226.214 146.704 418.132 350.136 485.836 25.586 4.738 34.992-11.11 34.992-24.632 0-12.204-0.48-52.542-0.696-95.324-142.448 30.976-172.504-60.41-172.504-60.41-23.282-59.176-56.848-74.916-56.848-74.916-46.452-31.778 3.51-31.124 3.51-31.124 51.4 3.61 78.476 52.766 78.476 52.766 45.672 78.27 119.776 55.64 149.004 42.558 4.588-33.086 17.852-55.68 32.506-68.464-113.73-12.942-233.276-56.85-233.276-253.032 0-55.898 20.004-101.574 52.76-137.428-5.316-12.9-22.854-64.972 4.952-135.5 0 0 43.006-13.752 140.84 52.49 40.836-11.348 84.636-17.036 128.154-17.234 43.502 0.198 87.336 5.886 128.256 17.234 97.734-66.244 140.656-52.49 140.656-52.49 27.872 70.528 10.35 122.6 5.036 135.5 32.82 35.856 52.694 81.532 52.694 137.428 0 196.654-119.778 239.95-233.79 252.624 18.364 15.89 34.724 47.046 34.724 94.812 0 68.508-0.596 123.644-0.596 140.508 0 13.628 9.222 29.594 35.172 24.566 203.322-67.776 349.842-259.626 349.842-485.768 0-282.78-229.234-511.998-511.992-511.998z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "github", -          "brand", -          "octacat", -          "social" -        ], -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "order": 27, -        "prevSize": 24, -        "ligatures": "github, brand40", -        "name": "github", -        "id": 9, -        "code": 58887 -      }, -      "setIdx": 0, -      "setId": 3, -      "iconIdx": 9 -    }, -    { -      "icon": { -        "paths": [ -          "M554 598v-172h-84v172h84zM554 768v-86h-84v86h84zM42 896l470-810 470 810h-940z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "warning" -        ], -        "defaultCode": 57346, -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "order": 11, -        "prevSize": 24, -        "name": "warning", -        "ligatures": "warning", -        "id": 2, -        "code": 58896 -      }, -      "setIdx": 1, -      "setId": 2, -      "iconIdx": 2 -    }, -    { -      "icon": { -        "paths": [ -          "M614 256h240v426h-300l-16-84h-240v298h-84v-726h384z" -        ], -        "attrs": [], -        "isMulticolor": false, -        "tags": [ -          "flag" -        ], -        "defaultCode": 57683, -        "grid": 24 -      }, -      "attrs": [], -      "properties": { -        "order": 13, -        "prevSize": 24, -        "name": "note", -        "ligatures": "flag", -        "id": 140, -        "code": 58897 -      }, -      "setIdx": 1, -      "setId": 2, -      "iconIdx": 140 -    } -  ], -  "height": 1024, -  "metadata": { -    "name": "icon" -  }, -  "preferences": { -    "showGlyphs": true, -    "showQuickUse": true, -    "showQuickUse2": true, -    "showSVGs": true, -    "fontPref": { -      "prefix": "icon-", -      "metadata": { -        "fontFamily": "icon", -        "majorVersion": 1, -        "minorVersion": 0 -      }, -      "metrics": { -        "emSize": 1024, -        "baseline": 6.25, -        "whitespace": 50 -      }, -      "ie7": true, -      "showSelector": true, -      "selector": "class", -      "classSelector": ".icon", -      "showMetrics": true, -      "showMetadata": true, -      "cssVars": true, -      "embed": false, -      "noie8": false -    }, -    "imagePref": { -      "prefix": "icon-", -      "png": true, -      "useClassSelector": true, -      "color": 4473924, -      "bgColor": 16777215 -    }, -    "historySize": 100, -    "showCodes": true, -    "gridSize": 16 -  } -} \ No newline at end of file diff --git a/src/assets/fonts/icon.svg b/src/assets/fonts/icon.svg deleted file mode 100755 index 86250e7b4..000000000 --- a/src/assets/fonts/icon.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/fonts/icon.ttf b/src/assets/fonts/icon.ttf deleted file mode 100755 index b5ab5601b..000000000 Binary files a/src/assets/fonts/icon.ttf and /dev/null differ diff --git a/src/assets/fonts/icon.woff b/src/assets/fonts/icon.woff deleted file mode 100755 index ed0f20d5b..000000000 Binary files a/src/assets/fonts/icon.woff and /dev/null differ diff --git a/src/assets/javascripts/application.js b/src/assets/javascripts/application.js index ab3260204..c119b0c5d 100644 --- a/src/assets/javascripts/application.js +++ b/src/assets/javascripts/application.js @@ -71,4 +71,54 @@ document.addEventListener('DOMContentLoaded', function() { spy.listen(); window.addEventListener('resize', handler); + + /* Intercept click on search mode toggle */ + var offset = 0; + var toggle = document.getElementById('md-toggle-search'); + toggle.addEventListener('click', function(e) { + var list = document.body.classList; + var lock = !matchMedia('only screen and (min-width: 960px)').matches; + + /* Exiting search mode */ + if (list.contains('md-js__body--locked')) { + list.remove('md-js__body--locked'); + + /* Scroll to former position, but wait for 100ms to prevent flashes + on iOS. A short timeout seems to do the trick */ + if (lock) + setTimeout(function() { + window.scrollTo(0, offset); + }, 100); + + /* Entering search mode */ + } else { + offset = window.scrollY; + + /* First timeout: scroll to top after transition, to omit flickering */ + if (lock) + setTimeout(function() { + window.scrollTo(0, 0); + }, 400); + + /* Second timeout: Lock body after finishing transition and scrolling to + top and focus input field. Sadly, the focus event is not dispatched + on iOS Safari and there's nothing we can do about it. */ + setTimeout(function() { + + /* This additional check is necessary to handle fast subsequent clicks + on the toggle and the timeout to lock the body must be cancelled */ + if (this.checked) { + if (lock) + list.add('md-js__body--locked'); + setTimeout(function() { + document.getElementById('md-search').focus(); + }, 200); + } + }.bind(this), 450); + } + }); + + + + }); \ No newline at end of file diff --git a/src/assets/javascripts/components/scrollspy.js b/src/assets/javascripts/components/scrollspy.js index 1209d7bc9..7013f6970 100644 --- a/src/assets/javascripts/components/scrollspy.js +++ b/src/assets/javascripts/components/scrollspy.js @@ -93,7 +93,7 @@ class ScrollSpy { [].forEach.call(this.el_, (el) => { el.classList.remove('md-nav__link--marked'); }); - }; + } /** * Register listener for all relevant events @@ -105,7 +105,7 @@ class ScrollSpy { /* Initial update */ this.update(); - }; + } /** * Unregister listener for all relevant events @@ -117,7 +117,7 @@ class ScrollSpy { /* Perform reset */ this.reset(); - }; + } } /* ---------------------------------------------------------------------------- diff --git a/src/assets/stylesheets/_config.scss b/src/assets/stylesheets/_config.scss index d972d9235..df2c32e21 100644 --- a/src/assets/stylesheets/_config.scss +++ b/src/assets/stylesheets/_config.scss @@ -60,10 +60,10 @@ $break-devices: ( /* * Primary and accent colors */ -$md-color-primary: $indigo-500; -$md-color-primary--light: $indigo-100; -$md-color-primary--dark: $indigo-700; -$md-color-accent: $indigo-a200; +$md-color-primary: $clr-indigo-500; +$md-color-primary--light: $clr-indigo-100; +$md-color-primary--dark: $clr-indigo-700; +$md-color-accent: $clr-indigo-a200; /* * Shades of black diff --git a/src/assets/stylesheets/_shame.scss b/src/assets/stylesheets/_shame.scss index cd2b15733..80eae38cc 100644 --- a/src/assets/stylesheets/_shame.scss +++ b/src/assets/stylesheets/_shame.scss @@ -22,4 +22,55 @@ /* ---------------------------------------------------------------------------- * Nothing to see here, move along - * ------------------------------------------------------------------------- */ \ No newline at end of file + * ------------------------------------------------------------------------- */ + +// Specificity? +.md-content .admonition-title { + margin: 0; + + * { + margin-top: 0; + margin-bottom: 0; + } +} + +.md-search__suggest { + background: $md-color-white; + border-radius: 0 0 px2rem(3px) px2rem(3px); + color: black; + text-align: left; + border-top: px2rem(1px) solid $md-color-black--lightest; + display: none; + + .md-search__input:focus ~ & { + display: block; + } +} + +.md-search__input:focus { + border-radius: px2rem(3px) px2rem(3px) 0 0; +} + +@include break-to-device(mobile landscape) { + .md-search__inner { + position: fixed; + top: 0; + left: 100%; + width: 100%; + height: 56px; + opacity: 0; + z-index: 2; + transform: translate3d(5%, 0, 0); + transition: transform .3s .15s cubic-bezier(0.1, 0.7, 0.1, 1.0), opacity .15s .15s; + + #md-toggle-search:checked ~ .md-header & { + transform: translate3d(0, 0, 0); + left: 0; + opacity: 1; + } + } + + .md-search__suggest { + position: relative; + z-index: 2; + } +} \ No newline at end of file diff --git a/src/assets/stylesheets/application.scss b/src/assets/stylesheets/application.scss index c5e40f3c5..6142bf43f 100644 --- a/src/assets/stylesheets/application.scss +++ b/src/assets/stylesheets/application.scss @@ -25,8 +25,8 @@ * ------------------------------------------------------------------------- */ @import "modular-scale"; -@import "quantum-colors"; -@import "quantum-shadows"; +@import "material-color"; +@import "material-shadows"; /* ---------------------------------------------------------------------------- * Application @@ -46,6 +46,7 @@ @import "layout/header"; @import "layout/footer"; @import "layout/nav"; +@import "layout/search"; @import "layout/sidebar"; @import "extensions/admonition"; diff --git a/src/assets/stylesheets/base/_icons.scss b/src/assets/stylesheets/base/_icons.scss index 19b3b2301..3f2af15b5 100644 --- a/src/assets/stylesheets/base/_icons.scss +++ b/src/assets/stylesheets/base/_icons.scss @@ -28,13 +28,16 @@ * Base icon class */ .md-icon { - font-family: "Icon"; + font-family: "Material Icons"; speak: none; font-style: normal; font-weight: normal; font-variant: normal; text-transform: none; line-height: 1; + white-space: nowrap; + word-wrap: normal; + direction: ltr; /* Better Font Rendering */ -webkit-font-smoothing: antialiased; @@ -42,23 +45,16 @@ } /* - * Build icon set + * Build representational classes */ -@each $name, $code in ( - "search": "e600", - "back": "e601", - "link": "e602", - "close": "e603", - "menu": "e604", - "forward": "e605", - "twitter": "e606", - "github": "e607", - "download": "e608", - "star": "e609", - "warning": "e610", - "note": "e611" +@each $ligature, $name in ( + "arrow_back": "back", + "arrow_forward": "forward", + "close": "close", + "menu": "menu", + "search": "search" ) { .md-icon--#{$name}:before { - content: unquote("\"\\#{$code}\""); + content: $ligature; } } \ No newline at end of file diff --git a/src/assets/stylesheets/extensions/_admonition.scss b/src/assets/stylesheets/extensions/_admonition.scss index c29d75597..476592f4d 100644 --- a/src/assets/stylesheets/extensions/_admonition.scss +++ b/src/assets/stylesheets/extensions/_admonition.scss @@ -22,4 +22,92 @@ /* ---------------------------------------------------------------------------- * Admonition extension - * ------------------------------------------------------------------------- */ \ No newline at end of file + * ------------------------------------------------------------------------- */ + +/* + * Admonition + */ +.admonition { + position: relative; + padding: 0.8rem 1.6rem; + margin: 2.0rem 0; + background: rgba($clr-blue-a200, 0.05); + border-left: px2rem(32px) solid $clr-blue-a200; + border-radius: px2rem(2px); + + /* + * Icon + */ + &:before { + content: "edit"; + display: block; + position: absolute; + top: 0.2rem; + left: -2.6rem; + float: left; + font-family: "Material Icons"; + font-weight: normal; + font-size: 2.0rem; + vertical-align: -0.1em; + color: $md-color-white; + } + + /* + * Title + */ + &-title { + font-size: ms(-1); + font-weight: 700; + line-height: 2.0rem; + text-transform: uppercase; + color: $clr-blue-a400; + } + + /* + * Build representational classes + */ + @each $names, $appearance in ( + tip idea: $clr-teal-a700 "whatshot", + success check: $clr-green-a400 "done", + warning: $clr-orange-a400 "warning", + failure fail: $clr-red-a200 "clear", + danger fatal: $clr-red-a400 "flash_on", + bug error: $clr-pink-a400 "bug_report" + ) { + $tint: nth($appearance, 1); + $icon: nth($appearance, 2); + + /* + * Define base class + */ + &.#{nth($names, 1)} { + background: rgba($tint, 0.05); + border-color: $tint; + + /* + * Icon + */ + &:before { + content: $icon; + } + + /* + * Set color for title + */ + .admonition-title { + color: $tint; + } + } + + /* + * Define synonyms for base class + */ + @if length($names) > 1 { + @for $n from 2 through length($names) { + &.#{nth($names, $n)} { + @extend .admonition.#{nth($names, 1)}; + } + } + } + } +} \ No newline at end of file diff --git a/src/assets/stylesheets/helpers/_px2em.scss b/src/assets/stylesheets/helpers/_px2em.scss index 91b45d711..215d79c03 100644 --- a/src/assets/stylesheets/helpers/_px2em.scss +++ b/src/assets/stylesheets/helpers/_px2em.scss @@ -33,7 +33,7 @@ */ @function px2em($size, $base: 16px) { @if unit($size) == px { - @return ($size / $base) * 1em; + @return ($size / $base) * 1.0em; } @else { @error "Invalid unit: #{$size} - must be px"; } @@ -47,7 +47,7 @@ */ @function px2rem($size, $base: 10px) { @if unit($size) == px { - @return ($size / $base) * 1rem; + @return ($size / $base) * 1.0rem; } @else { @error "Invalid unit: #{$size} - must be px"; } diff --git a/src/assets/stylesheets/layout/_base.scss b/src/assets/stylesheets/layout/_base.scss index d1af57370..735961524 100644 --- a/src/assets/stylesheets/layout/_base.scss +++ b/src/assets/stylesheets/layout/_base.scss @@ -37,6 +37,14 @@ html { body { position: relative; min-height: 100%; + + /* + * Lock body to viewport height (e.g. in search mode) + */ + &.md-js__body--locked { + height: 100%; + overflow: hidden; + } } /* @@ -53,7 +61,7 @@ hr { * Template-wide grid */ .md-grid { - max-width: 120rem; + max-width: 120.0rem; margin-left: auto; margin-right: auto; } @@ -73,7 +81,7 @@ hr { margin-top: 5.6rem; /* - * bottom spacing to account for footer + * Bottom spacing to account for footer */ &__inner { margin-top: 3.0rem; @@ -87,7 +95,7 @@ hr { * ------------------------------------------------------------------------- */ /* - * Toggle checkbox (should never be visibile) + * Toggle checkbox (should never be visible) */ .md-toggle { display: none !important; diff --git a/src/assets/stylesheets/layout/_header.scss b/src/assets/stylesheets/layout/_header.scss index df6999ab2..931b6596e 100644 --- a/src/assets/stylesheets/layout/_header.scss +++ b/src/assets/stylesheets/layout/_header.scss @@ -28,7 +28,7 @@ * Application header (stays always on top) */ .md-header { - @include drop-shadow(1); + @include z-depth(2); position: fixed; top: 0; @@ -50,6 +50,8 @@ */ &__icon { display: inline-block; + position: relative; + z-index: 1; font-size: 2.4rem; padding: 0.8rem; margin: 0.4rem; @@ -64,8 +66,8 @@ background: $md-color-white--lightest; } - /* [tablet portrait +]: Hide the search icon */ - @include break-from-device(tablet landscape) { + /* [tablet +]: Hide the search icon */ + @include break-from-device(tablet) { /* * Search icon @@ -85,68 +87,4 @@ line-height: 4.8rem; } } - - /* - * Search bar within header - the right aligment removes jitter - */ - &-search { - position: relative; - margin: 0.6rem 0.4rem 0.6rem 0; - text-align: right; - - /* - * Icon - */ - &__icon { - position: absolute; - top: 0.6rem; - left: 1.2rem; - font-size: 2.4rem; - transition: color .25s; - cursor: pointer; - } - - /* - * Search field - */ - &__input { - display: inline-block; - width: 23.0rem; - height: 3.6rem; - padding-left: 4.4rem; - padding-right: 0.8rem; - font-size: ms(0); - background: $md-color-white--lightest; - color: $md-color-white; - border-radius: px2rem(2px); - transition: color .25s, - background-color .25s, - width .25s cubic-bezier(0.1, 0.7, 0.1, 1); - - /* - * Placeholder color - */ - &::placeholder { - color: $md-color-white; - transition: color .25s; - } - - /* - * Active search field - */ - &:focus { - background: $md-color-white; - color: $md-color-black; - width: 40rem; - - /* - * Placeholder and icon color in active state - */ - + .md-header-search__icon, - &::placeholder { - color: $md-color-black--light; - } - } - } - } } \ No newline at end of file diff --git a/src/assets/stylesheets/layout/_search.scss b/src/assets/stylesheets/layout/_search.scss index e69de29bb..08bc0de9b 100644 --- a/src/assets/stylesheets/layout/_search.scss +++ b/src/assets/stylesheets/layout/_search.scss @@ -0,0 +1,179 @@ +/* + * Copyright (c) 2016 Martin Donath + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +/* ---------------------------------------------------------------------------- + * Search + * ------------------------------------------------------------------------- */ + +/* + * Application search + */ +.md-search { + position: relative; + + /* + * Search overlay + */ + &__overlay { + display: none; + + /* [mobile -]: Only show overlay on mobile */ + @include break-to-device(mobile) { + display: block; + position: absolute; + top: 0.4rem; + left: 0.4rem; + width: 4.0rem; + height: 4.0rem; + overflow: hidden; + z-index: 0; + opacity: 0; + background: #EEEEEE; + border-radius: 100%; + transform-orgin: center; + transition: opacity .2s .2s, + transform .3s .1s; + + /* + * Expanded overlay + */ + #md-toggle-search:checked ~ .md-header & { + z-index: 1; + opacity: 1; + transform: scale(40); + transition: opacity .1s, + transform .4s; + } + } + } + + /* + * Inner wrapper + */ + &__inner { + padding: 0.8rem 0.8rem 0; + + /* [tablet +]: Header-embedded search */ + @include break-from-device(tablet) { + padding: 0.4rem; + } + } + + /* + * Search form + */ + &__form { + position: relative; + text-align: right; + border-radius: px2rem(2px); + + /* [mobile -]: Add drop-shadow on mobile */ + @include break-to-device(mobile) { + @include z-depth(2); + } + } + + /* + * Icon + */ + &__icon { + position: absolute; + top: 0.8rem; + left: 1.2rem; + font-size: 2.4rem; + transition: color .25s; + cursor: pointer; + + + /* [mobile -]: Use back arrow as search icon */ + @include break-to-device(mobile) { + top: 1.2rem; + + /* Hack: @extend doesn't work in media queries, so override manually */ + &:before { + content: "arrow_back"; + } + } + } + + /* + * Search field + */ + &__input { + padding: 0 0.8rem 0 6.4rem; + border-radius: px2rem(2px); + + /* + * Placeholder and icon color in active state + */ + + .md-search__icon, + &::placeholder { + color: $md-color-black--light; + } + + /* [mobile -]: Full-screen search bar */ + @include break-to-device(mobile) { + width: 100%; + height: 4.8rem; + font-size: 1.8rem; + } + + /* [tablet +]: Header-embedded search */ + @include break-from-device(tablet) { + width: 23.0rem; + height: 4.0rem; + padding-left: 4.8rem; + font-size: ms(0); + background: $md-color-white--lightest; + color: $md-color-white; + transition: color .25s, + background-color .25s, + width .25s cubic-bezier(0.1, 0.7, 0.1, 1.0); + + /* + * Placeholder color + */ + + .md-search__icon, + &::placeholder { + color: $md-color-white; + transition: color .25s; + } + + /* + * Active search field + */ + &:focus { + background: $md-color-white; + color: $md-color-black; + width: 40.0rem; + + /* + * Placeholder and icon color in active state + */ + + .md-search__icon, + &::placeholder { + color: $md-color-black--light; + } + } + } + } +} \ No newline at end of file diff --git a/src/assets/stylesheets/layout/_sidebar.scss b/src/assets/stylesheets/layout/_sidebar.scss index a142f8a40..4ad4b5a9e 100644 --- a/src/assets/stylesheets/layout/_sidebar.scss +++ b/src/assets/stylesheets/layout/_sidebar.scss @@ -100,7 +100,7 @@ /* [screen small +]: Limit to grid */ @include break-from-device(screen small) { - margin-left: 120rem; + margin-left: 120.0rem; } } } @@ -114,7 +114,7 @@ overflow-y: scroll; -webkit-overflow-scrolling: touch; - /* [tablet landscape +]: Adjust margins */ + /* [tablet landscape -]: Adjust margins */ @include break-to-device(tablet landscape) { /* diff --git a/src/base.html b/src/base.html index 811fe0900..5d0805c51 100644 --- a/src/base.html +++ b/src/base.html @@ -61,31 +61,17 @@ {% endif %} {% endblock %} - - - + href="https://fonts.googleapis.com/css?family=Roboto:300,400,700" /> + + {% for path in extra_css %} diff --git a/src/header.html b/src/header.html index ad9daee50..cba509bb3 100644 --- a/src/header.html +++ b/src/header.html @@ -40,19 +40,33 @@
- -
+ +
-
- -
+
+ + - -
- +
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
+ FOO
@@ -69,4 +83,14 @@
-->
+ + + + + \ No newline at end of file