diff --git a/src/Foundation.hs b/src/Foundation.hs index d92ec352a..6351a80fe 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -970,7 +970,6 @@ siteLayout headingOverride widget = do hasPageActions = any (isPageAction . menuItemType . view _1) menuTypes pc <- widgetToPageContent $ do - addStylesheetRemote "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,800,900|Roboto:300,400,600" addScript $ StaticR js_zepto_js addScript $ StaticR js_fetchPolyfill_js addScript $ StaticR js_urlPolyfill_js diff --git a/static/css/fonts.css b/static/css/fonts.css index ae0be87be..785fe33d3 100644 --- a/static/css/fonts.css +++ b/static/css/fonts.css @@ -17,3 +17,113 @@ font-family:"Font Awesome 5 Free"; font-weight:900; } + +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 300; + src: + local('Source Sans Pro Light'), + local('SourceSansPro-Light'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdu.woff2 */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdo.woff */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.woff') format('woff'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdq.eot */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdp&skey=e2b26fc7e9e1ade8&v=v11#SourceSansPro */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.svg#SourceSansPro') format('svg'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdr.ttf */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.ttf') format('truetype'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + src: + local('Source Sans Pro Regular'), + local('SourceSansPro-Regular'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7j.woff */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.woff') format('woff'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7h.eot */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7i&skey=1e026b1c27170b9b&v=v11#SourceSansPro */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.svg#SourceSansPro') format('svg'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7g.ttf */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.ttf') format('truetype'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + src: + local('Source Sans Pro SemiBold'), + local('SourceSansPro-SemiBold'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdo.woff */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.woff') format('woff'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdq.eot */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdp&skey=227a890402fab339&v=v11#SourceSansPro */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.svg#SourceSansPro') format('svg'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdr.ttf */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.ttf') format('truetype'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 900; + src: + local('Source Sans Pro Black'), + local('SourceSansPro-Black'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdu.woff2 */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdo.woff */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.woff') format('woff'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdq.eot */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdp&skey=cf4dfcb31d72fb0a&v=v11#SourceSansPro */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.svg#SourceSansPro') format('svg'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdr.ttf */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: + local('Roboto Light'), + local('Roboto-Light'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 */ + url('../fonts/roboto/Roboto_300.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc-.woff */ + url('../fonts/roboto/Roboto_300.woff') format('woff'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc8.eot */ + url('../fonts/roboto/Roboto_300.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=KFOlCnqEu92Fr1MmSU5fBBc_&skey=11ce8ad5f54705ca&v=v18#Roboto */ + url('../fonts/roboto/Roboto_300.svg#Roboto') format('svg'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc9.ttf */ + url('../fonts/roboto/Roboto_300.ttf') format('truetype'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: + local('Roboto'), + local('Roboto-Regular'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxK.woff2 */ + url('../fonts/roboto/Roboto_400.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxM.woff */ + url('../fonts/roboto/Roboto_400.woff') format('woff'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxO.eot */ + url('../fonts/roboto/Roboto_400.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=KFOmCnqEu92Fr1Mu4mxN&skey=a0a0114a1dcab3ac&v=v18#Roboto */ + url('../fonts/roboto/Roboto_400.svg#Roboto') format('svg'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxP.ttf */ + url('../fonts/roboto/Roboto_400.ttf') format('truetype'); +} diff --git a/static/fonts/roboto/Roboto_300.eot b/static/fonts/roboto/Roboto_300.eot new file mode 100644 index 000000000..17b7d5cd2 Binary files /dev/null and b/static/fonts/roboto/Roboto_300.eot differ diff --git a/static/fonts/roboto/Roboto_300.svg b/static/fonts/roboto/Roboto_300.svg new file mode 100644 index 000000000..4ded944a8 --- /dev/null +++ b/static/fonts/roboto/Roboto_300.svg @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/fonts/roboto/Roboto_300.ttf b/static/fonts/roboto/Roboto_300.ttf new file mode 100644 index 000000000..a22188eed Binary files /dev/null and b/static/fonts/roboto/Roboto_300.ttf differ diff --git a/static/fonts/roboto/Roboto_300.woff b/static/fonts/roboto/Roboto_300.woff new file mode 100644 index 000000000..96663f072 Binary files /dev/null and b/static/fonts/roboto/Roboto_300.woff differ diff --git a/static/fonts/roboto/Roboto_300.woff2 b/static/fonts/roboto/Roboto_300.woff2 new file mode 100644 index 000000000..52c5845a7 Binary files /dev/null and b/static/fonts/roboto/Roboto_300.woff2 differ diff --git a/static/fonts/roboto/Roboto_400.eot b/static/fonts/roboto/Roboto_400.eot new file mode 100644 index 000000000..a0780d6e3 Binary files /dev/null and b/static/fonts/roboto/Roboto_400.eot differ diff --git a/static/fonts/roboto/Roboto_400.svg b/static/fonts/roboto/Roboto_400.svg new file mode 100644 index 000000000..627f5a368 --- /dev/null +++ b/static/fonts/roboto/Roboto_400.svg @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/fonts/roboto/Roboto_400.ttf b/static/fonts/roboto/Roboto_400.ttf new file mode 100644 index 000000000..b91bf3f7e Binary files /dev/null and b/static/fonts/roboto/Roboto_400.ttf differ diff --git a/static/fonts/roboto/Roboto_400.woff b/static/fonts/roboto/Roboto_400.woff new file mode 100644 index 000000000..92dfacc61 Binary files /dev/null and b/static/fonts/roboto/Roboto_400.woff differ diff --git a/static/fonts/roboto/Roboto_400.woff2 b/static/fonts/roboto/Roboto_400.woff2 new file mode 100644 index 000000000..7e854e669 Binary files /dev/null and b/static/fonts/roboto/Roboto_400.woff2 differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.eot b/static/fonts/sourcesanspro/Source_Sans_Pro_300.eot new file mode 100644 index 000000000..7092e737a Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_300.eot differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.svg b/static/fonts/sourcesanspro/Source_Sans_Pro_300.svg new file mode 100644 index 000000000..806471c89 --- /dev/null +++ b/static/fonts/sourcesanspro/Source_Sans_Pro_300.svg @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.ttf b/static/fonts/sourcesanspro/Source_Sans_Pro_300.ttf new file mode 100644 index 000000000..f9f9a3a0b Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_300.ttf differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff b/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff new file mode 100644 index 000000000..7ceadfc81 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff2 b/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff2 new file mode 100644 index 000000000..bfb4050ba Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff2 differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.eot b/static/fonts/sourcesanspro/Source_Sans_Pro_400.eot new file mode 100644 index 000000000..c5262239d Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_400.eot differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.svg b/static/fonts/sourcesanspro/Source_Sans_Pro_400.svg new file mode 100644 index 000000000..64f90f599 --- /dev/null +++ b/static/fonts/sourcesanspro/Source_Sans_Pro_400.svg @@ -0,0 +1,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.ttf b/static/fonts/sourcesanspro/Source_Sans_Pro_400.ttf new file mode 100644 index 000000000..e1247aef6 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_400.ttf differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff b/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff new file mode 100644 index 000000000..16f51fff1 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff2 b/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff2 new file mode 100644 index 000000000..efa300c56 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff2 differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.eot b/static/fonts/sourcesanspro/Source_Sans_Pro_600.eot new file mode 100644 index 000000000..46508d418 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_600.eot differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.svg b/static/fonts/sourcesanspro/Source_Sans_Pro_600.svg new file mode 100644 index 000000000..3fda041c6 --- /dev/null +++ b/static/fonts/sourcesanspro/Source_Sans_Pro_600.svg @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.ttf b/static/fonts/sourcesanspro/Source_Sans_Pro_600.ttf new file mode 100644 index 000000000..8b7620ff1 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_600.ttf differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff b/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff new file mode 100644 index 000000000..3c6ce2ff3 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff2 b/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff2 new file mode 100644 index 000000000..e379beda7 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff2 differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.eot b/static/fonts/sourcesanspro/Source_Sans_Pro_900.eot new file mode 100644 index 000000000..af91ce20d Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_900.eot differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.svg b/static/fonts/sourcesanspro/Source_Sans_Pro_900.svg new file mode 100644 index 000000000..5911db3f9 --- /dev/null +++ b/static/fonts/sourcesanspro/Source_Sans_Pro_900.svg @@ -0,0 +1,346 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.ttf b/static/fonts/sourcesanspro/Source_Sans_Pro_900.ttf new file mode 100644 index 000000000..75257d047 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_900.ttf differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff b/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff new file mode 100644 index 000000000..de95d21bd Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff2 b/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff2 new file mode 100644 index 000000000..36278e155 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff2 differ