diff --git a/site/css/default.css b/site/css/default.css index 18ea215..5adb9d1 100644 --- a/site/css/default.css +++ b/site/css/default.css @@ -6,8 +6,8 @@ body { background-attachment:fixed; background-repeat:no-repeat; background-position: center; - font-family: 'Xolonium'; - font-size: 16px; + font-family: 'MontserratLight'; + font-size: 20px; font-weight: normal; font-style: normal; margin: 0 50px 0; @@ -20,6 +20,12 @@ header { border-bottom: 2px solid white; margin-bottom: 30px; padding: 12px 0px 12px 0px; + font-family: 'MontserratBlack'; + font-size: 30px; +} + +h1, h2, h3, h4, h5 { + font-family: 'MontserratBlack'; } a { @@ -28,14 +34,12 @@ a { } a:hover { - color: #34c300; + color: #c33500; text-decoration: underline } div#logo a { color: white; - /*float: left;*/ - font-size: 18px; font-weight: bold; text-decoration: none; } diff --git a/site/css/font.css b/site/css/font.css index 8d75282..038e196 100644 --- a/site/css/font.css +++ b/site/css/font.css @@ -1,6 +1,20 @@ @font-face { - font-family: 'Xolonium' + font-family: 'Xolonium'; src: url('/fonts/Xolononiu-Regular.otf') format('opentype'); font-weight: normal; font-style: normal; } + +@font-face { + font-family: 'MontserratBlack'; + src: url('/fonts/Montserrat/Montserrat-Black.otf') format('opentype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'MontserratLight'; + src: url('/fonts/Montserrat/Montserrat-Light.otf') format('opentype'); + font-weight: normal; + font-style: normal; +} diff --git a/site/fonts/Montserrat/Montserrat-Black.otf b/site/fonts/Montserrat/Montserrat-Black.otf new file mode 100644 index 0000000..5e5a916 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-Black.otf differ diff --git a/site/fonts/Montserrat/Montserrat-BlackItalic.otf b/site/fonts/Montserrat/Montserrat-BlackItalic.otf new file mode 100644 index 0000000..f4d5d3b Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-BlackItalic.otf differ diff --git a/site/fonts/Montserrat/Montserrat-Bold.otf b/site/fonts/Montserrat/Montserrat-Bold.otf new file mode 100644 index 0000000..cdfb83d Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-Bold.otf differ diff --git a/site/fonts/Montserrat/Montserrat-BoldItalic.otf b/site/fonts/Montserrat/Montserrat-BoldItalic.otf new file mode 100644 index 0000000..d57ff9a Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-BoldItalic.otf differ diff --git a/site/fonts/Montserrat/Montserrat-ExtraBold.otf b/site/fonts/Montserrat/Montserrat-ExtraBold.otf new file mode 100644 index 0000000..db86f49 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-ExtraBold.otf differ diff --git a/site/fonts/Montserrat/Montserrat-ExtraBoldItalic.otf b/site/fonts/Montserrat/Montserrat-ExtraBoldItalic.otf new file mode 100644 index 0000000..f7a042a Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-ExtraBoldItalic.otf differ diff --git a/site/fonts/Montserrat/Montserrat-ExtraLight.otf b/site/fonts/Montserrat/Montserrat-ExtraLight.otf new file mode 100644 index 0000000..5a66f53 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-ExtraLight.otf differ diff --git a/site/fonts/Montserrat/Montserrat-ExtraLightItalic.otf b/site/fonts/Montserrat/Montserrat-ExtraLightItalic.otf new file mode 100644 index 0000000..31b1351 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-ExtraLightItalic.otf differ diff --git a/site/fonts/Montserrat/Montserrat-Italic.otf b/site/fonts/Montserrat/Montserrat-Italic.otf new file mode 100644 index 0000000..450689e Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-Italic.otf differ diff --git a/site/fonts/Montserrat/Montserrat-Light.otf b/site/fonts/Montserrat/Montserrat-Light.otf new file mode 100644 index 0000000..14e715c Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-Light.otf differ diff --git a/site/fonts/Montserrat/Montserrat-LightItalic.otf b/site/fonts/Montserrat/Montserrat-LightItalic.otf new file mode 100644 index 0000000..b5ec441 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-LightItalic.otf differ diff --git a/site/fonts/Montserrat/Montserrat-Medium.otf b/site/fonts/Montserrat/Montserrat-Medium.otf new file mode 100644 index 0000000..6c323c1 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-Medium.otf differ diff --git a/site/fonts/Montserrat/Montserrat-MediumItalic.otf b/site/fonts/Montserrat/Montserrat-MediumItalic.otf new file mode 100644 index 0000000..51db58d Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-MediumItalic.otf differ diff --git a/site/fonts/Montserrat/Montserrat-Regular.otf b/site/fonts/Montserrat/Montserrat-Regular.otf new file mode 100644 index 0000000..c1d1ee3 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-Regular.otf differ diff --git a/site/fonts/Montserrat/Montserrat-SemiBold.otf b/site/fonts/Montserrat/Montserrat-SemiBold.otf new file mode 100644 index 0000000..4fa8281 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-SemiBold.otf differ diff --git a/site/fonts/Montserrat/Montserrat-SemiBoldItalic.otf b/site/fonts/Montserrat/Montserrat-SemiBoldItalic.otf new file mode 100644 index 0000000..8c3b253 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-SemiBoldItalic.otf differ diff --git a/site/fonts/Montserrat/Montserrat-Thin.otf b/site/fonts/Montserrat/Montserrat-Thin.otf new file mode 100644 index 0000000..1c20b62 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-Thin.otf differ diff --git a/site/fonts/Montserrat/Montserrat-ThinItalic.otf b/site/fonts/Montserrat/Montserrat-ThinItalic.otf new file mode 100644 index 0000000..ed9bb19 Binary files /dev/null and b/site/fonts/Montserrat/Montserrat-ThinItalic.otf differ diff --git a/site/fonts/Montserrat/OFL.txt b/site/fonts/Montserrat/OFL.txt new file mode 100644 index 0000000..f435ed8 --- /dev/null +++ b/site/fonts/Montserrat/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/site/images/Chaoszone_crest.svg b/site/images/Chaoszone_crest.svg new file mode 100644 index 0000000..e042182 --- /dev/null +++ b/site/images/Chaoszone_crest.svg @@ -0,0 +1,73 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/Main.hs b/src/Main.hs index 2983e31..d0a7e6a 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -30,7 +30,7 @@ main = do match ( "site/images/*" - .||. "site/fonts/*" + .||. "site/fonts/**" .||. "site/humans.txt" .||. "site/robots.txt" ) $ do diff --git a/templates/default.html b/templates/default.html index b0efadf..970a66f 100644 --- a/templates/default.html +++ b/templates/default.html @@ -6,7 +6,7 @@ ChaosZone - +