Commit Graph

890 Commits

Author SHA1 Message Date
Phuc Nguyen
4a4dc0e16e Fix ripple color 2014-11-07 16:20:17 +07:00
FezVrasta
234a91223b Merge branch 'develop' 2014-11-06 16:23:37 +01:00
FezVrasta
89f815d4f6 Merge remote-tracking branch 'origin/develop' into develop 2014-11-06 16:22:58 +01:00
FezVrasta
86d6ff2bda update 2014-11-06 16:13:13 +01:00
FezVrasta
c75a47d95f more specific selector to avoid problems 2014-11-04 10:51:29 +01:00
FezVrasta
661f20fd7f fixed icons class 2014-11-03 09:02:56 +01:00
FezVrasta
113fb0b8c1 added JSDelivr CDN 2014-10-31 14:37:38 +01:00
FezVrasta
434ac4f08f problems during merging of README 2014-10-31 10:08:16 +01:00
FezVrasta
a5ac576063 added CDN to doc 2014-10-31 10:06:45 +01:00
FezVrasta
ed15ec63ec Merge branch 'develop'
Conflicts:
	README.md
	bower.json
	dist/css/material-wfont.css
	dist/css/material.css
	dist/js/material.js
	dist/js/material.min.js
	dist/js/ripples.js
	package.json
	sass/_animations.scss
2014-10-31 09:59:31 +01:00
FezVrasta
1cf1ac2543 fix #125 2014-10-31 09:55:14 +01:00
FezVrasta
17bd065187 fixes #142 2014-10-31 09:40:37 +01:00
FezVrasta
870d3f8b34 should fix #98 2014-10-31 09:27:36 +01:00
FezVrasta
f4edecb3b0 removed references of the old less compiler 2014-10-31 09:27:35 +01:00
FezVrasta
665db40729 reorganized structure 2014-10-31 09:27:35 +01:00
FezVrasta
12141dbcd9 remove unused files 2014-10-31 09:26:54 +01:00
Fez Vrasta
b2338a4e9e Merge pull request #172 from rougin/develop
Removed "margin-top: 13px" to properly align "navbar-toggle" with "navbar-brand"
2014-10-31 09:01:04 +01:00
Rougin Gutib
93a4221c5e Removed "margin-top: 13px" to properly align "navbar-toggle" with "navbar-brand" 2014-10-31 13:47:20 +08:00
Fez Vrasta
67c5c9eed6 Merge pull request #170 from perminder-klair/develop
Update bower.json
2014-10-30 18:30:31 +01:00
Parminder Klair
8a2075f05b Update bower.json
fixed bower.json
2014-10-30 15:35:17 +00:00
FezVrasta
3c7ea66c87 fix for #135 2014-10-30 10:03:10 +01:00
FezVrasta
2c611fc9c9 fix for #64 2014-10-30 09:54:50 +01:00
FezVrasta
66404a204e fix for #127 2014-10-30 09:49:56 +01:00
Fez Vrasta
8d4bfee0f0 Merge pull request #163 from miguelfrde/fix-typo-readme
Fix typo in README.md
2014-10-30 09:40:22 +01:00
FezVrasta
e6a9368a90 fixed checkbox ripple 2014-10-30 09:34:53 +01:00
FezVrasta
445a19575a changed default color for inputs 2014-10-30 09:23:54 +01:00
FezVrasta
fd5a26d54e grunt 2014-10-30 08:59:43 +01:00
Fez Vrasta
ffe78ee34f Merge pull request #159 from npvn/develop
Fix: Floating label is not floated on paste event
2014-10-30 08:56:10 +01:00
Miguel Flores Ruiz de Eguino
5c94a08672 Fix typo in README.md 2014-10-29 19:59:15 +01:00
FezVrasta
ed1e315fc8 version 2014-10-29 16:24:33 +01:00
FezVrasta
8b1c86070c js fix and rename of css to scss 2014-10-29 16:24:32 +01:00
FezVrasta
9391cce89e fixed #148 2014-10-29 16:24:31 +01:00
FezVrasta
a0d499971e fixed readme 2014-10-29 16:24:31 +01:00
FezVrasta
93a264a74e removed duplicated files, move test.html to dist dir, improved workflow 2014-10-29 16:24:29 +01:00
FezVrasta
92abb3d303 removed duplicates and optimized workflow 2014-10-29 16:24:28 +01:00
FezVrasta
183d21ccb3 version 2014-10-29 16:22:42 +01:00
FezVrasta
3656966750 js fix and rename of css to scss 2014-10-29 16:20:53 +01:00
Phuc Nguyen
85481decf0 Add files generated by Grunt 2014-10-29 19:28:56 +07:00
Phuc Nguyen
fc13cdb91d Fix: Floating label is not floated on paste event 2014-10-29 17:26:13 +07:00
Fez Vrasta
ef702e3970 Merge pull request #158 from studio3104/filenamemismatch
fixed the change of wrong extension
2014-10-28 20:14:14 +01:00
studio3104
b50c8adc4d fixed the change of wrong extension 2014-10-29 03:48:17 +09:00
FezVrasta
1cfbb247e9 fixed #148 2014-10-28 14:54:46 +01:00
FezVrasta
2857bf3056 fixed readme 2014-10-28 12:39:33 +01:00
FezVrasta
e8b2d8669d removed duplicated files, move test.html to dist dir, improved workflow 2014-10-28 12:17:14 +01:00
FezVrasta
35112a4522 removed duplicates and optimized workflow 2014-10-28 12:12:48 +01:00
FezVrasta
8c40b4cb2f 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
1e4921223a updated version 2014-10-28 11:43:37 +01:00
FezVrasta
93e8a87722 fix selectize 2014-10-28 11:34:39 +01:00
FezVrasta
1a48ab7650 fix #134 2014-10-28 10:21:00 +01:00
FezVrasta
b38df236fa fix for #139 2014-10-28 10:16:47 +01:00