diff --git a/sass/duniter.sass b/sass/_duniter.sass similarity index 97% rename from sass/duniter.sass rename to sass/_duniter.sass index 77b4625c8b63332349dfab3645d9e41ebfa9d531..feda20f28a7bd735aa0eb4f45a46e7bac63a0458 100644 --- a/sass/duniter.sass +++ b/sass/_duniter.sass @@ -18,10 +18,12 @@ footer @font-face font-family: Ubuntu-Regular src: url(/fonts/Ubuntu/Ubuntu-R.ttf) + font-display: fallback @font-face font-family: Ubuntu-Bold src: url(/fonts/Ubuntu/Ubuntu-B.ttf) + font-display: fallback body font-family: Ubuntu-Regular diff --git a/sass/layout.sass b/sass/_layout.sass similarity index 100% rename from sass/layout.sass rename to sass/_layout.sass diff --git a/sass/media.sass b/sass/_media.sass similarity index 100% rename from sass/media.sass rename to sass/_media.sass diff --git a/sass/zolapage.sass b/sass/_zolapage.sass similarity index 100% rename from sass/zolapage.sass rename to sass/_zolapage.sass diff --git a/sass/component.sass b/sass/combine.sass similarity index 72% rename from sass/component.sass rename to sass/combine.sass index ac851f68d7148831835e4a94db34f347c6474603..6415bcbc6f499b66fecd62dfa89c31b0dc8d9995 100644 --- a/sass/component.sass +++ b/sass/combine.sass @@ -4,3 +4,8 @@ @import "components/_numbercard" @import "components/_titlecards" @import "components/_newslink" + +@import "_duniter" +@import "_layout" +@import "_media" +@import "_zolapage" diff --git a/static/PELICAN/images/homepage/theorie-relative-de-la-monnaie-stephane-laborde.jpeg b/static/PELICAN/images/homepage/theorie-relative-de-la-monnaie-stephane-laborde.jpeg index e6a6372183bffdefb0a1961e38624c3101aaa27e..c1d2f4cd5a2801d9739872f2a2cfa22c29b697f6 100644 Binary files a/static/PELICAN/images/homepage/theorie-relative-de-la-monnaie-stephane-laborde.jpeg and b/static/PELICAN/images/homepage/theorie-relative-de-la-monnaie-stephane-laborde.jpeg differ diff --git a/templates/index.html b/templates/index.html index 6464844a0b83d2a6cedd37abf5b402bfe4566018..c3ee2fda8ad98d052a063fcedee72d61482170e1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -11,11 +11,7 @@ <meta name="generator" content="Zola 0.11"> <link rel="stylesheet" type="text/css" href="/w3.css"> <link rel="stylesheet" type="text/css" href="/ForkAwesome/css/fork-awesome.min.css"> - <link rel="stylesheet" type="text/css" href="/layout.css"> - <link rel="stylesheet" type="text/css" href="/component.css"> - <link rel="stylesheet" type="text/css" href="/zolapage.css"> - <link rel="stylesheet" type="text/css" href="/media.css"> - <link rel="stylesheet" type="text/css" href="/duniter.css"> + <link rel="stylesheet" type="text/css" href="/combine.css"> {% block extrahead %}{% endblock extrahead %} </head> <body> diff --git a/templates/nav.html b/templates/nav.html index 915adc0716234baa6d5d33007db7ea4487c5c860..a7ac2238b9c680c1a117401a26c6f2b071fd270b 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -1,5 +1,5 @@ <nav class="w3-bar w3-xlarge"> - <a href="/" class="w3-bar-item w3-button w3-mobile {% if current_path %}{% if current_path == "/" %}active{% endif %}{% endif %}"><img alt="" src="/img/duniter.png" style="width: 32px;"/> Duniter</a> + <a href="/" class="w3-bar-item w3-button w3-mobile {% if current_path %}{% if current_path == "/" %}active{% endif %}{% endif %}"><img alt="" class="icon" src="/img/duniter.png"/> Duniter</a> {% set index = get_section(path="_index.md") %} {% for p in index.pages %}