LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove reference to bower_components in CSS

Browse source
This commit is contained in:
Francis Lachapelle 2015-01-30 16:31:08 -05:00
parent 79a5d61efb
commit 5cc14bb729
2 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
UI/WebServerResources/Gruntfile.js
View file

@ -53,7 +53,7 @@ module.exports = function(grunt) {
'<%= src %>/underscore/underscore-min.{js,map}' '<%= src %>/underscore/underscore-min.{js,map}'
]; ];
for (var j = 0; j < js.length; j++) { for (var j = 0; j < js.length; j++) {
var files = grunt.file.expand(grunt.template.process(js[j], {data: options})) var files = grunt.file.expand(grunt.template.process(js[j], {data: options}));
for (var i = 0; i < files.length; i++) { for (var i = 0; i < files.length; i++) {
var src = files[i]; var src = files[i];
var paths = src.split('/'); var paths = src.split('/');
@ -63,23 +63,26 @@ module.exports = function(grunt) {
} }
} }
grunt.log.subhead('Copying font files'); grunt.log.subhead('Copying font files');
var fonts = grunt.file.expand( var fonts = [
grunt.template.process('<%= src %>/ionic/release/fonts/ionicons.*', '<%= src %>/ionic/release/fonts/ionicons.*',
{data: options}) '<%= src %>/material-design-iconic-font/fonts/Material-Design-Iconic-Font.*'
); ];
for (var i = 0; i < fonts.length; i++) { for (var j = 0; j < fonts.length; j++) {
var src = fonts[i]; var files = grunt.file.expand(grunt.template.process(fonts[j], {data: options}));
for (var i = 0; i < files.length; i++) {
var src = files[i];
var paths = src.split('/'); var paths = src.split('/');
var dest = options.fonts_dest + paths[paths.length-1]; var dest = options.fonts_dest + paths[paths.length-1];
grunt.file.copy(src, dest); grunt.file.copy(src, dest);
grunt.log.ok("copy " + src + " => " + dest); grunt.log.ok("copy " + src + " => " + dest);
} }
}
grunt.log.subhead('Copying CSS files'); grunt.log.subhead('Copying CSS files');
var css = [ var css = [
'<%= src %>/ng-tags-input/ng-tags-input*.css' '<%= src %>/ng-tags-input/ng-tags-input*.css'
]; ];
for (var j = 0; j < css.length; j++) { for (var j = 0; j < css.length; j++) {
var files = grunt.file.expand(grunt.template.process(css[j], {data: options})) var files = grunt.file.expand(grunt.template.process(css[j], {data: options}));
for (var i = 0; i < files.length; i++) { for (var i = 0; i < files.length; i++) {
var src = files[i]; var src = files[i];
var paths = src.split('/'); var paths = src.split('/');

4
UI/WebServerResources/scss/components/icon/_extends.scss
View file

@ -14,8 +14,8 @@ $md-icon-src-path: "../../../bower_components/material-design-iconic-font/scss/"
@import "../../../bower_components/material-design-iconic-font/scss/_variables"; @import "../../../bower_components/material-design-iconic-font/scss/_variables";
// variables in source are not defaulted, we MUST override here // variables in source are not defaulted, we MUST override here
// relative (to css) path for src fonts // relative (to css) path for src fonts
$md-font-path: "../bower_components/material-design-iconic-font/fonts"; $md-font-path: "../fonts";
// the source file declare "md" !!! // Set style directive prefix to "md-icon-"
$md-css-prefix: md-icon; $md-css-prefix: md-icon;
@import "../../../bower_components/material-design-iconic-font/scss/_mixins"; @import "../../../bower_components/material-design-iconic-font/scss/_mixins";
@import "../../../bower_components/material-design-iconic-font/scss/_path"; @import "../../../bower_components/material-design-iconic-font/scss/_path";