FezVrasta
98f86feb4f
Merge remote-tracking branch 'origin/develop'
...
Conflicts:
dist/css/material-wfont.min.css
dist/css/material.min.css
template/material/css/material-wfont.min.css
template/material/css/material.min.css
2014-10-06 09:52:19 +02:00
FezVrasta
0e1e46abda
fix #88
2014-10-06 09:50:09 +02:00
Fez Vrasta
91ee36ec0f
Merge pull request #91 from icyflame/patch-2
...
Added links and fixed grammar
2014-10-06 09:31:58 +02:00
Siddharth Kannan
48a202283e
Added links and fixed grammar
...
Added link to the Google Material Design Guideline document.
Fixed the Grammar of the first few lines in the README.md file.
2014-10-06 12:50:25 +05:30
FezVrasta
cc408f951b
grunt less
2014-10-06 09:11:51 +02:00
Fez Vrasta
9534338b59
Merge pull request #86 from pmarti/master
...
Use roboto condensed, not roboto
2014-10-06 09:05:02 +02:00
Fez Vrasta
a720200ab4
Merge pull request #89 from dandv/patch-2
...
Fix *all* typos and improve the English description
2014-10-06 09:03:24 +02:00
Dan Dascalescu
abf6929984
Fix *all* typos and improve the English description
2014-10-05 21:12:05 -07:00
Pablo Marti
919cb6ccab
Use roboto condensed, not roboto
...
We're @import'ing Roboto Condensed but using plain Roboto
in our font-face declarations.
2014-10-06 09:57:00 +07:00
Nelson Omuto
2dfda6e6ba
Merge remote-tracking branch 'upstream/master'
2014-10-05 17:29:13 -04:00
Nelson Omuto
ce05c8d985
jshint double-quotes error
2014-10-05 17:27:50 -04:00
FezVrasta
926f89ef22
new checkbox style, fix #53 TODO: fix ripple
2014-10-05 17:37:10 +02:00
FezVrasta
a2f7afb8be
fixed version
2014-10-05 12:13:46 +02:00
shockwork
d3fa14516c
Merge branch 'develop'
2014-10-05 11:30:45 +02:00
shockwork
3b14c47d5e
Merge branch 'develop' of https://github.com/FezVrasta/bootstrap-material-design into develop
2014-10-05 11:28:22 +02:00
shockwork
e5aa3da98e
jshint no longer checks *.min.js, pre master merge
2014-10-05 11:26:50 +02:00
FezVrasta
8c8b620e39
added ignore files list
2014-10-05 11:22:39 +02:00
FezVrasta
bb96ae26f0
added multiple main files
2014-10-05 11:13:09 +02:00
FezVrasta
ceff715ff0
support for editorconfig
2014-10-05 10:20:47 +02:00
FezVrasta
dc1cecdb23
refactor of example template to reflect dist changes
2014-10-05 09:41:29 +02:00
FezVrasta
5eafbe1a70
refactor of the dist files
2014-10-05 09:32:48 +02:00
FezVrasta
004d5ad20a
fixed quotes
2014-10-05 09:00:13 +02:00
FezVrasta
30d93841c8
fixed quotes
2014-10-05 08:57:23 +02:00
FezVrasta
04168b27a5
Merge remote-tracking branch 'nelsonomuto/master' into develop
2014-10-05 08:55:39 +02:00
Nelson Omuto
6c24c30222
fixes #81 : integrating with Travis CI
2014-10-04 20:16:13 -04:00
shockwork
340822aea3
.. node-sass compatibility fixed (semi-colons)
2014-10-04 12:32:51 +02:00
Fez Vrasta
01b59baf99
Merge pull request #82 from FezVrasta/develop
...
fix #76
2014-10-04 09:06:49 +02:00
FezVrasta
9f0dd45d84
fix #76
2014-10-04 08:43:25 +02:00
Nelson Omuto
9de6322bf1
fixed livereload, using default 35729 port
2014-10-03 16:58:06 -04:00
Nelson Omuto
5249da3197
reverted jshint rules, cleaned up source where it was failing. updating build process errors. TODO: fix livereload
2014-10-03 16:46:56 -04:00
Nelson Omuto
5d3d2fd307
fixing jshint issues, modifying to allow for some not too strict jshint rules, adding grunt newer dependency.
2014-10-03 16:13:48 -04:00
Nelson Omuto
0f78f2894e
adding specrunner and its build config for testing in browser
2014-10-03 15:46:35 -04:00
Nelson Omuto
6eaa0295bd
adding unit testing hooks, connect server, jshint, watch tasks and livereload
2014-10-03 15:15:31 -04:00
Nelson Omuto
f92f3e6ee8
capitalizing gruntfile.js filename
2014-10-03 11:16:33 -04:00
Nelson Omuto
59a32cad83
updating grunt with load grunt tasks
2014-10-03 11:13:28 -04:00
Fez Vrasta
696fb505b2
Merge pull request #72 from FezVrasta/develop
...
added nice banner
2014-10-03 15:52:35 +02:00
FezVrasta
2c331640cb
added nice banner
2014-10-03 15:52:14 +02:00
FezVrasta
3d259ddc6a
added support for selectize.js
2014-10-03 15:15:42 +02:00
FezVrasta
f397af8796
refactor to follow the way SASS is organized
2014-10-03 15:00:58 +02:00
shockwork
2f3fcd2a00
Merge branch 'master' of https://github.com/FezVrasta/bootstrap-material-design
2014-10-03 14:01:02 +02:00
shockwork
ad179a2777
add sass fork
2014-10-03 13:58:24 +02:00
FezVrasta
242824c211
added memo
2014-10-03 13:06:04 +02:00
FezVrasta
c6d4694ae5
fix ripples detection
2014-10-03 13:03:59 +02:00
shockwork
40f91258e3
.. run grunt
2014-10-03 12:54:47 +02:00
FezVrasta
1fb48cdfa9
Merge remote-tracking branch 'origin/master'
2014-10-03 11:52:35 +02:00
FezVrasta
98f64972eb
pkg.json
2014-10-03 11:52:23 +02:00
Fez Vrasta
c80a4db87f
Merge pull request #71 from pmarti/master
...
Do not add the ripple effect to all a elements
2014-10-03 11:40:52 +02:00
Pablo Marti
bb2bacd70c
Do not add the ripple effect to all a elements
...
Sometimes we might not want to have some links "rippled" this patch prevents so. Ideally we'd have the possibility of passing our own set of selectors to ripples.init tho
2014-10-03 16:39:46 +07:00
FezVrasta
6c1e29a3fe
fixed images
2014-10-03 11:00:58 +02:00
FezVrasta
a3d0677b8d
moved index to root, @shockwork please do the magic :)
2014-10-03 10:58:37 +02:00