diff options
author | Johannes Löthberg <johannes@kyriasis.com> | 2015-03-24 18:37:07 +0100 |
---|---|---|
committer | Johannes Löthberg <johannes@kyriasis.com> | 2015-03-24 18:37:07 +0100 |
commit | c0ad26410a6c0d17bba14cd2d966c88c8b642408 (patch) | |
tree | b0fbba5a39daefca86436b1ad34ec0ea5488db28 | |
parent | 208fe31209193829f03c3a734f6c679f93e269ff (diff) | |
download | theos-website-c0ad26410a6c0d17bba14cd2d966c88c8b642408.tar.xz |
style: import changes from kyrias
-rw-r--r-- | src/style.css | 93 | ||||
-rw-r--r-- | src/templates/layout.html | 6 |
2 files changed, 53 insertions, 46 deletions
diff --git a/src/style.css b/src/style.css index 9a6d2f7..5192555 100644 --- a/src/style.css +++ b/src/style.css @@ -1,38 +1,14 @@ -@font-face { - font-family: 'PT Sans'; - font-style: normal; - font-weight: 400; - src: local('PT Sans'), local('PTSans-Regular'), url(https://theos.kyriasis.com/fonts/ptsans.ttf) format('truetype'); -} -@font-face { - font-family: 'PT Sans'; - font-style: normal; - font-weight: 700; - src: local('PT Sans Bold'), local('PTSans-Bold'), url(https://theos.kyriasis.com/fonts/ptsans-bold.ttf) format('truetype'); -} -@font-face { - font-family: 'PT Sans'; - font-style: italic; - font-weight: 400; - src: local('PT Sans Italic'), local('PTSans-Italic'), url(https://theos.kyriasis.com/fonts/ptsans-italic.ttf) format('truetype'); -} -@font-face { - font-family: 'DejaVu Sans Mono'; - src: url('https://theos.kyriasis.com/fonts/DejaVuSansMono.woff') format('woff'); - font-weight: normal; - font-style: normal; -} - *, *:before, *:after { box-sizing: border-box; } html { background-color: #eee; } body { - font-size: 16px; - font-family: 'PT Sans'; + font-size: 1em; + font-family: 'Fontin Sans'; font-kerning: normal; font-feature-settings: "kern"; font-variant-ligatures: common-ligatures; + text-align: justify; max-width: 42rem; margin: -1.5rem auto; padding: 0 1rem; @@ -42,6 +18,10 @@ body { -ms-hyphens: auto; hyphens: auto; } +h1, h2, h3 { + color: #111; +} + a, a:visited { text-decoration: none; color: #32609C; @@ -51,12 +31,10 @@ a:hover { } header { - font-size: 0.9rem; padding-top: 1.25rem; } header nav ul { - font-size: 0.9rem; - font-family: 'DejaVu Sans Mono'; + font-size: 0.95em; list-style-type: none; padding: 0; } @@ -71,6 +49,8 @@ header nav a:hover { color: #000; } header h1 { + font-family: 'Fontin'; + font-size: 2.25em; margin: 0; } @@ -86,18 +66,24 @@ header h1 { #welcome-to-theos-kyriasis-com > p:first-of-type:first-letter { float: left; color: #903; - font-size: 3rem; + font-size: 44px; line-height: 2rem; - padding-top: 0.4rem; - padding-right: 0.4rem; - padding-left: 0.1rem; - font-family: 'Georgia'; + padding-top: 0.1em; + padding-right: 0.2rem; + padding-bottom: 0; + font-family: 'Fontin'; } @media (max-width: 767px) { #welcome-to-theos-kyriasis-com > p:first-of-type:first-letter { - padding-top: 0.3rem; + padding-top: 0.2rem; padding-right: 0.2rem; - font-size: 2.7rem; + font-size: 2.5rem; + } +} +@media all and (min--moz-device-pixel-ratio:0) and (min-resolution: 3e1dpcm) { + #welcome-to-theos-kyriasis-com > p:first-of-type:first-letter { + font-size: 44px; + padding-top: 0.3rem; } } @@ -113,15 +99,11 @@ header h1 { } p#last-upd, p#author { - font-size: 14px; + font-size: 0.9em; text-align: right; margin: 0; } -div.section h1 { - font-size: 19px; -} - .botborder { border-bottom: 0.15rem; border-bottom-style: dotted; @@ -131,10 +113,35 @@ div.section h1 { footer p { color: #333; - margin: 1rem 0; + margin-bottom: 1rem 0; } @font-face { + font-family: 'Fontin'; + font-style: normal; + font-weight: 700; + src: local('Fontin'), url('https://theos.kyriasis.com/fonts/Fontin-Bold.ttf') format('truetype'); +} + +@font-face { + font-family: 'Fontin Sans'; + font-style: normal; + font-weight: 400; + src: local('Fontin Sans'), local('FontinSans'), url('https://theos.kyriasis.com/fonts/Fontin_Sans_R_45b.otf') format('opentype'); +} +@font-face { + font-family: 'Fontin Sans'; + font-style: italic; + font-weight: 400; + src: local('Fontin Sans Italic'), local('FontinSans-Italic'), url('https://theos.kyriasis.com/fonts/Fontin_Sans_I_45b.otf') format('opentype'); +} +@font-face { + font-family: 'Fontin Sans'; + font-style: normal; + font-weight: 700; + src: local('Fontin Sans Bold'), local('FontinSans-Bold'), url('https://theos.kyriasis.com/fonts/Fontin_Sans_B_45b.otf') format('opentype'); +} +@font-face { font-family: 'Fontin Sans SC'; font-style: normal; font-weight: 400; diff --git a/src/templates/layout.html b/src/templates/layout.html index e78be4b..492f274 100644 --- a/src/templates/layout.html +++ b/src/templates/layout.html @@ -14,9 +14,9 @@ <header> <nav> <ul> - <li><a href="https://theos.kyriasis.com/">theos/</a></li> - <li><a href="http://git.kyriasis.com/">cgit/</a></li> - <li><a href="https://theos.kyriasis.com/znc/">znc/</a></li> + <li><a href="https://theos.kyriasis.com/">theos</a></li> + <li><a href="http://git.kyriasis.com/">cgit</a></li> + <li><a href="https://theos.kyriasis.com/znc/">znc</a></li> </ul> </nav> <h1>{{ header }}</h1> |