Commit Graph

1479 Commits

Author SHA1 Message Date
Edmond Lau
a289ee8147 fixed a bracket typo bug in _buttons 2014-12-26 18:00:18 -05:00
FezVrasta
379ea620f3 Merge remote-tracking branch 'origin/master' 2014-12-26 19:12:48 +01:00
FezVrasta
cc1a0b67cd Merge branch 'korgan00#master'
Conflicts:
	index.html
2014-12-26 18:43:31 +01:00
FezVrasta
0095f43c22 merging material colors 2014-12-26 18:42:06 +01:00
Fez Vrasta
5456e0fc32 Merge pull request #324 from phoeagon/master
Floating Action Button should float higher than Raised Button
2014-12-26 08:58:22 +01:00
phoeagon
0e2aa4b823 Floating Action Button should float higher than Raised Button (See http://www.google.com/design/spec/what-is-material/objects-in-3d-space.html#objects-in-3d-space-elevation) 2014-12-26 13:03:07 +08:00
Korgan
9b605fee49 explanation added 2014-12-19 20:22:11 +01:00
Korgan
e5c656d694 placeholder working correctly 2014-12-19 20:13:22 +01:00
Korgan
ca75470ecf commented unnecesary style 2014-12-19 20:12:48 +01:00
Korgan
32490815e6 fix and added 'inverse' color 2014-12-19 19:33:21 +01:00
Korgan
52dbc8d1f6 new generic mixin 2014-12-19 19:32:44 +01:00
Korgan
a9a9e8d9f2 added black and white buttons 2014-12-19 19:32:20 +01:00
FezVrasta
075149d753 fixed #315 2014-12-19 09:28:13 +01:00
FezVrasta
a14f891500 fixed #313 2014-12-19 09:04:05 +01:00
korgan00
f999c637b6 Merge pull request #2 from FezVrasta/master
asd
2014-12-19 00:03:33 +01:00
FezVrasta
595a08ae66 fix for #294 2014-12-18 13:59:34 +01:00
FezVrasta
ec6619b7b7 improved documentation 2014-12-18 12:56:25 +01:00
FezVrasta
5964b440d0 implement #304 2014-12-18 12:54:59 +01:00
FezVrasta
28d37f40ae fix for #258 2014-12-18 10:54:36 +01:00
FezVrasta
6f6c194f68 improved contrib.md 2014-12-18 10:05:10 +01:00
Fez Vrasta
ac912f08f4 added note about license 2014-12-18 01:01:59 +01:00
Fez Vrasta
f3792a26e0 make license clearer 2014-12-18 00:54:07 +01:00
Fez Vrasta
84433cb1e6 Merge pull request #295 from dandv/patch-3
README bullet list, some English fixes
2014-12-16 15:18:42 +01:00
Dan Dascalescu
8354c80ca7 Bullet list, some English fixes 2014-12-16 06:13:40 -08:00
Fez Vrasta
2378e7a831 Merge pull request #293 from MeteorPackaging/meteor-integration
Package versions without Bootstrap glyphicons & without any icons
2014-12-16 12:28:00 +01:00
Dan Dascalescu
9a9017fe90 Add automatic $.material.init() + example 2014-12-16 03:22:01 -08:00
FezVrasta
9d72a971e4 btn-raised have a subtler shadow 2014-12-16 11:13:49 +01:00
Dan Dascalescu
8b21b98994 Package versions without (Bootstrap) icons 2014-12-15 18:15:57 -08:00
korgan00
0b42a25a96 Merge pull request #1 from FezVrasta/master
asd
2014-12-16 01:30:07 +01:00
FezVrasta
e2843bff1c added little howto to customize the color 2014-12-15 16:58:57 +01:00
FezVrasta
3d53bb72c8 fixed #290 2014-12-15 16:55:39 +01:00
Fez Vrasta
f0261562b1 Merge pull request #291 from MeteorPackaging/meteor-integration
Meteor integration and README improvements
2014-12-15 16:42:34 +01:00
Dan Dascalescu
7bab7f9cb8 Meteor integration and README improvements 2014-12-15 07:18:42 -08:00
FezVrasta
f5ee3e25ce Merge remote-tracking branch 'origin/master' 2014-12-13 12:40:20 +01:00
FezVrasta
087720c021 Added explanation for material color variations 2014-12-13 12:40:09 +01:00
FezVrasta
0c12c1fc85 Merge branch 'korgan00#material-colors-implementation'
Conflicts:
	dist/css/ripples.css
	dist/css/ripples.css.map
	dist/css/ripples.min.css
	dist/css/ripples.min.css.map
	less/_colors.less
2014-12-13 12:36:26 +01:00
FezVrasta
381b972f1c fixed active and disabled elements of navbar 2014-12-13 12:32:27 +01:00
FezVrasta
cb2472f5cf some improvement on navbars 2014-12-13 12:26:25 +01:00
Fez Vrasta
c5a1d819f9 Merge pull request #285 from kylerberry/281-Label-Overlays-Input-Number-Input
281 label overlays input number input
2014-12-13 10:12:46 +01:00
Kyler Berry
aac82dcc80 281 add minified js files 2014-12-12 11:59:20 -05:00
Kyler Berry
8a2322530d 281 added validity check to floating label conditions for number inputs 2014-12-12 11:41:16 -05:00
Fez Vrasta
27f8605b66 Merge pull request #283 from arkeidolon/patch-1
Fix grammar @ input hint
2014-12-12 09:30:41 +01:00
Clarke Benedict Tapay Plumo
0eab11043a Fix grammar @ input hint 2014-12-12 11:38:08 +08:00
FezVrasta
7882fddb29 ripples are now subtler 2014-12-10 20:36:31 +01:00
FezVrasta
baedd748db reduced animation time on demo 2014-12-10 20:32:31 +01:00
Fez Vrasta
be837ae226 Merge pull request #278 from thinkt4nk/master
Updated iconography header id to avoid collision with typography
2014-12-10 15:33:02 +01:00
Ryan Bales
3bf03b1077 Updated iconography header id to avoid collision with typography 2014-12-10 08:30:03 -06:00
Fez Vrasta
9f943a1545 Merge pull request #274 from noradaiko/master
rippleOut on click and touchend
2014-12-08 18:02:18 +01:00
Takuya Matsuyama
e6fa76f878 Remove click event 2014-12-08 23:41:25 +09:00
Takuya Matsuyama
238d25244b rippleOut on click and touchend 2014-12-07 06:02:08 +09:00