Skip to content

Commit 8980fc4

Browse files
TransitoryBlissTransitoryBliss
committed
Merge branch 'develop'
2 parents 3440ebe + 9719441 commit 8980fc4

57 files changed

Lines changed: 14619 additions & 606 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root = true
2+
[*]
3+
insert_final_newline = true
4+
[*.js]
5+
indent_style = space
6+
indent_size = 4
7+
[*.json]
8+
indent_style = space
9+
indent_size = 4
10+
[*.less]
11+
indent_style = space
12+
indent_size = 4
13+
[*.sass]
14+
indent_style = space
15+
indent_size = 4

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
Thumbs.db
88
.DS_Store
99
/node_modules/
10+
.grunt/

‎.travis.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: node_js
2+
node_js:
3+
- "0.10"
4+
before_script:
5+
- "npm install -g grunt-cli"
6+
- export DISPLAY=:99.0
7+
- sh -e /etc/init.d/xvfb start
8+
script: "grunt cibuild"

‎Gruntfile.js‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
module.exports = function(grunt) {
2+
"use strict";
3+
4+
require("load-grunt-tasks")(grunt);
5+
6+
grunt.initConfig({
7+
8+
less: {
9+
compileless: {
10+
options: {
11+
paths: ["less"]
12+
},
13+
files: {
14+
"dist/css/material.css": "less/material.less",
15+
"dist/css/material-wfont.css": "less/material-wfont.less",
16+
"dist/css/ripples.css": "less/ripples.less"
17+
}
18+
}
19+
},
20+
21+
sass: {
22+
compilesass: {
23+
files: {
24+
"dist/css/material.css": "sass/material.scss",
25+
"dist/css/material-wfont.css": "sass/material-wfont.scss",
26+
"dist/css/ripples.css": "sass/ripples.scss"
27+
}
28+
}
29+
},
30+
31+
autoprefixer: {
32+
options: {
33+
browsers: ["last 3 versions", "ie 8", "ie 9", "ie 10", "ie 11"]
34+
},
35+
prefix: {
36+
files: {
37+
"dist/css/material.css": "dist/css/material.css",
38+
"dist/css/material-wfont.css": "dist/css/material-wfont.css",
39+
"dist/css/ripples.css": "dist/css/ripples.css"
40+
}
41+
}
42+
},
43+
44+
cssmin: {
45+
minifycss: {
46+
expand: true,
47+
cwd: "dist/css/",
48+
src: ["*.css", "!*.min.css"],
49+
dest: "dist/css/",
50+
ext: ".min.css"
51+
}
52+
},
53+
54+
uglify: {
55+
minifyjs: {
56+
files: {
57+
"dist/js/material.min.js": "scripts/material.js",
58+
"dist/js/ripples.min.js": "scripts/ripples.js"
59+
}
60+
}
61+
},
62+
63+
copy: {
64+
tpl: {
65+
expand: true,
66+
cwd: "dist/",
67+
src: "**",
68+
dest: "template/material/"
69+
},
70+
distjs: {
71+
expand: true,
72+
cwd: "scripts/",
73+
src: "**",
74+
dest: "dist/js/",
75+
flatten: true,
76+
filter: "isFile"
77+
},
78+
distfonts: {
79+
expand: true,
80+
cwd: "fonts/",
81+
src: "**",
82+
dest: "dist/fonts/",
83+
flatten: true,
84+
filter: "isFile"
85+
}
86+
},
87+
88+
connect: {
89+
options: {
90+
port: 8040,
91+
hostname: "localhost",
92+
livereload: 35729
93+
94+
},
95+
livereload: {
96+
options: {
97+
open: true,
98+
base: "."
99+
}
100+
},
101+
test: {
102+
options: {
103+
port: 8041,
104+
open: "http://localhost:8041/_SpecRunner.html",
105+
base: "."
106+
}
107+
}
108+
},
109+
110+
jasmine: {
111+
scripts: "scripts/**/*.js",
112+
options: {
113+
build: true,
114+
specs: "test/*Spec.js",
115+
helpers: "test/*Helper.js",
116+
vendor: [
117+
"https://code.jquery.com/jquery-1.10.2.min.js",
118+
"https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"
119+
]
120+
}
121+
},
122+
123+
jshint: {
124+
options: {
125+
jshintrc: ".jshintrc",
126+
reporter: require("jshint-stylish")
127+
},
128+
all: [
129+
"Gruntfile.js",
130+
"scripts/**/*.js",
131+
"template/**/*.js",
132+
"!template/**/*.min.js"
133+
],
134+
test: {
135+
options: {
136+
jshintrc: "test/.jshintrc",
137+
src: ["test/**/*.js"]
138+
}
139+
}
140+
},
141+
142+
watch: {
143+
js: {
144+
files: ["Gruntfile.js", "scripts/**/*.js", "template/**/*.js"],
145+
tasks: ["newer:jshint:all"]
146+
},
147+
jsTest: {
148+
files: ["test/**/*.js"],
149+
tasks: ["newer:jshint:test", "jasmine"]
150+
},
151+
less: {
152+
files:["less/**/*.less"],
153+
tasks: ["default"]
154+
},
155+
sass: {
156+
files: ["sass/**/*.scss", "sass/**/*.sass"],
157+
tasks: ["scss"]
158+
},
159+
livereload: {
160+
options: {
161+
livereload: "<%= connect.options.livereload %>"
162+
},
163+
files: [
164+
"index.html",
165+
"dist/css/**/*.css",
166+
"**/*.{png,jpg,jpeg,gif,webp,svg}"
167+
]
168+
}
169+
}
170+
171+
});
172+
173+
grunt.registerTask("default", ["less", "autoprefixer", "cssmin", "uglify", "copy"]);
174+
175+
grunt.registerTask("scss", ["sass", "autoprefixer", "cssmin", "uglify", "copy"]);
176+
177+
grunt.registerTask("build", function(target) {
178+
var buildType = "default";
179+
if (target && target === "scss") {
180+
buildType = "scss";
181+
}
182+
183+
grunt.task.run(["newer:jshint", "jasmine:scripts", buildType]);
184+
});
185+
186+
grunt.registerTask("test", [
187+
"jasmine:scripts:build",
188+
"connect:test:keepalive"
189+
]);
190+
191+
grunt.registerTask("serve", function(target){
192+
var buildTarget = "default";
193+
if(target && target === "scss") {
194+
buildTarget = "scss";
195+
}
196+
grunt.task.run([
197+
"build:"+ buildTarget,
198+
"connect:livereload",
199+
"watch"
200+
]);
201+
});
202+
203+
grunt.registerTask("cibuild",["newer:jshint", "jasmine:scripts"]);
204+
};

‎bower.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,22 @@
66
"Federico Zivolo <info@mywebexpression.com>"
77
],
88
"description": "Material Design theme for Bootstrap 3",
9-
"main": "css-compiled/material.css",
9+
"main": [
10+
"dist/css/material.css",
11+
"dist/js/material.js"
12+
],
13+
"ignore": [
14+
"test",
15+
"screenshots",
16+
"demo",
17+
".editorconfig",
18+
".gitignore",
19+
".jshintrc",
20+
".travis.yml",
21+
"CONTRIBUTING.md",
22+
"Gruntfile.json",
23+
"index.html"
24+
],
1025
"keywords": [
1126
"material",
1227
"design",

‎compile.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎css-compiled/material-wfont.min.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎css-compiled/material.min.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)