Commit 8b7bdc94 authored by Matija Obreza's avatar Matija Obreza
Browse files

Step 1: Fonts

parent feb64953
......@@ -35,7 +35,25 @@ module.exports = function(grunt) {
cwd : 'bower_components/bootstrap-sass/assets/fonts/bootstrap/',
src : '*',
dest : '<%= app.dist %>/styles/fonts'
}, {
},
{
expand : true,
cwd : 'bower_components/fontawesome/fonts/',
src : '*',
dest : '<%= app.dist %>/styles/fonts'
},
{
expand : true,
cwd : 'bower_components/fontawesome/css/',
src : '*',
dest : '<%= app.dist %>/styles/'
},
{
expand : true,
cwd : 'bower_components/webfont-notosans/regular/',
src : '*',
dest : '<%= app.dist %>/styles/fonts'
},{
expand : true,
cwd : 'bower_components/jquery-ui/themes/base/',
src : [ 'jquery-ui.css' ],
......@@ -58,7 +76,17 @@ module.exports = function(grunt) {
cwd : 'bower_components/jquery-simplecolorpicker/',
src : [ 'jquery.simplecolorpicker.css', 'jquery.simplecolorpicker-regularfont.css' ],
dest : '<%= app.dist %>/styles'
} ]
},
{
// scooch
expand : true,
cwd : 'src/main/sourceapp/styles/',
src : [ 'pages.css' ],
dest : '<%= app.dist %>/styles'
},
]
},
styles : {
expand : true,
......@@ -163,6 +191,7 @@ module.exports = function(grunt) {
'<%= app.dist %>/styles/other.min.css' : [ '<%= app.dist %>/styles/jquery-ui.css', '<%= app.dist %>/styles/forza.css', '<%= app.dist %>/styles/leaflet.css',
'<%= app.dist %>/styles/jquery.simplecolorpicker.css', '<%= app.dist %>/styles/jquery.simplecolorpicker-regularfont.css' ],
'<%= app.dist %>/styles/genesys.min.css' : [ '<%= app.dist %>/styles/genesys.css' ],
'<%= app.dist %>/styles/pages.min.css' : [ '<%= app.dist %>/styles/pages.css' ],
'<%= app.dist %>/styles/all.min.css' : [ '<%= app.dist %>/styles/bootstrap.css', '<%= app.dist %>/styles/jquery-ui.css', '<%= app.dist %>/styles/forza.css',
'<%= app.dist %>/styles/leaflet.css', '<%= app.dist %>/styles/genesys.css' ],
}
......@@ -183,11 +212,41 @@ module.exports = function(grunt) {
'<%= app.dist %>/js/all.min.js' : [ '<%= app.dist %>/js/libraries.js', '<%= app.dist %>/js/genesys.js' ]
}
}
},
sass: { // Task
dist: { // Target
options: { // Target options
style: 'expanded'
},
files: { // Dictionary of files
//'style.css': 'style.scss' // 'destination': 'source'
'src/main/webapp/html/styles/genesys.css': 'src/main/sourceapp/styles/genesys.scss',
'src/main/webapp/html/styles/pages.css':'src/main/sourceapp/styles/pages.scss'
}
}
},
watch: {
css: {
files: ['src/main/sourceapp/styles/genesys.scss', 'src/main/sourceapp/styles/pages.scss'],
tasks: ['sass'],
options: {
livereload: true
}
}
}
});
// grunt.registerTask('serve', [ 'clean', 'copy:css', 'compass:server',
// 'autoprefixer', 'uglify:server' ]);
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.registerTask('build', [ 'clean', 'jshint:all', 'compass:dist', 'copy:dist', 'concat', 'autoprefixer', 'uglify:dist', 'cssmin' ]);
grunt.registerTask('js', [ 'jshint:all', 'copy:dist', 'concat', 'autoprefixer', 'uglify:dist' ]);
grunt.registerTask('css', [ 'compass:dist', 'copy:dist', 'concat', 'autoprefixer', 'cssmin' ]);
......
......@@ -11,8 +11,10 @@
"jquery-flot": "~0.8.3",
"tinymce": "~4.1.9",
"jquery.tinymce": "*",
"bootstrap-sass": "~3.3.4",
"bootstrap-sass": "~3.3.5",
"jquery-ui": "~1.11.4",
"dyn-css": "~0.8.1"
"dyn-css": "~0.8.1",
"webfont-notosans": "~0.1.0",
"fontawesome": "~4.4.0"
}
}
@import url("font-awesome.min.css");
$header-height: 70;
@font-face {
font-family: 'FontAwesome';
src: url('fonts/fontawesome-webfont.eot');
src: url('fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/fontawesome-webfont.woff2') format('woff2'),
url('fonts/fontawesome-webfont.woff') format('woff'),
url('fonts/fontawesome-webfont.ttf') format('truetype'),
url('fonts/fontawesome-webfont.svg#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Noto Sans';
src: url('fonts/NotoSans-Regular-webfont.eot');
src: url('fonts/NotoSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/NotoSans-Regular-webfont.woff') format('woff'),
url('fonts/NotoSans-Regular-webfont.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
/* Sticky Footer */
html, body {
height: 100%;
font-family: 'Noto Sans';
}
.fa {
font-family: FontAwesome;
}
.site-wrapper {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment