Skip to content

Commit

Permalink
Fix last icon paths issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jpetitcolas committed May 18, 2015
1 parent bb24e69 commit e5f62fb
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ build/require
src/css
examples/blog/build
examples/blog/assets
npm-debug.log
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"protractor": "~1.4.0",
"rangy": "^1.3.0",
"restangular": "^1.5.1",
"sass-loader": "^0.6.0",
"sass-loader": "^0.5.0",
"style-loader": "^0.12.2",
"superagent": "^0.18.2",
"textangular": "^1.3.11",
Expand Down
6 changes: 0 additions & 6 deletions src/sass/ng-admin.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
$icon-font-path: "/~/bootstrap-sass/assets/fonts/bootstrap/";

@import "/../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap.scss";
@import "sb-admin";

$fa-font-path: "/~/font-awesome/fonts/";
@import "font-awesome/font-awesome";

#nprogress div.spinner {
width: 18px;
margin-left: -9px;
Expand Down
29 changes: 15 additions & 14 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,41 +1,42 @@
var ExtractTextPlugin = require('extract-text-webpack-plugin');

var sources = [
//'./src/javascripts/ng-admin.js',
'./src/sass/ng-admin.scss'
'font-awesome/scss/font-awesome.scss',
'bootstrap-sass/assets/stylesheets/_bootstrap.scss',
'./src/sass/ng-admin.scss',

'./src/javascripts/ng-admin.js'
];

if (process.env.NODE_ENV !== 'production') { // for live reload
//sources.push('webpack-dev-server/client?http://localhost:8080');
sources.push('webpack-dev-server/client?http://localhost:8080');
}

var scssFolders = [
'/~/bootstrap-sass/assets/stylesheets/',
'/~/font-awesome/scss/'
];

module.exports = {
entry: {
'ng-admin': sources
},
output: {
publicPath: "http://locamlhost:8080/",
publicPath: "http://localhost:8080/",
filename: "build/[name].min.js"
},
module: {
loaders: [
{ test: /es6.+\.js$/, loader: 'babel-loader' },
{ test: /\.html$/, loader: 'html' },
{ test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader' },
{
test: /\.(woff2?|svg|ttf|eot)(\?.*)?$/,
loader: 'file?name=build/assets/[name].[ext]'
},
{
test: /\.scss$/,
loader: 'style!css!sass?includePaths[]=' + scssFolders.join('&includePaths[]=', scssFolders)
loader: ExtractTextPlugin.extract('css!sass')
}
]
},
plugins: [
//new ExtractTextPlugin("build/[name].min.css", {
// allChunks: true
//})
new ExtractTextPlugin('build/ng-admin.min.css', {
allChunks: true
})
]
};

0 comments on commit e5f62fb

Please sign in to comment.