Commit 6f60a710 authored by okhin's avatar okhin

Merge branch '161-use-something-else-than-propaganda' into 'master'

Resolve "Use something else than Propaganda"

Closes #161

See merge request !164
parents 222dee52 fbe02dfa
Pipeline #147 passed with stages
in 30 seconds
job test:
script:
- exit 0
- tox
stage: test
tags: [memopol]
......
......@@ -59,14 +59,15 @@ a.tag:hover {
}
body, .panel-title {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-family: FiraSansRegulat "Helvetica Neue",Helvetica,Arial,sans-serif;
}
h1, h2, h3, h4, h5, h6 {
font-family: Propaganda, "Helvetica Neue",Helvetica,Arial,sans-serif;
h2, h3, h4, h5, h6 {
font-family: SansusWebissimoRegular "Helvetica Neue" Helvetica Arial sans-serif;
}
h1 {
font-family: Propaganda, "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 2.5em;
}
......@@ -468,7 +469,3 @@ iframe {
.text-danger {
color: #ab181d !important;
}
@font-face {
font-family: 'SansusWebissimoItalic';
src: url('https://fonts.lqdn.fr/collections/Sansus_Webissimo/SansusWebissimo-Italic.ttf') format('truetype');
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: 'SansusWebissimoRegular';
src: url('https://fonts.lqdn.fr/collections/Sansus_Webissimo/SansusWebissimo-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'FiraSansRegular';
src: url('https://fonts.lqdn.fr/collections/Fira_Sans/FiraSans-Regular.woff2') format('woff2');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'FiraSansMedium';
src: url('https://fonts.lqdn.fr/collections/Fira_Sans/FiraSans-Medium.woff2') format('woff2');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'FiraSansSemiBold';
src: url('https://fonts.lqdn.fr/collections/Fira_Sans/FiraSans-SemiBold.woff2') format('woff2');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'FiraSansBook';
src: url('https://fonts.lqdn.fr/collections/Fira_Sans/FiraSans-Book.woff2') format('woff2');
font-weight: lighter;
font-style: normal;
}
......@@ -23,6 +23,7 @@
{% load compress %}
{% compress css %}
<link rel="stylesheet" href="{% static 'css/fonts.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'css/custom.css' %}" type="text/css" />
{% endcompress %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment