diff --git a/prosopopee/static/css/fonts.css b/prosopopee/static/css/fonts.css index dc7773c..ea37dfc 100644 --- a/prosopopee/static/css/fonts.css +++ b/prosopopee/static/css/fonts.css @@ -1,17 +1,30 @@ /* Montserrat: sans-serif header font */ @font-face { - font-family: 'montserratsemi_bold'; + font-family: 'montserrat'; src: url('../fonts/montserrat-semibold-webfont.eot'); src: url('../fonts/montserrat-semibold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/montserrat-semibold-webfont.woff2') format('woff2'), url('../fonts/montserrat-semibold-webfont.woff') format('woff'), url('../fonts/montserrat-semibold-webfont.ttf') format('truetype'), url('../fonts/montserrat-semibold-webfont.svg#montserratsemi_bold') format('svg'); - font-weight: normal; + font-weight: bold; font-style: normal; } +@font-face { + font-family: 'montserrat'; + src: url('../fonts/montserrat-regular-webfont.eot'); + src: url('../fonts/montserrat-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/montserrat-regular-webfont.woff2') format('woff2'), + url('../fonts/montserrat-regular-webfont.woff') format('woff'), + url('../fonts/montserrat-regular-webfont.ttf') format('truetype'), + url('../fonts/montserrat-regular-webfont.svg#montserratregular') format('svg'); + font-weight: normal; + font-style: normal; +} + + /* Crimson: serif regular font */ @font-face { font-family: 'crimson'; diff --git a/prosopopee/static/css/style-page.css b/prosopopee/static/css/style-page.css index 1db0c1c..da5c011 100644 --- a/prosopopee/static/css/style-page.css +++ b/prosopopee/static/css/style-page.css @@ -12,7 +12,7 @@ body { } section { - margin-bottom: 64px; + margin-bottom: 80px; } a { @@ -51,7 +51,7 @@ a { text-transform: uppercase; font-size: 5.5vw; letter-spacing: 4px; - font-family: 'montserratsemi_bold', sans-serif; + font-family: 'montserrat', sans-serif; margin-left: 10%; margin-right: 10%; margin-bottom: 1px; @@ -99,14 +99,37 @@ a { .text { text-align: center; font-family: 'crimson', serif; - font-size: 1.5em; + font-size: 1.6em; + margin-left: 21%; + margin-right: 21%; + color: black; +} + +.paragraph { + text-align: left; + font-family: 'crimson', serif; + font-size: 1em; margin-left: 21%; margin-right: 21%; color: #333; } +.paragraph h2 { + font-family: 'montserrat', sans-serif; + font-weight: normal; + font-size: 2.5em; + text-transform: uppercase; + color: black; + line-height: 1.4em; +} + +.paragraph p { + line-height: 2em; + +} + footer { - margin-top: 7em; + margin-top: 6em; text-align: center; position: relative; font-family: 'crimson', serif; @@ -155,7 +178,8 @@ footer { justify-content: center; text-align: center; text-transform: uppercase; - font-family: 'montserratsemi_bold', sans-serif; + font-family: 'montserrat', sans-serif; + font-weight: bold; } footer p { @@ -165,6 +189,6 @@ footer p { footer a { text-decoration: none; font-weight: 600; - font-family: 'montserratsemi_bold', sans-serif; + font-family: 'montserrat', sans-serif; color: #111; } diff --git a/prosopopee/static/css/style.css b/prosopopee/static/css/style.css index e3e1eec..fa3eb40 100644 --- a/prosopopee/static/css/style.css +++ b/prosopopee/static/css/style.css @@ -1,6 +1,6 @@ body { color: #222; - font-family: 'montserratsemi_bold', sans-serif; + font-family: 'montserrat', sans-serif; background-color: #FBFBFB; margin: 0; } @@ -164,6 +164,6 @@ footer p { footer a { text-decoration: none; font-weight: 600; - font-family: 'montserratsemi_bold', sans-serif; + font-family: 'montserrat', sans-serif; color: #111; } diff --git a/prosopopee/static/fonts/montserrat-regular-webfont.eot b/prosopopee/static/fonts/montserrat-regular-webfont.eot new file mode 100644 index 0000000..4ef1515 Binary files /dev/null and b/prosopopee/static/fonts/montserrat-regular-webfont.eot differ diff --git a/prosopopee/static/fonts/montserrat-regular-webfont.svg b/prosopopee/static/fonts/montserrat-regular-webfont.svg new file mode 100644 index 0000000..3991cf4 --- /dev/null +++ b/prosopopee/static/fonts/montserrat-regular-webfont.svg @@ -0,0 +1,501 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/prosopopee/static/fonts/montserrat-regular-webfont.ttf b/prosopopee/static/fonts/montserrat-regular-webfont.ttf new file mode 100644 index 0000000..f810ff3 Binary files /dev/null and b/prosopopee/static/fonts/montserrat-regular-webfont.ttf differ diff --git a/prosopopee/static/fonts/montserrat-regular-webfont.woff b/prosopopee/static/fonts/montserrat-regular-webfont.woff new file mode 100644 index 0000000..0daf530 Binary files /dev/null and b/prosopopee/static/fonts/montserrat-regular-webfont.woff differ diff --git a/prosopopee/static/fonts/montserrat-regular-webfont.woff2 b/prosopopee/static/fonts/montserrat-regular-webfont.woff2 new file mode 100644 index 0000000..c2aaf62 Binary files /dev/null and b/prosopopee/static/fonts/montserrat-regular-webfont.woff2 differ diff --git a/prosopopee/templates/gallery-index.html b/prosopopee/templates/gallery-index.html index 2bdcd41..902ffc9 100644 --- a/prosopopee/templates/gallery-index.html +++ b/prosopopee/templates/gallery-index.html @@ -10,7 +10,7 @@ - {{ gallery.title }} | {{ settings.title }} + {{ gallery.title }} ยท {{ settings.title }} diff --git a/prosopopee/templates/sections/paragraph.html b/prosopopee/templates/sections/paragraph.html new file mode 100644 index 0000000..c6775a1 --- /dev/null +++ b/prosopopee/templates/sections/paragraph.html @@ -0,0 +1,8 @@ +
+ {% if section.title %} +

{{ section.title }}

+ {% else %} +
+ {% endif %} +

{{ section.text }}

+