diff --git a/README.md b/README.md index 1136f25..f6fc571 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,4 @@ TODO write instructions known bug (problem on GitHub Pages part) - if you have a project page and want a custom 404 page, you must use a custom domain. See https://help.github.com/articles/custom-404-pages/. This means that if you have a regular User Page you can use the 404 page from this theme, but if it's a website for a specific repository, the 404 page will not be used. -mention that avatar img + css + js have to be served locally, not from a URL - can also give googlefonts diff --git a/_includes/footer-scripts.html b/_includes/footer-scripts.html index 49126dc..86f338e 100644 --- a/_includes/footer-scripts.html +++ b/_includes/footer-scripts.html @@ -1,8 +1,19 @@ - - +{% if page.common-ext-js %} + {% for js in page.common-ext-js %} + + {% endfor %} +{% endif %} -{% if include.full %} - +{% if page.common-js %} + {% for js in page.common-js %} + + {% endfor %} +{% endif %} + +{% if page.ext-js %} + {% for js in page.ext-js %} + + {% endfor %} {% endif %} {% if page.js %} diff --git a/_includes/head.html b/_includes/head.html index 10f625e..8981dd8 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -8,23 +8,41 @@ - - + + + {% if page.common-ext-css %} + {% for css in page.common-ext-css %} + + {% endfor %} + {% endif %} - {% if include.full %} - - - - - - {% else %} - + {% if page.common-css %} + {% for css in page.common-css %} + + {% endfor %} + {% endif %} + + {% if page.common-googlefonts %} + {% for font in page.common-googlefonts %} + + {% endfor %} {% endif %} + {% if page.ext-css %} + {% for css in page.ext-css %} + + {% endfor %} + {% endif %} + {% if page.css %} {% for css in page.css %} {% endfor %} {% endif %} + + {% if page.googlefonts %} + {% for font in page.googlefonts %} + + {% endfor %} + {% endif %} \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index 4fa9b10..3956af3 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,7 +1,22 @@ +--- +common-css: + - "/css/bootstrap.min.css" + - "/css/main.css" +common-ext-css: + - "//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" +common-googlefonts: + - "Lora:400,700,400italic,700italic" + - "Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" +common-js: + - "/js/jquery-1.11.2.min.js" + - "/js/bootstrap.min.js" + - "/js/main.js" +--- + - {% include head.html full = true %} + {% include head.html %} @@ -13,7 +28,7 @@ {% include footer.html %} - {% include footer-scripts.html full = true %} + {% include footer-scripts.html %} diff --git a/_layouts/minimal.html b/_layouts/minimal.html index 48e55b8..40f06e0 100644 --- a/_layouts/minimal.html +++ b/_layouts/minimal.html @@ -1,7 +1,16 @@ +--- +common-css: + - "/css/bootstrap.min.css" + - "/css/main-minimal.css" +common-js: + - "/js/jquery-1.11.2.min.js" + - "/js/bootstrap.min.js" +--- + - {% include head.html full = false %} + {% include head.html %} @@ -11,7 +20,7 @@ {% include footer-minimal.html %} - {% include footer-scripts.html full = false %} + {% include footer-scripts.html %} diff --git a/contact.md b/contact.md index 3ce42ae..0f8c154 100644 --- a/contact.md +++ b/contact.md @@ -2,6 +2,7 @@ layout: minimal js: "/js/contact.js" css: "/css/contact.css" +googlefonts: Lobster --- Just kidding, you can't contact me here. @@ -14,4 +15,6 @@ It's also an example of how you can easily add CSS or JavaScript files to a temp \ No newline at end of file + + +

You can even use any Google fonts you'd like to be extra fancy, like this Lobster font

\ No newline at end of file diff --git a/css/contact.css b/css/contact.css index 007f1bf..aad4fa8 100644 --- a/css/contact.css +++ b/css/contact.css @@ -1,3 +1,11 @@ +body { + padding-top: 30px; +} + #contact-div { color: red; +} + +#googlefont-test { + font-family: Lobster; } \ No newline at end of file