Skip to content

Commit fc4b8f2

Browse files
author
FezVrasta
committed
Merge remote-tracking branch 'nelsonomuto/master' into develop
2 parents d09279f + 9eedd43 commit fc4b8f2

38 files changed

Lines changed: 674 additions & 3002 deletions

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

‎README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ The syntax to add a Material icon is:
9898

9999
# Plugins
100100

101-
Material Design for Bootstrap comes with styling support for various external scripts. At the moment only two scripts are supported but others will come:
101+
Material Design for Bootstrap comes with styling support for various external scripts:
102102

103103
### SnackbarJS
104104

@@ -114,6 +114,11 @@ At the moment RipplesJS does not have its own repository but it will probably ha
114114
Make cross-browser sliders and get them styled with Material Design thanks to the support provided by this theme.
115115
Read more about [noUiSlider here](http://refreshless.com/nouislider/)
116116

117+
### Selectize.js
118+
119+
Transform select and multi select inputs in advanced text inputs. Material Design for BS provides a fulle replacement of the plugin's CSS, don't include it so.
120+
Read more about [selectize.js](http://brianreavis.github.io/selectize.js/)
121+
117122

118123
# Compatibility
119124

‎css-compiled/material-wfont.css‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,6 +2365,9 @@ fieldset[disabled] .navbar .btn-link:focus {
23652365
.dropdown-menu li a:hover {
23662366
background: rgba(0, 0, 0, 0.08);
23672367
}
2368+
div {
2369+
background-color: white;
2370+
}
23682371
.alert {
23692372
border: 0px;
23702373
border-radius: 0;
@@ -3083,3 +3086,144 @@ fieldset[disabled] .navbar .btn-link:focus {
30833086
.slider-material-lightgrey .noUi-handle {
30843087
border-color: #ececec;
30853088
}
3089+
.selectize-control.single,
3090+
.selectize-control.multi {
3091+
padding: 0;
3092+
}
3093+
.selectize-control.single .selectize-input,
3094+
.selectize-control.multi .selectize-input,
3095+
.selectize-control.single .selectize-input.input-active,
3096+
.selectize-control.multi .selectize-input.input-active {
3097+
cursor: text;
3098+
background: transparent;
3099+
box-shadow: none;
3100+
border: 0;
3101+
padding: 0;
3102+
height: 100%;
3103+
font-size: 14px;
3104+
line-height: 30px;
3105+
}
3106+
.selectize-control.single .selectize-input .has-items,
3107+
.selectize-control.multi .selectize-input .has-items,
3108+
.selectize-control.single .selectize-input.input-active .has-items,
3109+
.selectize-control.multi .selectize-input.input-active .has-items {
3110+
padding: 0;
3111+
}
3112+
.selectize-control.single .selectize-input:after,
3113+
.selectize-control.multi .selectize-input:after,
3114+
.selectize-control.single .selectize-input.input-active:after,
3115+
.selectize-control.multi .selectize-input.input-active:after {
3116+
content: "\e611";
3117+
right: 5px;
3118+
position: absolute;
3119+
font-size: 7px;
3120+
font-family: 'Material-Design';
3121+
speak: none;
3122+
font-style: normal;
3123+
font-weight: normal;
3124+
font-variant: normal;
3125+
text-transform: none;
3126+
line-height: 4;
3127+
-webkit-font-smoothing: antialiased;
3128+
-moz-osx-font-smoothing: grayscale;
3129+
}
3130+
.selectize-control.single .selectize-input input,
3131+
.selectize-control.multi .selectize-input input,
3132+
.selectize-control.single .selectize-input.input-active input,
3133+
.selectize-control.multi .selectize-input.input-active input {
3134+
font-size: 14px;
3135+
outline: 0px;
3136+
border: 0px;
3137+
background: transparent;
3138+
}
3139+
.selectize-control.single .selectize-input.floating-label-fix input,
3140+
.selectize-control.multi .selectize-input.floating-label-fix input,
3141+
.selectize-control.single .selectize-input.input-active.floating-label-fix input,
3142+
.selectize-control.multi .selectize-input.input-active.floating-label-fix input {
3143+
opacity: 0;
3144+
}
3145+
.selectize-control.single .selectize-input > div,
3146+
.selectize-control.multi .selectize-input > div,
3147+
.selectize-control.single .selectize-input.input-active > div,
3148+
.selectize-control.multi .selectize-input.input-active > div,
3149+
.selectize-control.single .selectize-input > .item,
3150+
.selectize-control.multi .selectize-input > .item,
3151+
.selectize-control.single .selectize-input.input-active > .item,
3152+
.selectize-control.multi .selectize-input.input-active > .item {
3153+
display: inline-block;
3154+
margin: 0 8px 3px 0;
3155+
padding: 0;
3156+
background: transparent;
3157+
border: 0;
3158+
}
3159+
.selectize-control.single .selectize-input > div:after,
3160+
.selectize-control.multi .selectize-input > div:after,
3161+
.selectize-control.single .selectize-input.input-active > div:after,
3162+
.selectize-control.multi .selectize-input.input-active > div:after,
3163+
.selectize-control.single .selectize-input > .item:after,
3164+
.selectize-control.multi .selectize-input > .item:after,
3165+
.selectize-control.single .selectize-input.input-active > .item:after,
3166+
.selectize-control.multi .selectize-input.input-active > .item:after {
3167+
content: ",";
3168+
}
3169+
.selectize-control.single .selectize-input > div:last-of-type:after,
3170+
.selectize-control.multi .selectize-input > div:last-of-type:after,
3171+
.selectize-control.single .selectize-input.input-active > div:last-of-type:after,
3172+
.selectize-control.multi .selectize-input.input-active > div:last-of-type:after,
3173+
.selectize-control.single .selectize-input > .item:last-of-type:after,
3174+
.selectize-control.multi .selectize-input > .item:last-of-type:after,
3175+
.selectize-control.single .selectize-input.input-active > .item:last-of-type:after,
3176+
.selectize-control.multi .selectize-input.input-active > .item:last-of-type:after {
3177+
content: "";
3178+
}
3179+
.selectize-control.single .selectize-input > div.active,
3180+
.selectize-control.multi .selectize-input > div.active,
3181+
.selectize-control.single .selectize-input.input-active > div.active,
3182+
.selectize-control.multi .selectize-input.input-active > div.active,
3183+
.selectize-control.single .selectize-input > .item.active,
3184+
.selectize-control.multi .selectize-input > .item.active,
3185+
.selectize-control.single .selectize-input.input-active > .item.active,
3186+
.selectize-control.multi .selectize-input.input-active > .item.active {
3187+
font-weight: bold;
3188+
background: transparent;
3189+
border: 0;
3190+
}
3191+
.selectize-control.single .selectize-dropdown,
3192+
.selectize-control.multi .selectize-dropdown {
3193+
position: absolute;
3194+
z-index: 1000;
3195+
border: 0;
3196+
width: 100% !important;
3197+
left: 0 !important;
3198+
height: auto;
3199+
background-color: #FFF;
3200+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
3201+
border-radius: 2px;
3202+
padding: 0;
3203+
margin-top: 3px;
3204+
}
3205+
.selectize-control.single .selectize-dropdown .active,
3206+
.selectize-control.multi .selectize-dropdown .active {
3207+
background-color: inherit;
3208+
}
3209+
.selectize-control.single .selectize-dropdown .highlight,
3210+
.selectize-control.multi .selectize-dropdown .highlight {
3211+
background-color: #d5d8ff;
3212+
}
3213+
.selectize-control.single .selectize-dropdown .selected,
3214+
.selectize-control.multi .selectize-dropdown .selected,
3215+
.selectize-control.single .selectize-dropdown .selected.active,
3216+
.selectize-control.multi .selectize-dropdown .selected.active {
3217+
background-color: #EEEEEE;
3218+
}
3219+
.selectize-control.single .selectize-dropdown [data-selectable],
3220+
.selectize-control.multi .selectize-dropdown [data-selectable],
3221+
.selectize-control.single .selectize-dropdown .optgroup-header,
3222+
.selectize-control.multi .selectize-dropdown .optgroup-header {
3223+
padding: 10px 20px;
3224+
cursor: pointer;
3225+
}
3226+
.selectize-control.single .dropdown-active ~ .selectize-dropdown,
3227+
.selectize-control.multi .dropdown-active ~ .selectize-dropdown {
3228+
display: block;
3229+
}

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)