diff --git a/app/assets/fonts/merriweather-bold-webfont.eot b/app/assets/fonts/merriweather-bold-webfont.eot new file mode 100755 index 000000000..c77b53bdd Binary files /dev/null and b/app/assets/fonts/merriweather-bold-webfont.eot differ diff --git a/app/assets/fonts/merriweather-bold-webfont.svg b/app/assets/fonts/merriweather-bold-webfont.svg new file mode 100755 index 000000000..3227239df --- /dev/null +++ b/app/assets/fonts/merriweather-bold-webfont.svg @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/merriweather-bold-webfont.ttf b/app/assets/fonts/merriweather-bold-webfont.ttf new file mode 100755 index 000000000..44f33c239 Binary files /dev/null and b/app/assets/fonts/merriweather-bold-webfont.ttf differ diff --git a/app/assets/fonts/merriweather-bold-webfont.woff b/app/assets/fonts/merriweather-bold-webfont.woff new file mode 100755 index 000000000..a728400d5 Binary files /dev/null and b/app/assets/fonts/merriweather-bold-webfont.woff differ diff --git a/app/assets/fonts/merriweather-bold-webfont.woff2 b/app/assets/fonts/merriweather-bold-webfont.woff2 new file mode 100755 index 000000000..ff3bddfbd Binary files /dev/null and b/app/assets/fonts/merriweather-bold-webfont.woff2 differ diff --git a/app/assets/fonts/merriweather-italic-webfont.eot b/app/assets/fonts/merriweather-italic-webfont.eot new file mode 100755 index 000000000..884185441 Binary files /dev/null and b/app/assets/fonts/merriweather-italic-webfont.eot differ diff --git a/app/assets/fonts/merriweather-italic-webfont.svg b/app/assets/fonts/merriweather-italic-webfont.svg new file mode 100755 index 000000000..46f8fe18e --- /dev/null +++ b/app/assets/fonts/merriweather-italic-webfont.svg @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/merriweather-italic-webfont.ttf b/app/assets/fonts/merriweather-italic-webfont.ttf new file mode 100755 index 000000000..3180e526d Binary files /dev/null and b/app/assets/fonts/merriweather-italic-webfont.ttf differ diff --git a/app/assets/fonts/merriweather-italic-webfont.woff b/app/assets/fonts/merriweather-italic-webfont.woff new file mode 100755 index 000000000..d7071e3c2 Binary files /dev/null and b/app/assets/fonts/merriweather-italic-webfont.woff differ diff --git a/app/assets/fonts/merriweather-italic-webfont.woff2 b/app/assets/fonts/merriweather-italic-webfont.woff2 new file mode 100755 index 000000000..f8660d06f Binary files /dev/null and b/app/assets/fonts/merriweather-italic-webfont.woff2 differ diff --git a/app/assets/fonts/merriweather-light-webfont.eot b/app/assets/fonts/merriweather-light-webfont.eot new file mode 100755 index 000000000..4115d282b Binary files /dev/null and b/app/assets/fonts/merriweather-light-webfont.eot differ diff --git a/app/assets/fonts/merriweather-light-webfont.svg b/app/assets/fonts/merriweather-light-webfont.svg new file mode 100755 index 000000000..96c41ee1d --- /dev/null +++ b/app/assets/fonts/merriweather-light-webfont.svg @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/merriweather-light-webfont.ttf b/app/assets/fonts/merriweather-light-webfont.ttf new file mode 100755 index 000000000..03cfa4253 Binary files /dev/null and b/app/assets/fonts/merriweather-light-webfont.ttf differ diff --git a/app/assets/fonts/merriweather-light-webfont.woff b/app/assets/fonts/merriweather-light-webfont.woff new file mode 100755 index 000000000..9b3427536 Binary files /dev/null and b/app/assets/fonts/merriweather-light-webfont.woff differ diff --git a/app/assets/fonts/merriweather-light-webfont.woff2 b/app/assets/fonts/merriweather-light-webfont.woff2 new file mode 100755 index 000000000..e53e4b531 Binary files /dev/null and b/app/assets/fonts/merriweather-light-webfont.woff2 differ diff --git a/app/assets/fonts/merriweather-regular-webfont.eot b/app/assets/fonts/merriweather-regular-webfont.eot new file mode 100755 index 000000000..c4cde6d01 Binary files /dev/null and b/app/assets/fonts/merriweather-regular-webfont.eot differ diff --git a/app/assets/fonts/merriweather-regular-webfont.svg b/app/assets/fonts/merriweather-regular-webfont.svg new file mode 100755 index 000000000..47b2ff823 --- /dev/null +++ b/app/assets/fonts/merriweather-regular-webfont.svg @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/merriweather-regular-webfont.ttf b/app/assets/fonts/merriweather-regular-webfont.ttf new file mode 100755 index 000000000..3889a6065 Binary files /dev/null and b/app/assets/fonts/merriweather-regular-webfont.ttf differ diff --git a/app/assets/fonts/merriweather-regular-webfont.woff b/app/assets/fonts/merriweather-regular-webfont.woff new file mode 100755 index 000000000..1969d2ed0 Binary files /dev/null and b/app/assets/fonts/merriweather-regular-webfont.woff differ diff --git a/app/assets/fonts/merriweather-regular-webfont.woff2 b/app/assets/fonts/merriweather-regular-webfont.woff2 new file mode 100755 index 000000000..3023ce73c Binary files /dev/null and b/app/assets/fonts/merriweather-regular-webfont.woff2 differ diff --git a/app/assets/fonts/opensans-bold.eot b/app/assets/fonts/opensans-bold.eot deleted file mode 100755 index 385d67f8e..000000000 Binary files a/app/assets/fonts/opensans-bold.eot and /dev/null differ diff --git a/app/assets/fonts/opensans-bold.svg b/app/assets/fonts/opensans-bold.svg deleted file mode 100755 index 1b5c1ccb7..000000000 --- a/app/assets/fonts/opensans-bold.svg +++ /dev/null @@ -1,1824 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/opensans-bold.ttf b/app/assets/fonts/opensans-bold.ttf deleted file mode 100755 index 875ce9339..000000000 Binary files a/app/assets/fonts/opensans-bold.ttf and /dev/null differ diff --git a/app/assets/fonts/opensans-bold.woff b/app/assets/fonts/opensans-bold.woff deleted file mode 100755 index d7eb013bc..000000000 Binary files a/app/assets/fonts/opensans-bold.woff and /dev/null differ diff --git a/app/assets/fonts/opensans-bold.woff2 b/app/assets/fonts/opensans-bold.woff2 deleted file mode 100755 index 3ff34eb9b..000000000 Binary files a/app/assets/fonts/opensans-bold.woff2 and /dev/null differ diff --git a/app/assets/fonts/opensans-bolditalic.eot b/app/assets/fonts/opensans-bolditalic.eot deleted file mode 100755 index e9da57fb0..000000000 Binary files a/app/assets/fonts/opensans-bolditalic.eot and /dev/null differ diff --git a/app/assets/fonts/opensans-bolditalic.svg b/app/assets/fonts/opensans-bolditalic.svg deleted file mode 100755 index 7d483577f..000000000 --- a/app/assets/fonts/opensans-bolditalic.svg +++ /dev/null @@ -1,1824 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/opensans-bolditalic.ttf b/app/assets/fonts/opensans-bolditalic.ttf deleted file mode 100755 index 66f65d8a5..000000000 Binary files a/app/assets/fonts/opensans-bolditalic.ttf and /dev/null differ diff --git a/app/assets/fonts/opensans-bolditalic.woff b/app/assets/fonts/opensans-bolditalic.woff deleted file mode 100755 index d5a238eb8..000000000 Binary files a/app/assets/fonts/opensans-bolditalic.woff and /dev/null differ diff --git a/app/assets/fonts/opensans-bolditalic.woff2 b/app/assets/fonts/opensans-bolditalic.woff2 deleted file mode 100755 index 0373e9ca5..000000000 Binary files a/app/assets/fonts/opensans-bolditalic.woff2 and /dev/null differ diff --git a/app/assets/fonts/opensans-italic.eot b/app/assets/fonts/opensans-italic.eot deleted file mode 100755 index 1a515d895..000000000 Binary files a/app/assets/fonts/opensans-italic.eot and /dev/null differ diff --git a/app/assets/fonts/opensans-italic.svg b/app/assets/fonts/opensans-italic.svg deleted file mode 100755 index 930528f49..000000000 --- a/app/assets/fonts/opensans-italic.svg +++ /dev/null @@ -1,1824 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/opensans-italic.ttf b/app/assets/fonts/opensans-italic.ttf deleted file mode 100755 index 2d2d2c004..000000000 Binary files a/app/assets/fonts/opensans-italic.ttf and /dev/null differ diff --git a/app/assets/fonts/opensans-italic.woff b/app/assets/fonts/opensans-italic.woff deleted file mode 100755 index 3e6c20b19..000000000 Binary files a/app/assets/fonts/opensans-italic.woff and /dev/null differ diff --git a/app/assets/fonts/opensans-italic.woff2 b/app/assets/fonts/opensans-italic.woff2 deleted file mode 100755 index 7a2be4074..000000000 Binary files a/app/assets/fonts/opensans-italic.woff2 and /dev/null differ diff --git a/app/assets/fonts/opensans-light.eot b/app/assets/fonts/opensans-light.eot deleted file mode 100755 index e451e38ef..000000000 Binary files a/app/assets/fonts/opensans-light.eot and /dev/null differ diff --git a/app/assets/fonts/opensans-light.svg b/app/assets/fonts/opensans-light.svg deleted file mode 100755 index b3e3faabc..000000000 --- a/app/assets/fonts/opensans-light.svg +++ /dev/null @@ -1,1824 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/opensans-light.ttf b/app/assets/fonts/opensans-light.ttf deleted file mode 100755 index e5a8089f1..000000000 Binary files a/app/assets/fonts/opensans-light.ttf and /dev/null differ diff --git a/app/assets/fonts/opensans-light.woff b/app/assets/fonts/opensans-light.woff deleted file mode 100755 index b348ed271..000000000 Binary files a/app/assets/fonts/opensans-light.woff and /dev/null differ diff --git a/app/assets/fonts/opensans-light.woff2 b/app/assets/fonts/opensans-light.woff2 deleted file mode 100755 index d81c25250..000000000 Binary files a/app/assets/fonts/opensans-light.woff2 and /dev/null differ diff --git a/app/assets/fonts/opensans-lightitalic.eot b/app/assets/fonts/opensans-lightitalic.eot deleted file mode 100755 index cc8ab68e6..000000000 Binary files a/app/assets/fonts/opensans-lightitalic.eot and /dev/null differ diff --git a/app/assets/fonts/opensans-lightitalic.svg b/app/assets/fonts/opensans-lightitalic.svg deleted file mode 100755 index 8cf6f5213..000000000 --- a/app/assets/fonts/opensans-lightitalic.svg +++ /dev/null @@ -1,1824 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/opensans-lightitalic.ttf b/app/assets/fonts/opensans-lightitalic.ttf deleted file mode 100755 index 8c75ec79b..000000000 Binary files a/app/assets/fonts/opensans-lightitalic.ttf and /dev/null differ diff --git a/app/assets/fonts/opensans-lightitalic.woff b/app/assets/fonts/opensans-lightitalic.woff deleted file mode 100755 index 3dc4e7307..000000000 Binary files a/app/assets/fonts/opensans-lightitalic.woff and /dev/null differ diff --git a/app/assets/fonts/opensans-lightitalic.woff2 b/app/assets/fonts/opensans-lightitalic.woff2 deleted file mode 100755 index b91b6f807..000000000 Binary files a/app/assets/fonts/opensans-lightitalic.woff2 and /dev/null differ diff --git a/app/assets/fonts/opensans-regular.eot b/app/assets/fonts/opensans-regular.eot deleted file mode 100755 index 18331ec52..000000000 Binary files a/app/assets/fonts/opensans-regular.eot and /dev/null differ diff --git a/app/assets/fonts/opensans-regular.svg b/app/assets/fonts/opensans-regular.svg deleted file mode 100755 index 3e5d0ac37..000000000 --- a/app/assets/fonts/opensans-regular.svg +++ /dev/null @@ -1,1824 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/opensans-regular.ttf b/app/assets/fonts/opensans-regular.ttf deleted file mode 100755 index 12c9ba009..000000000 Binary files a/app/assets/fonts/opensans-regular.ttf and /dev/null differ diff --git a/app/assets/fonts/opensans-regular.woff b/app/assets/fonts/opensans-regular.woff deleted file mode 100755 index ce026ebbb..000000000 Binary files a/app/assets/fonts/opensans-regular.woff and /dev/null differ diff --git a/app/assets/fonts/opensans-regular.woff2 b/app/assets/fonts/opensans-regular.woff2 deleted file mode 100755 index 90d4d672d..000000000 Binary files a/app/assets/fonts/opensans-regular.woff2 and /dev/null differ diff --git a/app/assets/fonts/sourcesanspro-bold-webfont.eot b/app/assets/fonts/sourcesanspro-bold-webfont.eot new file mode 100755 index 000000000..d77927cf1 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-bold-webfont.eot differ diff --git a/app/assets/fonts/sourcesanspro-bold-webfont.svg b/app/assets/fonts/sourcesanspro-bold-webfont.svg new file mode 100755 index 000000000..e1a5e150b --- /dev/null +++ b/app/assets/fonts/sourcesanspro-bold-webfont.svg @@ -0,0 +1,965 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/sourcesanspro-bold-webfont.ttf b/app/assets/fonts/sourcesanspro-bold-webfont.ttf new file mode 100755 index 000000000..1cc153719 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-bold-webfont.ttf differ diff --git a/app/assets/fonts/sourcesanspro-bold-webfont.woff b/app/assets/fonts/sourcesanspro-bold-webfont.woff new file mode 100755 index 000000000..fc0efcf63 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-bold-webfont.woff differ diff --git a/app/assets/fonts/sourcesanspro-bold-webfont.woff2 b/app/assets/fonts/sourcesanspro-bold-webfont.woff2 new file mode 100755 index 000000000..ec8006413 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-bold-webfont.woff2 differ diff --git a/app/assets/fonts/sourcesanspro-italic-webfont.eot b/app/assets/fonts/sourcesanspro-italic-webfont.eot new file mode 100755 index 000000000..341102370 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-italic-webfont.eot differ diff --git a/app/assets/fonts/sourcesanspro-italic-webfont.svg b/app/assets/fonts/sourcesanspro-italic-webfont.svg new file mode 100755 index 000000000..17cb29bd4 --- /dev/null +++ b/app/assets/fonts/sourcesanspro-italic-webfont.svg @@ -0,0 +1,853 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/sourcesanspro-italic-webfont.ttf b/app/assets/fonts/sourcesanspro-italic-webfont.ttf new file mode 100755 index 000000000..5bc1ff429 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-italic-webfont.ttf differ diff --git a/app/assets/fonts/sourcesanspro-italic-webfont.woff b/app/assets/fonts/sourcesanspro-italic-webfont.woff new file mode 100755 index 000000000..56f57cdef Binary files /dev/null and b/app/assets/fonts/sourcesanspro-italic-webfont.woff differ diff --git a/app/assets/fonts/sourcesanspro-italic-webfont.woff2 b/app/assets/fonts/sourcesanspro-italic-webfont.woff2 new file mode 100755 index 000000000..fe7a80982 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-italic-webfont.woff2 differ diff --git a/app/assets/fonts/sourcesanspro-light-webfont.eot b/app/assets/fonts/sourcesanspro-light-webfont.eot new file mode 100755 index 000000000..8c8335443 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-light-webfont.eot differ diff --git a/app/assets/fonts/sourcesanspro-light-webfont.svg b/app/assets/fonts/sourcesanspro-light-webfont.svg new file mode 100755 index 000000000..0ced8aa04 --- /dev/null +++ b/app/assets/fonts/sourcesanspro-light-webfont.svg @@ -0,0 +1,915 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/sourcesanspro-light-webfont.ttf b/app/assets/fonts/sourcesanspro-light-webfont.ttf new file mode 100755 index 000000000..551c0b7b2 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-light-webfont.ttf differ diff --git a/app/assets/fonts/sourcesanspro-light-webfont.woff b/app/assets/fonts/sourcesanspro-light-webfont.woff new file mode 100755 index 000000000..f08c0391f Binary files /dev/null and b/app/assets/fonts/sourcesanspro-light-webfont.woff differ diff --git a/app/assets/fonts/sourcesanspro-light-webfont.woff2 b/app/assets/fonts/sourcesanspro-light-webfont.woff2 new file mode 100755 index 000000000..767effe84 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-light-webfont.woff2 differ diff --git a/app/assets/fonts/sourcesanspro-regular-webfont.eot b/app/assets/fonts/sourcesanspro-regular-webfont.eot new file mode 100755 index 000000000..1a73c5e60 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-regular-webfont.eot differ diff --git a/app/assets/fonts/sourcesanspro-regular-webfont.svg b/app/assets/fonts/sourcesanspro-regular-webfont.svg new file mode 100755 index 000000000..de5d8bab3 --- /dev/null +++ b/app/assets/fonts/sourcesanspro-regular-webfont.svg @@ -0,0 +1,989 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/sourcesanspro-regular-webfont.ttf b/app/assets/fonts/sourcesanspro-regular-webfont.ttf new file mode 100755 index 000000000..b4f6886d7 Binary files /dev/null and b/app/assets/fonts/sourcesanspro-regular-webfont.ttf differ diff --git a/app/assets/fonts/sourcesanspro-regular-webfont.woff b/app/assets/fonts/sourcesanspro-regular-webfont.woff new file mode 100755 index 000000000..1e8b24f6a Binary files /dev/null and b/app/assets/fonts/sourcesanspro-regular-webfont.woff differ diff --git a/app/assets/fonts/sourcesanspro-regular-webfont.woff2 b/app/assets/fonts/sourcesanspro-regular-webfont.woff2 new file mode 100755 index 000000000..9f24cb5dd Binary files /dev/null and b/app/assets/fonts/sourcesanspro-regular-webfont.woff2 differ diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss index cd745545d..d69496252 100644 --- a/app/assets/stylesheets/fonts.scss +++ b/app/assets/stylesheets/fonts.scss @@ -1,85 +1,113 @@ -// List of fonts +// Fonts // -// 01. Open Sans (http://www.fontsquirrel.com/fonts/open-sans) -// 02. Lato (http://www.fontsquirrel.com/fonts/lato) +// 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) // -// 01. Open Sans +// 01. Source Sans Pro // - - - - - - - - - - - - - - - - - - - - - - - - - @font-face { - font-family: 'Open Sans'; - src: font-url('opensans-light.eot'); - src: font-url('opensans-light.eot?#iefix') format('embedded-opentype'), - font-url('opensans-light.woff2') format('woff2'), - font-url('opensans-light.woff') format('woff'), - font-url('opensans-light.ttf') format('truetype'), - font-url('opensans-light.svg#open_sanslight') format('svg'); - font-weight: lighter; + font-family: 'Source Sans Pro'; font-style: normal; + font-weight: 300; + src: font-url('sourcesanspro-light-webfont.eot'); + src: font-url('sourcesanspro-light-webfont.eot?#iefix') format('embedded-opentype'), + font-url('sourcesanspro-light-webfont.woff2') format('woff2'), + font-url('sourcesanspro-light-webfont.woff') format('woff'), + font-url('sourcesanspro-light-webfont.ttf') format('truetype'), + font-url('sourcesanspro-light-webfont.svg#source_sans_prolight') format('svg') } @font-face { - font-family: 'Open Sans'; - src: font-url('opensans-lightitalic.eot'); - src: font-url('opensans-lightitalic.eot?#iefix') format('embedded-opentype'), - font-url('opensans-lightitalic.woff2') format('woff2'), - font-url('opensans-lightitalic.woff') format('woff'), - font-url('opensans-lightitalic.ttf') format('truetype'), - font-url('opensans-lightitalic.svg#open_sanslight_italic') format('svg'); - font-weight: lighter; - font-style: italic; -} - -@font-face { - font-family: 'Open Sans'; - src: font-url('opensans-regular.eot'); - src: font-url('opensans-regular.eot?#iefix') format('embedded-opentype'), - font-url('opensans-regular.woff2') format('woff2'), - font-url('opensans-regular.woff') format('woff'), - font-url('opensans-regular.ttf') format('truetype'), - font-url('opensans-regular.svg#open_sansregular') format('svg'); - font-weight: normal; + font-family: 'Source Sans Pro'; font-style: normal; + font-weight: 400; + src: font-url('sourcesanspro-regular-webfont.eot'); + src: font-url('sourcesanspro-regular-webfont.eot?#iefix') format('embedded-opentype'), + font-url('sourcesanspro-regular-webfont.woff2') format('woff2'), + font-url('sourcesanspro-regular-webfont.woff') format('woff'), + font-url('sourcesanspro-regular-webfont.ttf') format('truetype'), + font-url('sourcesanspro-regular-webfont.svg#source_sans_proregular') format('svg'); } @font-face { - font-family: 'Open Sans'; - src: font-url('opensans-italic.eot'); - src: font-url('opensans-italic.eot?#iefix') format('embedded-opentype'), - font-url('opensans-italic.woff2') format('woff2'), - font-url('opensans-italic.woff') format('woff'), - font-url('opensans-italic.ttf') format('truetype'), - font-url('opensans-italic.svg#open_sansitalic') format('svg'); - font-weight: normal; + font-family: 'Source Sans Pro'; font-style: italic; + font-weight: 400; + src: font-url('sourcesanspro-italic-webfont.eot'); + src: font-url('sourcesanspro-italic-webfont.eot?#iefix') format('embedded-opentype'), + font-url('sourcesanspro-italic-webfont.woff2') format('woff2'), + font-url('sourcesanspro-italic-webfont.woff') format('woff'), + font-url('sourcesanspro-italic-webfont.ttf') format('truetype'), + font-url('sourcesanspro-italic-webfont.svg#source_sans_proitalic') format('svg'); } @font-face { - font-family: 'Open Sans'; - src: font-url('opensans-bold.eot'); - src: font-url('opensans-bold.eot?#iefix') format('embedded-opentype'), - font-url('opensans-bold.woff2') format('woff2'), - font-url('opensans-bold.woff') format('woff'), - font-url('opensans-bold.ttf') format('truetype'), - font-url('opensans-bold.svg#open_sansbold') format('svg'); - font-weight: bold; + font-family: 'Source Sans Pro'; font-style: normal; + font-weight: 700; + src: font-url('sourcesanspro-bold-webfont.eot'); + src: font-url('sourcesanspro-bold-webfont.eot?#iefix') format('embedded-opentype'), + font-url('sourcesanspro-bold-webfont.woff2') format('woff2'), + font-url('sourcesanspro-bold-webfont.woff') format('woff'), + font-url('sourcesanspro-bold-webfont.ttf') format('truetype'), + 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: 'Open Sans'; - src: font-url('opensans-bolditalic.eot'); - src: font-url('opensans-bolditalic.eot?#iefix') format('embedded-opentype'), - font-url('opensans-bolditalic.woff2') format('woff2'), - font-url('opensans-bolditalic.woff') format('woff'), - font-url('opensans-bolditalic.ttf') format('truetype'), - font-url('opensans-bolditalic.svg#open_sansbold_italic') format('svg'); - font-weight: bold; - font-style: italic; + 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'); } -// 02. Lato +@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 // - - - - - - - - - - - - - - - - - - - - - - - - - @font-face { @@ -91,7 +119,7 @@ font-url('lato-light.ttf') format('truetype'), font-url('lato-light.svg#latolight') format('svg'); font-weight: lighter; - font-style: normal; + font-style: normal } @font-face { @@ -103,7 +131,7 @@ font-url('lato-regular.ttf') format('truetype'), font-url('lato-regular.svg#latoregular') format('svg'); font-weight: normal; - font-style: normal; + font-style: normal } @font-face { @@ -115,5 +143,5 @@ font-url('lato-bold.ttf') format('truetype'), font-url('lato-bold.svg#latobold') format('svg'); font-weight: bold; - font-style: normal; -} + font-style: normal +} \ No newline at end of file diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index ceab7e12f..02c2c5d20 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -32,14 +32,14 @@ // - - - - - - - - - - - - - - - - - - - - - - - - - @mixin back { - color: $text-light; - font-size: rem-calc(13); - line-height: $line-height; + color: $text-medium; + font-family: $font-sans; + font-size: $small-font-size; } @mixin logo { color: white; - font-family: 'Lato' !important; + font-family: $font-logo; font-weight: lighter; @media (min-width: $small-breakpoint) { @@ -60,6 +60,103 @@ } } +@mixin title { + font-size: $title-font-size; + font-weight: $font-bold; +} + +@mixin h1 { + font-family: $font-sans; + font-size: $h2-font-size; + font-weight: $font-bold; + + @media (min-width: $small-breakpoint) { + font-size: $h1-font-size; + } +} + +@mixin h2 { + font-family: $font-sans; + font-size: $h3-font-size; + font-weight: $font-bold; + + @media (min-width: $small-breakpoint) { + font-size: $h2-font-size; + } +} + +@mixin h3 { + font-family: $font-sans; + font-size: $h4-font-size; + font-weight: $font-bold; + + @media (min-width: $small-breakpoint) { + font-size: $h3-font-size; + } +} + +@mixin h4 { + font-family: $font-sans; + font-size: $h5-font-size; + font-weight: $font-bold; + + @media (min-width: $small-breakpoint) { + font-size: $h4-font-size; + } +} + +@mixin h5 { + font-family: $font-sans; + font-size: $h6-font-size; + font-weight: $font-bold; + + @media (min-width: $small-breakpoint) { + font-size: $h5-font-size; + } +} + +@mixin h6 { + font-family: $font-sans; + font-size: $h6-font-size; + font-weight: $font-normal; + text-transform: uppercase; +} + +h1 { + @include h1(); +} + +h2 { + @include h2(); +} + +h3 { + @include h3(); +} + +h4 { + @include h4(); +} + +h5 { + @include h5(); +} + +h6 { + @include h6(); +} + +h1, h2, h3, h4, h5, h6 { + + &.lead { + border-bottom: rem-calc(6) solid $brand; + } + + &.secondary { + color: $text-medium; + } +} + // 03. Global styles // - - - - - - - - - - - - - - - - - - - - - - - - - @@ -74,8 +171,9 @@ html, body { body { background: white; - font-family: $font-family-sans-serif; - font-size: rem-calc(13); + color: $text; + font-family: $font-serif; + font-size: $base-font-size; font-weight: normal; text-rendering: optimizeLegibility; @@ -85,54 +183,53 @@ body { } } +p, ul, table { + font-family: $font-serif; +} + p { - font-size: rem-calc(15); - line-height: $line-height*1.25; - margin-bottom: rem-calc(12); + color: $text; + line-height: $base-line-height; + margin: rem-calc(6) 0; +} + +ol, ul, li, p { + font-size: $small-font-size; +} + +h1, h2, h3, h4, h5, h6 { + clear: both; + font-family: $font-sans; + line-height: $heading-line-height; + margin: rem-calc(12) 0 rem-calc(6); } a { color: $link; - &:hover { + &:hover, &:active { color: $link-hover; + text-decoration: underline; + + h1, h2, h3, h4, h5, h6 { + color: $link-hover; + } } -} -h1, h2, h3, h4, h5, h6 { - font-family: $font-family-sans-serif; - font-weight: bold; -} - -h1 { - font-size: rem-calc(30); -} - -h2 { - font-size: rem-calc(24); -} - -h3 { - font-size: rem-calc(20); -} - -h4 { - font-size: rem-calc(18); -} - -h5 { - font-size: rem-calc(16); -} - -h6 { - font-size: rem-calc(14); + &:focus { + outline: 0; + } } .button { background: $brand; - font-size: rem-calc(14); - font-family: $font-family-sans-serif !important; + font-size: $small-font-size; + font-family: $font-sans !important; padding: rem-calc(15) rem-calc(32); + + &:hover { + text-decoration: none !important; + } } .postfix.button { @@ -253,11 +350,6 @@ h6 { min-height: rem-calc(288); } -.footer { - background: #DEE0E2; - border-top: rem-calc(6) solid $brand; -} - .ie-alert-box { position: absolute; top: 0; @@ -281,31 +373,18 @@ h6 { // - - - - - - - - - - - - - - - - - - - - - - - - - header { - background: image-url('header_bg.jpg'); - background-position: bottom; - background-repeat: no-repeat; - background-size: cover; - color: $text; - min-height: rem-calc(552); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/header_bg.jpg', sizingMethod='scale'); - -ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/header_bg.jpg',sizingMethod='scale')"; + background: #E7F2FC; + border-bottom: rem-calc(1) solid $border; - &.results { - border-bottom: rem-calc(1) solid $border; - min-height: rem-calc(48); + a { + font-family: $font-sans; } h1 { - color: white; - font-size: rem-calc(36); - font-weight: bolder; - line-height: $line-height*2; margin: rem-calc(24) 0; - padding: 0; } h2 { - color: white; font-size: rem-calc(16); font-weight: normal; line-height: rem-calc(30); @@ -336,9 +415,7 @@ header { } .more-info { - color: white; display: block; - font-size: rem-calc(14); margin-bottom: rem-calc(24); text-decoration: underline; @@ -347,21 +424,17 @@ header { margin-bottom: 0; margin-left: rem-calc(12); } - - &:hover { - opacity: .75; - } } .icon-home-big { - color: white; + color: $brand; font-size: rem-calc(300); line-height: rem-calc(300); opacity: .75; } .icon-home-small { - color: white; + color: $brand; font-size: rem-calc(100); opacity: .75; position: absolute; @@ -391,15 +464,15 @@ header { .locale { float: none; + font-family: $font-sans; @media (min-width: $small-breakpoint) { float: left; + margin-left: rem-calc(12); } .icon-language { - font-size: rem-calc(16); - line-height: rem-calc(24); - vertical-align: middle; + vertical-align: text-top; } } @@ -414,12 +487,14 @@ header { } .search-form { - padding-top: rem-calc(14); + padding-top: rem-calc(6); + margin-bottom: 0 !important; .postfix { background: $brand; border: 0; color: white; + margin-bottom: 0; } } } @@ -508,14 +583,13 @@ header { } ul li > a { - font-size: rem-calc(14); + font-size: $small-font-size; &.button { border-radius: 0; line-height: $line-height*1.5; text-align: left; background: none; - padding-left: rem-calc(6); } @media (min-width: $small-breakpoint) { @@ -532,7 +606,7 @@ header { } ul li > a { - font-size: rem-calc(14); + font-size: $small-font-size; } ul li > a.button:hover, .top-bar-section ul li > a.button:focus { @@ -558,7 +632,6 @@ header { li:not(.has-form) a:not(.button) { background: none; color: white; - padding: rem-calc(12) 0; @media (min-width: $small-breakpoint) { line-height: rem-calc(80); @@ -584,7 +657,7 @@ header { .top-links { background: $dark; color: white; - font-size: rem-calc(14); + font-size: $small-font-size; padding-right: rem-calc(12); a { @@ -595,9 +668,6 @@ header { text-decoration: underline; } } - .social { - padding-top: rem-calc(6); - } } .subnavigation-container { @@ -607,9 +677,11 @@ header { .subnavigation { background: white; clear: both; - min-height: rem-calc(72); + padding-left: rem-calc(12); @media (min-width: $small-breakpoint) { + padding-left: 0; + & > .column { padding-left: 0; } @@ -618,14 +690,12 @@ header { a { color: $text; display: inline-block; - font-size: rem-calc(14); font-weight: bold; line-height: $line-height*2; position: relative; text-align: left; @media (min-width: $small-breakpoint) { - line-height: $line-height*3; margin-left: rem-calc(12); margin-right: rem-calc(36); margin-right: 12px\9; @@ -655,7 +725,6 @@ header { @media (min-width: $small-breakpoint) { border-bottom: 2px solid $brand; - line-height: rem-calc(24); } } } @@ -666,7 +735,6 @@ header { footer { color: #171819; - padding: rem-calc(48) 0; .logo { @include logo; @@ -680,7 +748,7 @@ footer { } p { - font-size: rem-calc(14); + font-size: $small-font-size; } a, a:active, a:focus { @@ -701,13 +769,18 @@ footer { a { border-bottom: 1px solid #BFC1C3; display: block; - margin-bottom: rem-calc(6); padding-bottom: rem-calc(6); text-decoration: none; } } } +.footer { + background: #DEE0E2; + border-top: rem-calc(6) solid $brand; + padding-top: $line-height; +} + .subfooter { border-top: 1px solid #BFC1C3; opacity: .75; @@ -719,14 +792,14 @@ footer { // - - - - - - - - - - - - - - - - - - - - - - - - - .tags, .tag-cloud { + font-family: $font-sans; a { background: $border; border-radius: rem-calc(6); color: #4d4d4d; display: inline-block; - font-size: rem-calc(13); - line-height: rem-calc(22); + font-size: $small-font-size; margin-bottom: rem-calc(8); padding: 0 rem-calc(8); @@ -776,7 +849,7 @@ footer { // - - - - - - - - - - - - - - - - - - - - - - - - - .auth-page { - background: #065687 image-url("auth_bg.jpg"); + background: $brand image-url("auth_bg.jpg"); background-repeat: no-repeat; background-size: cover; @@ -784,34 +857,35 @@ footer { padding-top: rem-calc(48); } - p { - font-size: rem-calc(14); - } - h1 { @include logo; + + a { + color: white; + display: block; + line-height: rem-calc(80); + text-align: center; + + @media (min-width: $small-breakpoint) { + display: inline-block; + text-align: left; + } + } } } .auth { min-height: rem-calc(480); - h2 { - clear: both; - font-size: rem-calc(18); - font-weight: bold; - line-height: $line-height; - - @media (min-width: $small-breakpoint) { - font-size: rem-calc(30); - line-height: $line-height*2; - } - } - .back, .icon-angle-left { @include back; } + p, a { + font-family: $font-sans; + font-size: $small-font-size; + } + .panel { background: white; border: 0; @@ -853,8 +927,10 @@ form.locale-form { } form { + font-family: $font-sans; label { + font-size: $base-font-size; font-weight: bold; line-height: $line-height; } @@ -918,7 +994,6 @@ form { .checkbox { display: inline-block; - font-size: rem-calc(14); font-weight: normal; line-height: $line-height; vertical-align: middle; @@ -949,6 +1024,8 @@ form { // - - - - - - - - - - - - - - - - - - - - - - - - - .alert-box { + font-family: $font-sans; + font-size: $small-font-size; &.success { background-color: $success-bg; @@ -1013,6 +1090,10 @@ label.error, label.error a { background: white; padding-top: rem-calc(24); + a { + font-family: $font-sans; + } + .icon-debates { color: $debates; font-size: rem-calc(60); @@ -1120,7 +1201,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar { margin-left: 0; li { - font-size: rem-calc(14); + font-size: $small-font-size; margin-bottom: rem-calc(12); span { @@ -1168,7 +1249,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar { } optgroup { - font-size: rem-calc(14); + font-size: $small-font-size; } option { @@ -1406,7 +1487,9 @@ table { .social { margin-top: rem-calc(24); + padding-top: rem-calc(6); text-align: center; + vertical-align: middle; @media (min-width: $small-breakpoint) { margin-top: 0; @@ -1581,7 +1664,7 @@ table { span { color: $text-medium; display: block; - font-size: rem-calc(14); + font-size: $small-font-size; font-weight: normal; } @@ -1639,6 +1722,7 @@ table { } .verification-step { + font-family: $font-sans; font-weight: bold; line-height: rem-calc(20); padding-top: rem-calc(6); @@ -1780,8 +1864,9 @@ table { .comment-votes { color: $text-medium; - font-weight: lighter; - line-height: rem-calc(24); + font-family: $font-sans; + font-size: $small-font-size; + line-height: $line-height; margin: rem-calc(10) rem-calc(12) rem-calc(6) 0; a { @@ -1804,12 +1889,13 @@ table { margin-left: rem-calc(42); p { - font-size: rem-calc(14); + font-size: $small-font-size; } .reply { background: white; border: 1px solid $border; + font-family: $font-sans; font-size: rem-calc(12); margin: rem-calc(6) 0; padding: rem-calc(6); @@ -1875,9 +1961,9 @@ table { } .comment-info { - color: $text-light; - font-size: rem-calc(13); - font-weight: lighter; + color: $text-medium; + font-family: $font-sans; + font-size: $small-font-size; margin-top: rem-calc(6); vertical-align: middle; diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 70ed1d621..486d46881 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -13,6 +13,7 @@ @mixin votes { background: $votes-bg; border-top: 1px solid $votes-border; + font-family: $font-sans; margin: 0 rem-calc(-12); padding: rem-calc(14) rem-calc(12); position: relative; @@ -73,7 +74,6 @@ color: white; display: inline-block; font-size: rem-calc(16); - font-weight: lighter; line-height: $line-height*2; padding-left: rem-calc(8); vertical-align: top; @@ -113,10 +113,9 @@ .not-logged { background: rgba(22,99,135,.9); color: white; + font-size: $small-font-size; height: 100%; left: 0; - line-height: $line-height*2; - padding-top: rem-calc(12); position: absolute; text-align: center; top: 0; @@ -158,6 +157,7 @@ @mixin supports { background: $proposals; border-top: 1px solid $proposals-border; + font-family: $font-sans; margin: 0 rem-calc(-12); padding: rem-calc(14) rem-calc(12); position: relative; @@ -194,7 +194,7 @@ background: white; color: $proposals; display: inline-block; - font-size: rem-calc(14); + font-size: $small-font-size; margin-top: rem-calc(12); &:hover { @@ -211,12 +211,10 @@ .total-supports { color: white; text-align: center; - font-size: rem-calc(14); + font-size: $small-font-size; span { display: block; - font-size: rem-calc(11); - opacity: .75; } } @@ -227,10 +225,9 @@ .not-logged { background: rgba(255,164,45,.9); color: white; + font-size: $small-font-size; height: 100%; left: 0; - line-height: $line-height*2; - padding-top: rem-calc(12); position: absolute; text-align: center; top: 0; @@ -278,21 +275,12 @@ // - - - - - - - - - - - - - - - - - - - - - - - - - .debate-new, .debate-edit, .proposal-new, .proposal-edit, { - background: white; - padding-top: rem-calc(24); + padding-top: $line-height; .back { @include back; } - h1 { - clear: both; - font-size: rem-calc(36); - font-weight: bold; - line-height: $line-height*2; - margin-bottom: rem-calc(24); - } - .icon-debates { color: $debates; font-size: rem-calc(60); @@ -379,19 +367,18 @@ .debate-info, .proposal-info { clear: both; color: $text-medium; - font-weight: lighter; + font-family: $font-sans; line-height: $line-height*2; position: relative; - text-align: justify; a { - color: $text-medium; + color: $text-medium; } p { font-size: rem-calc(15); line-height: $line-height; - margin-bottom: 0; + margin: 0; } .author-deleted { @@ -592,6 +579,7 @@ background: none; clear: both; display: block; + font-family: $font-sans; font-size: rem-calc(12); font-weight: bold; line-height: $line-height; @@ -612,19 +600,9 @@ h3 { font-weight: bold; margin: 0; - min-height: rem-calc(48); a { - clear: both; color: $text; - display: block; - font-size: rem-calc(16); - line-height: $line-height; - text-transform: lowercase; - - &:first-letter { - text-transform: uppercase; - } } } @@ -656,8 +634,8 @@ .debate-info, .proposal-info { color: $text-medium; - font-weight: lighter; - margin-bottom: 0; + font-family: $font-sans; + margin: rem-calc(6) 0 0; .icon-comments { font-size: rem-calc(16); @@ -703,13 +681,6 @@ p { color: $text; - font-size: rem-calc(14); - line-height: $line-height; - margin-bottom: rem-calc(12); - - &.debate-info { - font-size: rem-calc(13); - } } } @@ -752,11 +723,11 @@ display: block; border-style: solid; border-color: #166387 transparent transparent transparent; - bottom: rem-calc(-14); + bottom: -14px; border-left-width: 0; border-right-color: transparent; - right: rem-calc(-1); - border-width: 1em 1em 0 0; + right: -1px; + border-width: 13px 13px 0 0; @media (min-width: $small-breakpoint) { content: ""; @@ -810,11 +781,11 @@ display: block; border-style: solid; border-color: #664212 transparent transparent transparent; - bottom: rem-calc(-14); + bottom: -14px; border-left-width: 0; border-right-color: transparent; - right: rem-calc(-1); - border-width: 1em 1em 0 0; + right: -1px; + border-width: 13px 13px 0 0; @media (min-width: $small-breakpoint) { content: ""; @@ -937,50 +908,6 @@ } } -.debate-featured { - background: $votes-bg; - margin: rem-calc(12) 0 !important; - - .panel h3 a { - color: #0D3F54; - - text-transform: none; - - &:first-letter { - text-transform: none; - } - } - - .info, .info a { - color: white !important; - } - - .content { - height: auto; - } -} - -.proposal-featured { - background: #FED900; - - .panel h3 a { - color: $text; - text-transform: lowercase; - - &:first-letter { - text-transform: uppercase; - } - } - - .info { - color: #806C00 !important; - } - - .content { - height: rem-calc(60); - } -} - .debate-featured, .proposal-featured { margin-bottom: 0; margin-top: 0; @@ -1033,6 +960,7 @@ .not-logged, .organizations-votes { background: #FED900; color: $warning-color; + font-size: $small-font-size; line-height: rem-calc(24); padding-top: rem-calc(6); @@ -1085,4 +1013,43 @@ } } } +} + +.debate-featured { + background: $votes-bg; + margin-bottom: rem-calc(12) !important; + + .panel h3 a { + color: #0D3F54; + font-size: $h3-font-size; + margin: 0; + } + + .info, .info a { + color: white !important; + font-family: $font-sans; + font-size: $small-font-size; + } + + .content { + height: auto; + } +} + +.proposal-featured { + background: #FED900; + + .panel h3 a { + color: $text; + font-size: $base-font-size; + } + + .info { + color: #806C00 !important; + font-size: $small-font-size; + } + + .content { + height: rem-calc(60); + } } \ No newline at end of file diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index b5556477f..494775a8b 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -1,6 +1,6 @@ // Table of Contents // -// 01. Fonts +// 01. Typography // 02. Colors // 03. Forms // 04. Alerts @@ -8,10 +8,30 @@ // 06. Responsive // -// 01. Fonts +// 01. Typography // - - - - - - - - - - - - - - - - - - - - - - - - - -$font-family-sans-serif: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; +$base-font-size: rem-calc(17); +$small-font-size: rem-calc(14); +$lead-font-size: rem-calc(20); +$title-font-size: rem-calc(52); +$h1-font-size: rem-calc(40); +$h2-font-size: rem-calc(30); +$h3-font-size: rem-calc(20); +$h4-font-size: rem-calc(17); +$h5-font-size: rem-calc(15); +$h6-font-size: rem-calc(13); +$base-line-height: 1.5; +$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; +$font-bold: 700; + $line-height: rem-calc(24); // 02. Colors diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index d0d6dcfd0..b170aa431 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -43,11 +43,13 @@
- <%= t("layouts.footer.copyright", year: Time.now.year) %> |  - <%= link_to t("layouts.footer.more_info"), "/more_information" %> |  - <%= link_to t("layouts.footer.privacy"), "/privacy" %> |  - <%= link_to t("layouts.footer.conditions"), "/conditions" %> |  - <%= link_to t("layouts.footer.accessibility"), "/accessibility" %> +

+ <%= t("layouts.footer.copyright", year: Time.now.year) %> |  + <%= link_to t("layouts.footer.more_info"), "/more_information" %> |  + <%= link_to t("layouts.footer.privacy"), "/privacy" %> |  + <%= link_to t("layouts.footer.conditions"), "/conditions" %> |  + <%= link_to t("layouts.footer.accessibility"), "/accessibility" %> +

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 5c5ea6e04..4c5bac804 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -5,8 +5,7 @@
<%= link_to t("layouts.header.participation_html"), root_path, class: ("selected" unless current_page?("/opendata")) %> | <%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %> | - <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %> -  |  + <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %> |