Skip to content

Commit beca6ea

Browse files
committed
successful build with webpack
1 parent 020f5a4 commit beca6ea

21 files changed

+5776
-294
lines changed

Gruntfile.js

Lines changed: 0 additions & 189 deletions
This file was deleted.

bower.json

Lines changed: 0 additions & 37 deletions
This file was deleted.

package.json

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,32 @@
33
"main": "js/theme.js",
44
"version": "0.4.3",
55
"private": true,
6-
"devDependencies": {
7-
"bower": "^1.8.4",
6+
"scripts": {
7+
"start": "yarn webpack-dev-server --open --config webpack.dev.js",
8+
"build": "yarn webpack --config webpack.prod.js"
9+
},
10+
"dependencies": {
11+
"bourbon": "~4.3",
12+
"bourbon-neat": "~1.7",
813
"browserify": "^13.0.0",
9-
"connect-livereload": "~0.6.0",
10-
"grunt": "~1.0.1",
11-
"grunt-banner": "^0.6.0",
12-
"grunt-browserify": "^5.0.0",
13-
"grunt-contrib-clean": "^1.0.0",
14-
"grunt-contrib-connect": "^1.0.2",
15-
"grunt-contrib-copy": "~1.0.0",
16-
"grunt-contrib-sass": "~1.0.0",
17-
"grunt-contrib-uglify": "~3.3.0",
18-
"grunt-contrib-watch": "~1.0.0",
19-
"grunt-exec": "~1.0.1",
20-
"grunt-open": "0.2.3",
21-
"matchdep": "~1.0.1"
14+
"css-loader": "^2.1.1",
15+
"file-loader": "^3.0.1",
16+
"font-awesome": "^4.7.0",
17+
"imports-loader": "^0.8.0",
18+
"jquery": "^3.4.1",
19+
"lato-font": "^3.0.0",
20+
"matchdep": "~1.0.1",
21+
"mini-css-extract-plugin": "^0.6.0",
22+
"node-sass": "^4.12.0",
23+
"roboto-fontface": "^0.10.0",
24+
"sass-loader": "^7.1.0",
25+
"style-loader": "^0.23.1",
26+
"webpack": "^4.30.0",
27+
"webpack-cli": "^3.3.1",
28+
"webpack-merge": "^4.2.1",
29+
"wyrm": "^1.0.9"
30+
},
31+
"devDependencies": {
32+
"webpack-dev-server": "^3.3.1"
2233
}
2334
}

sass/_theme_font_local.sass

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import './sass/theme.sass';
2+
import './sass/badge_only.sass';
3+
import './theme.js';
File renamed without changes.

sass/_theme_badge_fa.sass renamed to src/sass/_theme_badge_fa.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Slimmer version of FA for use on the badge_only.sass file.
22
3-
+font-face(FontAwesome, '#{$font-awesome-dir}fontawesome-webfont')
3+
+font-face(FontAwesome, '#{$fa-font-path}/fontawesome-webfont')
44

55
.fa:before
66
display: inline-block
File renamed without changes.

src/sass/_theme_font_local.sass

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
$lato-font-path: "~lato-font/fonts"
2+
$lato-variants: ('normal': 400, 'bold': 700)
3+
@import ~lato-font/scss/lato-font
4+
5+
$roboto-font-path: "~roboto-fontface/fonts"
6+
@import ~roboto-fontface/css/roboto-slab/sass/roboto-slab-fontface

0 commit comments

Comments
 (0)