diff --git a/.travis.yml b/.travis.yml index a5b790e..3d871fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,3 @@ before_install: npm install -g grunt-cli install: - npm install - npm run dist - diff --git a/Gruntfile.js b/Gruntfile.js index 8a703af..17b43b1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -60,14 +60,14 @@ module.exports = function(grunt) { { expand: true, cwd: 'src/fonts/', - src: ['minimal-*.*'], + src: ['*.*'], dest: 'dist/fonts/', filter: 'isFile' }, { expand: true, cwd: 'src/images/', - src: ['*.ico'], + src: ['*.*'], dest: 'dist/', filter: 'isFile' }, diff --git a/src/css/style.css b/src/css/style.css index e4c5028..eb02bc7 100644 --- a/src/css/style.css +++ b/src/css/style.css @@ -10,6 +10,41 @@ body { -moz-osx-font-smoothing: grayscale; } +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 200; + src: local('Source Sans Pro ExtraLight'), local('SourceSansPro-ExtraLight'), url(../fonts/SourceSansPro-ExtraLight.woff2) format('woff2'); +} + +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 300; + src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url(../fonts/SourceSansPro-Light.woff2) format('woff2'); +} + +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(../fonts/SourceSansPro-Regular.woff2) format('woff2'); +} + +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + src: local('Source Sans Pro SemiBold'), local('SourceSansPro-SemiBold'), url(../fonts/SourceSansPro-SemiBold.woff2) format('woff2'); +} + +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 700; + src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(../fonts/SourceSansPro-Bold.woff2) format('woff2'); +} + table td { font-size: 14px; white-space: nowrap !important; diff --git a/src/fonts/SourceSansPro-Bold.woff2 b/src/fonts/SourceSansPro-Bold.woff2 new file mode 100644 index 0000000..52b6d69 Binary files /dev/null and b/src/fonts/SourceSansPro-Bold.woff2 differ diff --git a/src/fonts/SourceSansPro-ExtraLight.woff2 b/src/fonts/SourceSansPro-ExtraLight.woff2 new file mode 100644 index 0000000..3605fb6 Binary files /dev/null and b/src/fonts/SourceSansPro-ExtraLight.woff2 differ diff --git a/src/fonts/SourceSansPro-Light.woff2 b/src/fonts/SourceSansPro-Light.woff2 new file mode 100644 index 0000000..bfb4050 Binary files /dev/null and b/src/fonts/SourceSansPro-Light.woff2 differ diff --git a/src/fonts/SourceSansPro-Regular.woff2 b/src/fonts/SourceSansPro-Regular.woff2 new file mode 100644 index 0000000..efa300c Binary files /dev/null and b/src/fonts/SourceSansPro-Regular.woff2 differ diff --git a/src/fonts/SourceSansPro-SemiBold.woff2 b/src/fonts/SourceSansPro-SemiBold.woff2 new file mode 100644 index 0000000..e379bed Binary files /dev/null and b/src/fonts/SourceSansPro-SemiBold.woff2 differ diff --git a/src/views/layout.jade b/src/views/layout.jade index dd4ef37..ccb7cfe 100644 --- a/src/views/layout.jade +++ b/src/views/layout.jade @@ -5,7 +5,6 @@ html(ng-app="netStatsApp") meta(name="viewport", content="width=device-width, initial-scale=1.0, maximum-scale=1.0") title Görli Network Status style(type="text/css") [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { display: none !important; } - link(rel='stylesheet', href='//fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700') link(rel='stylesheet', href='/css/netstats.min.css') meta(name='robots', content='index,follow') meta(name='googlebot', content='index,follow')