FezVrasta
|
f1782a0af0
|
Merge remote-tracking branch 'origin/master'
|
2014-12-26 19:12:48 +01:00 |
|
FezVrasta
|
ef82b0e804
|
Merge branch 'korgan00#master'
Conflicts:
index.html
|
2014-12-26 18:43:31 +01:00 |
|
FezVrasta
|
9d645a45f8
|
merging material colors
|
2014-12-26 18:42:06 +01:00 |
|
Fez Vrasta
|
e6b9d6c53e
|
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
|
e471237942
|
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
|
7bb5fd95a4
|
explanation added
|
2014-12-19 20:22:11 +01:00 |
|
Korgan
|
5e9a66e29f
|
placeholder working correctly
|
2014-12-19 20:13:22 +01:00 |
|
Korgan
|
a10e9ec6f5
|
commented unnecesary style
|
2014-12-19 20:12:48 +01:00 |
|
Korgan
|
de80e9218e
|
fix and added 'inverse' color
|
2014-12-19 19:33:21 +01:00 |
|
Korgan
|
224eab6110
|
new generic mixin
|
2014-12-19 19:32:44 +01:00 |
|
Korgan
|
fa00e02134
|
added black and white buttons
|
2014-12-19 19:32:20 +01:00 |
|
FezVrasta
|
f568613a85
|
fixed #315
|
2014-12-19 09:28:13 +01:00 |
|
FezVrasta
|
e073377ed7
|
fixed #313
|
2014-12-19 09:04:05 +01:00 |
|
korgan00
|
6d610368ad
|
Merge pull request #2 from FezVrasta/master
asd
|
2014-12-19 00:03:33 +01:00 |
|
FezVrasta
|
cbaeedd3b2
|
fix for #294
|
2014-12-18 13:59:34 +01:00 |
|
FezVrasta
|
49da2a384f
|
improved documentation
|
2014-12-18 12:56:25 +01:00 |
|
FezVrasta
|
cab494bb14
|
implement #304
|
2014-12-18 12:54:59 +01:00 |
|
FezVrasta
|
34806be6f4
|
fix for #258
|
2014-12-18 10:54:36 +01:00 |
|
FezVrasta
|
7237d6debd
|
improved contrib.md
|
2014-12-18 10:05:10 +01:00 |
|
Fez Vrasta
|
8dc072d688
|
added note about license
|
2014-12-18 01:01:59 +01:00 |
|
Fez Vrasta
|
029535821f
|
make license clearer
|
2014-12-18 00:54:07 +01:00 |
|
Fez Vrasta
|
82266e02a8
|
Merge pull request #295 from dandv/patch-3
README bullet list, some English fixes
|
2014-12-16 15:18:42 +01:00 |
|
Dan Dascalescu
|
e3c0d4abf4
|
Bullet list, some English fixes
|
2014-12-16 06:13:40 -08:00 |
|
Fez Vrasta
|
0e9acdf8a5
|
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
|
b6bd06c68e
|
Add automatic $.material.init() + example
|
2014-12-16 03:22:01 -08:00 |
|
FezVrasta
|
1149a6ed6e
|
btn-raised have a subtler shadow
|
2014-12-16 11:13:49 +01:00 |
|
Dan Dascalescu
|
e07961e23d
|
Package versions without (Bootstrap) icons
|
2014-12-15 18:15:57 -08:00 |
|
korgan00
|
ac2d49a6e9
|
Merge pull request #1 from FezVrasta/master
asd
|
2014-12-16 01:30:07 +01:00 |
|
FezVrasta
|
1a92b1c0cd
|
added little howto to customize the color
|
2014-12-15 16:58:57 +01:00 |
|
FezVrasta
|
644c6e4b90
|
fixed #290
|
2014-12-15 16:55:39 +01:00 |
|
Fez Vrasta
|
cbd5a33558
|
Merge pull request #291 from MeteorPackaging/meteor-integration
Meteor integration and README improvements
|
2014-12-15 16:42:34 +01:00 |
|
Dan Dascalescu
|
eacf17b018
|
Meteor integration and README improvements
|
2014-12-15 07:18:42 -08:00 |
|
FezVrasta
|
d15cf4c1fb
|
Merge remote-tracking branch 'origin/master'
|
2014-12-13 12:40:20 +01:00 |
|
FezVrasta
|
f02d8385b8
|
Added explanation for material color variations
|
2014-12-13 12:40:09 +01:00 |
|
FezVrasta
|
09c7d9cb17
|
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
|
fb512058b2
|
fixed active and disabled elements of navbar
|
2014-12-13 12:32:27 +01:00 |
|
FezVrasta
|
f9c738d19e
|
some improvement on navbars
|
2014-12-13 12:26:25 +01:00 |
|
Fez Vrasta
|
cc2a50071d
|
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
|
cf6b950cd0
|
281 add minified js files
|
2014-12-12 11:59:20 -05:00 |
|
Kyler Berry
|
03436e0901
|
281 added validity check to floating label conditions for number inputs
|
2014-12-12 11:41:16 -05:00 |
|
Fez Vrasta
|
74021fd081
|
Merge pull request #283 from arkeidolon/patch-1
Fix grammar @ input hint
|
2014-12-12 09:30:41 +01:00 |
|
Clarke Benedict Tapay Plumo
|
c74a9459dc
|
Fix grammar @ input hint
|
2014-12-12 11:38:08 +08:00 |
|
FezVrasta
|
e9a256d380
|
ripples are now subtler
|
2014-12-10 20:36:31 +01:00 |
|
FezVrasta
|
810ff90928
|
reduced animation time on demo
|
2014-12-10 20:32:31 +01:00 |
|
Fez Vrasta
|
07516ed95b
|
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
|
66a55c6631
|
Updated iconography header id to avoid collision with typography
|
2014-12-10 08:30:03 -06:00 |
|
Fez Vrasta
|
cb4392f9fd
|
Merge pull request #274 from noradaiko/master
rippleOut on click and touchend
|
2014-12-08 18:02:18 +01:00 |
|
Takuya Matsuyama
|
2813325f8b
|
Remove click event
|
2014-12-08 23:41:25 +09:00 |
|
Takuya Matsuyama
|
71bb68967f
|
rippleOut on click and touchend
|
2014-12-07 06:02:08 +09:00 |
|
Korgan
|
ad997a65cf
|
All colors mixed
|
2014-12-06 02:45:14 +01:00 |
|