diff --git a/.build/Gruntfile.js b/.build/Gruntfile.js index 6e6f980a0811d21247a17011e0a6e91670307f2d..e315baefb19da8695f5bf080c909f4bd5b5ccfa0 100644 --- a/.build/Gruntfile.js +++ b/.build/Gruntfile.js @@ -4,7 +4,11 @@ module.exports = function(grunt) { grunt.initConfig({ clean: { dist: './dist/', - bower_components: './bower_components' // jshint ignore:line + bower_components: './bower_components', // jshint ignore:line + fonts: '../gui/slick/css/*.ttf', + options: { + force: true + } }, bower: { install: { @@ -48,6 +52,19 @@ module.exports = function(grunt) { } } }, + copy: { + openSans: { + files: [{ + expand: true, + dot: true, + cwd: 'bower_components/openSans', + src: [ + '*.ttf' + ], + dest: '../gui/slick/css/' + }] + } + }, uglify: { bower: { files: { @@ -110,6 +127,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-bower-task'); grunt.loadNpmTasks('grunt-bower-concat'); + grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-contrib-jshint'); @@ -119,6 +137,7 @@ module.exports = function(grunt) { 'clean', 'bower', 'bower_concat', + 'copy', 'uglify', 'sass', 'cssmin', diff --git a/.build/bower.json b/.build/bower.json index a4362a19bf813d2dec2ba4e6ae1d496437e1f964..47138f5c29af7280d4d0304e9783f9c58912c101 100644 --- a/.build/bower.json +++ b/.build/bower.json @@ -23,7 +23,8 @@ "tablesorter": "jquery.tablesorter#~2.24.5", "jquery-confirm": "~2.5.2", "bootstrap-formhelpers": "~2.3.0", - "isotope": "~2.2.2" + "isotope": "~2.2.2", + "openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic" }, "resolutions": { "bootstrap": "~3.3.5" diff --git a/.build/package.json b/.build/package.json index ab73bd48a706d57dd108d5cfbaf4618023aea6b7..f0208e63db0f2c64ef0cac177d9225300bc19d45 100644 --- a/.build/package.json +++ b/.build/package.json @@ -21,6 +21,7 @@ "grunt-bower-task": "^0.4.0", "grunt-cli": "^0.1.13", "grunt-contrib-clean": "^0.7.0", + "grunt-contrib-copy": "^0.8.2", "grunt-contrib-cssmin": "^0.14.0", "grunt-contrib-jshint": "^0.11.3", "grunt-contrib-sass": "^0.9.2", diff --git a/gui/slick/css/1ORHCpsQm3Vp6mXoaTYnF5uFdDttMLvmWuJdhhgs.ttf b/gui/slick/css/1ORHCpsQm3Vp6mXoaTYnF5uFdDttMLvmWuJdhhgs.ttf new file mode 100644 index 0000000000000000000000000000000000000000..d7d7cd1fcc97d7aaeb1ffa373ea86d0c2ee13b5e Binary files /dev/null and b/gui/slick/css/1ORHCpsQm3Vp6mXoaTYnF5uFdDttMLvmWuJdhhgs.ttf differ diff --git a/gui/slick/css/702ZOKiLJc3WVjuplzInF5uFdDttMLvmWuJdhhgs.ttf b/gui/slick/css/702ZOKiLJc3WVjuplzInF5uFdDttMLvmWuJdhhgs.ttf new file mode 100644 index 0000000000000000000000000000000000000000..974a7c5edd7f14486c43561220b54244da886885 Binary files /dev/null and b/gui/slick/css/702ZOKiLJc3WVjuplzInF5uFdDttMLvmWuJdhhgs.ttf differ diff --git a/gui/slick/css/JXh38I15wypJXxuGMBp0EAVxt0G0biEntp43Qt6E.ttf b/gui/slick/css/JXh38I15wypJXxuGMBp0EAVxt0G0biEntp43Qt6E.ttf new file mode 100644 index 0000000000000000000000000000000000000000..53dbf96f7cde8a031fcea31baf7eaf9c9af36fbb Binary files /dev/null and b/gui/slick/css/JXh38I15wypJXxuGMBp0EAVxt0G0biEntp43Qt6E.ttf differ diff --git a/gui/slick/css/KeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf b/gui/slick/css/KeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf new file mode 100644 index 0000000000000000000000000000000000000000..0dae9c3bbc0b52ccd98b060849e631661a9bebdc Binary files /dev/null and b/gui/slick/css/KeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf differ diff --git a/gui/slick/css/_ySUJH_bn48VBG8sNSonF5uFdDttMLvmWuJdhhgs.ttf b/gui/slick/css/_ySUJH_bn48VBG8sNSonF5uFdDttMLvmWuJdhhgs.ttf new file mode 100644 index 0000000000000000000000000000000000000000..314e983a4bce3320b1ebeea9d21aeea88eaab52e Binary files /dev/null and b/gui/slick/css/_ySUJH_bn48VBG8sNSonF5uFdDttMLvmWuJdhhgs.ttf differ diff --git a/gui/slick/css/bV5DfGHOiMmvb1Xr-honF5uFdDttMLvmWuJdhhgs.ttf b/gui/slick/css/bV5DfGHOiMmvb1Xr-honF5uFdDttMLvmWuJdhhgs.ttf new file mode 100644 index 0000000000000000000000000000000000000000..569e03a84014d5163582d148d6e090727eb61b53 Binary files /dev/null and b/gui/slick/css/bV5DfGHOiMmvb1Xr-honF5uFdDttMLvmWuJdhhgs.ttf differ diff --git a/gui/slick/css/iXeptR36kaC0GEAetxi8cqLH4MEiSE0ROcU-qHOA.ttf b/gui/slick/css/iXeptR36kaC0GEAetxi8cqLH4MEiSE0ROcU-qHOA.ttf new file mode 100644 index 0000000000000000000000000000000000000000..ee892609576fbea2b53f7e6506bba3a8aebca10e Binary files /dev/null and b/gui/slick/css/iXeptR36kaC0GEAetxi8cqLH4MEiSE0ROcU-qHOA.ttf differ diff --git a/gui/slick/css/iXeptR36kaC0GEAetxlDMrAYtoOisqqMDW9M_Mqc.ttf b/gui/slick/css/iXeptR36kaC0GEAetxlDMrAYtoOisqqMDW9M_Mqc.ttf new file mode 100644 index 0000000000000000000000000000000000000000..57e8b7d54ffc5568301c942c4a7bfece55d080f7 Binary files /dev/null and b/gui/slick/css/iXeptR36kaC0GEAetxlDMrAYtoOisqqMDW9M_Mqc.ttf differ diff --git a/gui/slick/css/iXeptR36kaC0GEAetxp_TkvowlIOtbR7ePgFOpF4.ttf b/gui/slick/css/iXeptR36kaC0GEAetxp_TkvowlIOtbR7ePgFOpF4.ttf new file mode 100644 index 0000000000000000000000000000000000000000..1e54a3172d1f65d35e75139e5c22def8e95f0435 Binary files /dev/null and b/gui/slick/css/iXeptR36kaC0GEAetxp_TkvowlIOtbR7ePgFOpF4.ttf differ diff --git a/gui/slick/css/iXeptR36kaC0GEAetxrfB31yxOzP-czbf6AAKCVo.ttf b/gui/slick/css/iXeptR36kaC0GEAetxrfB31yxOzP-czbf6AAKCVo.ttf new file mode 100644 index 0000000000000000000000000000000000000000..716c390d8f955339bda9fa605908e27038f5d892 Binary files /dev/null and b/gui/slick/css/iXeptR36kaC0GEAetxrfB31yxOzP-czbf6AAKCVo.ttf differ diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 7617360f8b1e73f49d34bbd9316b64ba7c40b17b..9d0bd556156a63bbc4e33f5d70bac1049e098aa2 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -1,145 +1,3 @@ -/* ======================================================================= -fonts -========================================================================== */ -/* Open Sans */ -/* Regular */ -@font-face { - font-family: 'Open Sans'; - - src: url('fonts/OpenSans-Regular-webfont.eot'); - src: url('fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-Regular-webfont.woff') format('woff'), - url('fonts/OpenSans-Regular-webfont.ttf') format('truetype'), - url('fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg'); - font-weight: normal; - font-weight: 400; - font-style: normal; -} - -/* Italic */ -@font-face { - font-family: 'Open Sans'; - src: url('fonts/OpenSans-Italic-webfont.eot'); - src: url('fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-Italic-webfont.woff') format('woff'), - url('fonts/OpenSans-Italic-webfont.ttf') format('truetype'), - url('fonts/OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg'); - font-weight: normal; - font-weight: 400; - font-style: italic; -} - -/* Light */ -@font-face { - font-family: 'Open Sans'; - src: url('fonts/OpenSans-Light-webfont.eot'); - src: url('fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-Light-webfont.woff') format('woff'), - url('fonts/OpenSans-Light-webfont.ttf') format('truetype'), - url('fonts/OpenSans-Light-webfont.svg#OpenSansLight') format('svg'); - font-weight: 200; - font-style: normal; -} - -/* Light Italic */ -@font-face { - font-family: 'Open Sans'; - src: url('fonts/OpenSans-LightItalic-webfont.eot'); - src: url('fonts/OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-LightItalic-webfont.woff') format('woff'), - url('fonts/OpenSans-LightItalic-webfont.ttf') format('truetype'), - url('fonts/OpenSans-LightItalic-webfont.svg#OpenSansLightItalic') format('svg'); - font-weight: 200; - font-style: italic; -} - -/* Semibold */ -@font-face { - font-family: 'Open Sans'; - src: url('fonts/OpenSans-Semibold-webfont.eot'); - src: url('fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-Semibold-webfont.woff') format('woff'), - url('fonts/OpenSans-Semibold-webfont.ttf') format('truetype'), - url('fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg'); - font-weight: 600; - font-style: normal; -} - -/* Semibold Italic */ -@font-face { - font-family: 'Open Sans'; - src: url('fonts/OpenSans-SemiboldItalic-webfont.eot'); - src: url('fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-SemiboldItalic-webfont.woff') format('woff'), - url('fonts/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'), - url('fonts/OpenSans-SemiboldItalic-webfont.svg#OpenSansSemiboldItalic') format('svg'); - font-weight: 600; - font-style: italic; -} - -/* Bold */ -@font-face { - font-family: 'Open Sans'; - src: url('fonts/OpenSans-Semibold-webfont.eot'); - src: url('fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-Semibold-webfont.woff') format('woff'), - url('fonts/OpenSans-Semibold-webfont.ttf') format('truetype'), - url('fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg'); - font-weight: bold; - font-weight: 700; - font-style: normal; -} - -/* Bold Italic */ -@font-face { - font-family: 'Open Sans'; - src: url('fonts/OpenSans-SemiboldItalic-webfont.eot'); - src: url('fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-SemiboldItalic-webfont.woff') format('woff'), - url('fonts/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'), - url('fonts/OpenSans-SemiboldItalic-webfont.svg#OpenSansSemiboldItalic') format('svg'); - font-weight: bold; - font-weight: 700; - font-style: italic; -} - -/* Extra Bold */ -@font-face { - font-family: 'Open Sans'; - src: url('fonts/OpenSans-Bold-webfont.eot'); - src: url('fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-Bold-webfont.woff') format('woff'), - url('fonts/OpenSans-Bold-webfont.ttf') format('truetype'), - url('fonts/OpenSans-Bold-webfont.svg#OpenSansBold') format('svg'); - font-weight: 900; - font-style: normal; -} - -/* Extra Bold Italic */ -@font-face { - font-family: 'Open Sans'; - src: url('fonts/OpenSans-BoldItalic-webfont.eot'); - src: url('fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/OpenSans-BoldItalic-webfont.woff') format('woff'), - url('fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'), - url('fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg'); - font-weight: 900; - font-style: italic; -} - -/* Droid Sans */ -@font-face { - font-family: 'droid_sans_mono'; - src: url('fonts/droidsansmono-webfont.eot'); - src: url('fonts/droidsansmono-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/droidsansmono-webfont.woff') format('woff'), - url('fonts/droidsansmono-webfont.ttf') format('truetype'), - url('fonts/droidsansmono-webfont.svg#droid_sans_monoregular') format('svg'); - font-weight: normal; - font-style: normal; -} - - /* ======================================================================= inc_top.mako ========================================================================== */ diff --git a/gui/slick/css/vender.min.css b/gui/slick/css/vender.min.css index 77bf7fde3b1b4957a5e79243efdccd6b82e2316d..8517ed95fe6109d4ec5f505f940db29ede8e54e6 100644 Binary files a/gui/slick/css/vender.min.css and b/gui/slick/css/vender.min.css differ