Skip to content

Commit

Permalink
add fonts to bower
Browse files Browse the repository at this point in the history
  • Loading branch information
@OmgImAlexis
OmgImAlexis committed Jan 10, 2016
1 parent 28a2671 commit a60e688
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 145 deletions.
21 changes: 20 additions & 1 deletion .build/Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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: {
Expand Down Expand Up @@ -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');
Expand All @@ -119,6 +137,7 @@ module.exports = function(grunt) {
'clean',
'bower',
'bower_concat',
'copy',
'uglify',
'sass',
'cssmin',
Expand Down
3 changes: 2 additions & 1 deletion .build/bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions .build/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Binary file added gui/slick/css/1ORHCpsQm3Vp6mXoaTYnF5uFdDttMLvmWuJdhhgs.ttf
View file
Binary file not shown.
Binary file added gui/slick/css/702ZOKiLJc3WVjuplzInF5uFdDttMLvmWuJdhhgs.ttf
View file
Binary file not shown.
Binary file added gui/slick/css/JXh38I15wypJXxuGMBp0EAVxt0G0biEntp43Qt6E.ttf
View file
Binary file not shown.
Binary file added gui/slick/css/KeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf
View file
Binary file not shown.
Binary file added gui/slick/css/_ySUJH_bn48VBG8sNSonF5uFdDttMLvmWuJdhhgs.ttf
View file
Binary file not shown.
Binary file added gui/slick/css/bV5DfGHOiMmvb1Xr-honF5uFdDttMLvmWuJdhhgs.ttf
View file
Binary file not shown.
Binary file added gui/slick/css/iXeptR36kaC0GEAetxi8cqLH4MEiSE0ROcU-qHOA.ttf
View file
Binary file not shown.
Binary file added gui/slick/css/iXeptR36kaC0GEAetxlDMrAYtoOisqqMDW9M_Mqc.ttf
View file
Binary file not shown.
Binary file added gui/slick/css/iXeptR36kaC0GEAetxp_TkvowlIOtbR7ePgFOpF4.ttf
View file
Binary file not shown.
Binary file added gui/slick/css/iXeptR36kaC0GEAetxrfB31yxOzP-czbf6AAKCVo.ttf
View file
Binary file not shown.
142 changes: 0 additions & 142 deletions gui/slick/css/style.css
View file
Original file line number Diff line number Diff line change
@@ -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
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion gui/slick/css/vender.min.css
View file

Large diffs are not rendered by default.

0 comments on commit a60e688

Please sign in to comment.