diff --git a/app/assets/fonts/merriweather-bold-webfont.eot b/app/assets/fonts/merriweather-bold-webfont.eot deleted file mode 100755 index c77b53bdd..000000000 Binary files a/app/assets/fonts/merriweather-bold-webfont.eot and /dev/null differ diff --git a/app/assets/fonts/merriweather-bold-webfont.svg b/app/assets/fonts/merriweather-bold-webfont.svg deleted file mode 100755 index 3227239df..000000000 --- a/app/assets/fonts/merriweather-bold-webfont.svg +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/merriweather-bold-webfont.ttf b/app/assets/fonts/merriweather-bold-webfont.ttf deleted file mode 100755 index 44f33c239..000000000 Binary files a/app/assets/fonts/merriweather-bold-webfont.ttf and /dev/null differ diff --git a/app/assets/fonts/merriweather-bold-webfont.woff b/app/assets/fonts/merriweather-bold-webfont.woff deleted file mode 100755 index a728400d5..000000000 Binary files a/app/assets/fonts/merriweather-bold-webfont.woff and /dev/null differ diff --git a/app/assets/fonts/merriweather-bold-webfont.woff2 b/app/assets/fonts/merriweather-bold-webfont.woff2 deleted file mode 100755 index ff3bddfbd..000000000 Binary files a/app/assets/fonts/merriweather-bold-webfont.woff2 and /dev/null differ diff --git a/app/assets/fonts/merriweather-italic-webfont.eot b/app/assets/fonts/merriweather-italic-webfont.eot deleted file mode 100755 index 884185441..000000000 Binary files a/app/assets/fonts/merriweather-italic-webfont.eot and /dev/null differ diff --git a/app/assets/fonts/merriweather-italic-webfont.svg b/app/assets/fonts/merriweather-italic-webfont.svg deleted file mode 100755 index 46f8fe18e..000000000 --- a/app/assets/fonts/merriweather-italic-webfont.svg +++ /dev/null @@ -1,283 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/merriweather-italic-webfont.ttf b/app/assets/fonts/merriweather-italic-webfont.ttf deleted file mode 100755 index 3180e526d..000000000 Binary files a/app/assets/fonts/merriweather-italic-webfont.ttf and /dev/null differ diff --git a/app/assets/fonts/merriweather-italic-webfont.woff b/app/assets/fonts/merriweather-italic-webfont.woff deleted file mode 100755 index d7071e3c2..000000000 Binary files a/app/assets/fonts/merriweather-italic-webfont.woff and /dev/null differ diff --git a/app/assets/fonts/merriweather-italic-webfont.woff2 b/app/assets/fonts/merriweather-italic-webfont.woff2 deleted file mode 100755 index f8660d06f..000000000 Binary files a/app/assets/fonts/merriweather-italic-webfont.woff2 and /dev/null differ diff --git a/app/assets/fonts/merriweather-light-webfont.eot b/app/assets/fonts/merriweather-light-webfont.eot deleted file mode 100755 index 4115d282b..000000000 Binary files a/app/assets/fonts/merriweather-light-webfont.eot and /dev/null differ diff --git a/app/assets/fonts/merriweather-light-webfont.svg b/app/assets/fonts/merriweather-light-webfont.svg deleted file mode 100755 index 96c41ee1d..000000000 --- a/app/assets/fonts/merriweather-light-webfont.svg +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/merriweather-light-webfont.ttf b/app/assets/fonts/merriweather-light-webfont.ttf deleted file mode 100755 index 03cfa4253..000000000 Binary files a/app/assets/fonts/merriweather-light-webfont.ttf and /dev/null differ diff --git a/app/assets/fonts/merriweather-light-webfont.woff b/app/assets/fonts/merriweather-light-webfont.woff deleted file mode 100755 index 9b3427536..000000000 Binary files a/app/assets/fonts/merriweather-light-webfont.woff and /dev/null differ diff --git a/app/assets/fonts/merriweather-light-webfont.woff2 b/app/assets/fonts/merriweather-light-webfont.woff2 deleted file mode 100755 index e53e4b531..000000000 Binary files a/app/assets/fonts/merriweather-light-webfont.woff2 and /dev/null differ diff --git a/app/assets/fonts/merriweather-regular-webfont.eot b/app/assets/fonts/merriweather-regular-webfont.eot deleted file mode 100755 index c4cde6d01..000000000 Binary files a/app/assets/fonts/merriweather-regular-webfont.eot and /dev/null differ diff --git a/app/assets/fonts/merriweather-regular-webfont.svg b/app/assets/fonts/merriweather-regular-webfont.svg deleted file mode 100755 index 47b2ff823..000000000 --- a/app/assets/fonts/merriweather-regular-webfont.svg +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/merriweather-regular-webfont.ttf b/app/assets/fonts/merriweather-regular-webfont.ttf deleted file mode 100755 index 3889a6065..000000000 Binary files a/app/assets/fonts/merriweather-regular-webfont.ttf and /dev/null differ diff --git a/app/assets/fonts/merriweather-regular-webfont.woff b/app/assets/fonts/merriweather-regular-webfont.woff deleted file mode 100755 index 1969d2ed0..000000000 Binary files a/app/assets/fonts/merriweather-regular-webfont.woff and /dev/null differ diff --git a/app/assets/fonts/merriweather-regular-webfont.woff2 b/app/assets/fonts/merriweather-regular-webfont.woff2 deleted file mode 100755 index 3023ce73c..000000000 Binary files a/app/assets/fonts/merriweather-regular-webfont.woff2 and /dev/null differ diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss index d69496252..e8fe6a4bf 100644 --- a/app/assets/stylesheets/fonts.scss +++ b/app/assets/stylesheets/fonts.scss @@ -1,8 +1,7 @@ // Fonts // // 01. Source Sans Pro (https://www.google.com/fonts/specimen/Source+Sans+Pro) -// 02. Merriweather (https://www.google.com/fonts/specimen/Merriweather) -// 03. Lato (https://www.google.com/fonts/specimen/Lato) +// 02. Lato (https://www.google.com/fonts/specimen/Lato) // // 01. Source Sans Pro @@ -56,58 +55,7 @@ font-url('sourcesanspro-bold-webfont.svg#source_sans_probold') format('svg'); } -// 02. Merriweather -// - - - - - - - - - - - - - - - - - - - - - - - - - - -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 300; - src: font-url('merriweather-light-webfont.eot'); - src: font-url('merriweather-light-webfont.eot?#iefix') format('embedded-opentype'), - font-url('merriweather-light-webfont.woff2') format('woff2'), - font-url('merriweather-light-webfont.woff') format('woff'), - font-url('merriweather-light-webfont.ttf') format('truetype'), - font-url('merriweather-light-webfont.svg#source_sans_proregular') format('svg'); -} - -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 400; - src: font-url('merriweather-regular-webfont.eot'); - src: font-url('merriweather-regular-webfont.eot?#iefix') format('embedded-opentype'), - font-url('merriweather-regular-webfont.woff2') format('woff2'), - font-url('merriweather-regular-webfont.woff') format('woff'), - font-url('merriweather-regular-webfont.ttf') format('truetype'), - font-url('merriweather-regular-webfont.svg#source_sans_proitalic') format('svg'); -} - -@font-face { - font-family: 'Merriweather'; - font-style: italic; - font-weight: 400; - src: font-url('merriweather-italic-webfont.eot'); - src: font-url('merriweather-italic-webfont.eot?#iefix') format('embedded-opentype'), - font-url('merriweather-italic-webfont.woff2') format('woff2'), - font-url('merriweather-italic-webfont.woff') format('woff'), - font-url('merriweather-italic-webfont.ttf') format('truetype'), - font-url('merriweather-italic-webfont.svg#source_sans_proitalic') format('svg'); -} - -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 700; - src: font-url('merriweather-bold-webfont.eot'); - src: font-url('merriweather-bold-webfont.eot?#iefix') format('embedded-opentype'), - font-url('merriweather-bold-webfont.woff2') format('woff2'), - font-url('merriweather-bold-webfont.woff') format('woff'), - font-url('merriweather-bold-webfont.ttf') format('truetype'), - font-url('merriweather-bold-webfont.svg#source_sans_probold') format('svg'); -} - -// 03. Lato +// 02. Lato // - - - - - - - - - - - - - - - - - - - - - - - - - @font-face { diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index e876899e0..88fd8a14a 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -176,24 +176,17 @@ html, body { body { background: white; color: $text; - font-family: $font-serif; - font-size: $base-font-size; - font-weight: normal; + font-family: $font-sans; + font-size: rem-calc(17); + font-weight: 400; + line-height: rem-calc(26); text-rendering: optimizeLegibility; } -p, ul, table { - font-family: $font-serif; -} - p { - color: $text; - line-height: $base-line-height; - margin: rem-calc(6) 0; -} - -ol, ul, li, p { - font-size: $small-font-size; + font-size: rem-calc(17); + font-weight: 400; + line-height: rem-calc(26); } a { @@ -215,9 +208,7 @@ a { .button { background: $brand; - font-size: $small-font-size; font-family: $font-sans !important; - padding: rem-calc(15) rem-calc(32); &:hover { text-decoration: none !important; diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 486d46881..c2d9b5e0f 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -178,7 +178,7 @@ color: $brand; vertical-align: top; position: absolute; - top: 17px; + top: 12px; right: 18px; } diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index b2b79b29d..f859245c2 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -26,7 +26,6 @@ $heading-line-height: 1.3; $lead-line-height: 1.7; $font-sans: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif; -$font-serif: 'Merriweather', 'Georgia', 'Times New Roman', serif; $font-logo: 'Lato' !important; $font-normal: 400; diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index dfcce3982..3236b2f7a 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,6 +1,6 @@ <% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %> - + <%= image_tag("icon_home_debate.png", size: "168x168", alt: t("welcome.debates.alt"), title: t("welcome.debates.title")) %> <%= t("welcome.debates.title") %>