Commit Graph

21 Commits

Author SHA1 Message Date
FezVrasta
c4beecc15e Merge remote-tracking branch 'origin/develop' into develop 2014-11-06 16:22:58 +01:00
FezVrasta
076fcd8196 fixed icons class 2014-11-03 09:02:56 +01:00
FezVrasta
f345dabacf Merge branch 'develop'
Conflicts:
	Gruntfile.js
	dist/js/material.min.js
	dist/js/ripples.min.js
	less/_buttons.less
	template/material/js/material.min.js
	template/material/js/ripples.min.js
2014-10-28 11:45:38 +01:00
FezVrasta
c26d5e3ce1 refactor of Material.js 2014-10-18 18:12:02 +02:00
FezVrasta
a41c20067b Merge branch 'develop' 2014-10-18 15:36:07 +02:00
FezVrasta
09e9532404 updates to index 2014-10-18 15:32:30 +02:00
FezVrasta
dbbf4e7bd2 Merge remote-tracking branch 'origin/master'
Conflicts:
	bower.json
	package.json
2014-10-18 15:20:14 +02:00
FezVrasta
073f830246 old icons replaced with official ones, NO BACKWARD COMPATIBILITY! 2014-10-18 15:14:24 +02:00
FezVrasta
3a92b3b471 Merge branch 'develop'
Conflicts:
	dist/css/material-wfont.css
	dist/css/material-wfont.min.css
	dist/css/material.css
	dist/css/material.min.css
	less/material.less
	template/material/css/material-wfont.css
	template/material/css/material-wfont.min.css
	template/material/css/material.css
	template/material/css/material.min.css
2014-10-17 13:00:13 +02:00
FezVrasta
2a610b1cfe added support for mobile devices to ripples.js 2014-10-13 10:50:34 +02:00
FezVrasta
84c953a1ee organized some icons 2014-10-07 10:06:14 +02:00
FezVrasta
d35be71523 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
2c10288e4b fix #88 2014-10-06 09:50:09 +02:00
Dan Dascalescu
3f96aad020 Fix *all* typos and improve the English description 2014-10-05 21:12:05 -07:00
FezVrasta
41c94a218a refactor of the dist files 2014-10-05 09:32:48 +02:00
FezVrasta
7b8024b808 added memo 2014-10-03 13:06:04 +02:00
FezVrasta
7fc9bd45bf fixed images 2014-10-03 11:00:58 +02:00
FezVrasta
a15bd3115d moved index to root, @shockwork please do the magic :) 2014-10-03 10:58:37 +02:00
Federico Zivolo
724dacbcf5 First version of snackbarjs. 2014-08-20 17:00:55 +02:00
Federico Zivolo
11a4609992 Continued work, added support for material colors 2014-08-20 12:53:26 +02:00
Federico Zivolo
76c70d2a2e Initial upload. 2014-08-18 16:25:33 +02:00