Commit Graph

589 Commits

Author SHA1 Message Date
FezVrasta
bcf137386a Merge branch 'develop' 2014-11-06 16:23:37 +01:00
FezVrasta
c4beecc15e Merge remote-tracking branch 'origin/develop' into develop 2014-11-06 16:22:58 +01:00
FezVrasta
6785aa230d update 2014-11-06 16:13:13 +01:00
FezVrasta
1af15a721d more specific selector to avoid problems 2014-11-04 10:51:29 +01:00
FezVrasta
076fcd8196 fixed icons class 2014-11-03 09:02:56 +01:00
FezVrasta
4a559ec1f7 added JSDelivr CDN 2014-10-31 14:37:38 +01:00
FezVrasta
5bf5356fa4 problems during merging of README 2014-10-31 10:08:16 +01:00
FezVrasta
59db844318 added CDN to doc 2014-10-31 10:06:45 +01:00
FezVrasta
0c6f8f3e9d 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
9299bda187 fix #125 2014-10-31 09:55:14 +01:00
FezVrasta
fe27e7e67a fixes #142 2014-10-31 09:40:37 +01:00
FezVrasta
43a9f4f4b4 should fix #98 2014-10-31 09:27:36 +01:00
FezVrasta
d6c73f5c68 removed references of the old less compiler 2014-10-31 09:27:35 +01:00
FezVrasta
9e65d2577b reorganized structure 2014-10-31 09:27:35 +01:00
FezVrasta
931d61f248 remove unused files 2014-10-31 09:26:54 +01:00
Fez Vrasta
b7d3dd4320 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
57b9a8cb74 Removed "margin-top: 13px" to properly align "navbar-toggle" with "navbar-brand" 2014-10-31 13:47:20 +08:00
Fez Vrasta
9c78fa0b89 Merge pull request #170 from perminder-klair/develop
Update bower.json
2014-10-30 18:30:31 +01:00
Parminder Klair
06ddc442bf Update bower.json
fixed bower.json
2014-10-30 15:35:17 +00:00
FezVrasta
bc5b862c04 fix for #135 2014-10-30 10:03:10 +01:00
FezVrasta
1d180d63c4 fix for #64 2014-10-30 09:54:50 +01:00
FezVrasta
6e4bb11198 fix for #127 2014-10-30 09:49:56 +01:00
Fez Vrasta
add9b8ebc9 Merge pull request #163 from miguelfrde/fix-typo-readme
Fix typo in README.md
2014-10-30 09:40:22 +01:00
FezVrasta
c127e50fd2 fixed checkbox ripple 2014-10-30 09:34:53 +01:00
FezVrasta
1af660e5d3 changed default color for inputs 2014-10-30 09:23:54 +01:00
FezVrasta
d8d9a48762 grunt 2014-10-30 08:59:43 +01:00
Fez Vrasta
ce5ade2395 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
cd21b91b25 Fix typo in README.md 2014-10-29 19:59:15 +01:00
FezVrasta
18b538aed3 version 2014-10-29 16:24:33 +01:00
FezVrasta
be7f4905cd js fix and rename of css to scss 2014-10-29 16:24:32 +01:00
FezVrasta
ec8f5c68b3 fixed #148 2014-10-29 16:24:31 +01:00
FezVrasta
b7b6bf11ee fixed readme 2014-10-29 16:24:31 +01:00
FezVrasta
c8bdedc05f removed duplicated files, move test.html to dist dir, improved workflow 2014-10-29 16:24:29 +01:00
FezVrasta
041e6135da removed duplicates and optimized workflow 2014-10-29 16:24:28 +01:00
FezVrasta
25f1dc2cae version 2014-10-29 16:22:42 +01:00
FezVrasta
baed28f685 js fix and rename of css to scss 2014-10-29 16:20:53 +01:00
Phuc Nguyen
f56593e03f Add files generated by Grunt 2014-10-29 19:28:56 +07:00
Phuc Nguyen
3777cbb45e Fix: Floating label is not floated on paste event 2014-10-29 17:26:13 +07:00
Fez Vrasta
83951921ba Merge pull request #158 from studio3104/filenamemismatch
fixed the change of wrong extension
2014-10-28 20:14:14 +01:00
studio3104
c2ef56815a fixed the change of wrong extension 2014-10-29 03:48:17 +09:00
FezVrasta
1a0a22b41c fixed #148 2014-10-28 14:54:46 +01:00
FezVrasta
dabe81ff65 fixed readme 2014-10-28 12:39:33 +01:00
FezVrasta
855c6452c6 removed duplicated files, move test.html to dist dir, improved workflow 2014-10-28 12:17:14 +01:00
FezVrasta
4454107746 removed duplicates and optimized workflow 2014-10-28 12:12:48 +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
bde4c22659 updated version 2014-10-28 11:43:37 +01:00
FezVrasta
f7426bc2bd fix selectize 2014-10-28 11:34:39 +01:00
FezVrasta
a1d00bb35a fix #134 2014-10-28 10:21:00 +01:00
FezVrasta
2183188d1e fix for #139 2014-10-28 10:16:47 +01:00
FezVrasta
cdf9ebdb18 fix #140 2014-10-28 10:12:49 +01:00