Commit Graph

491 Commits

Author SHA1 Message Date
Ian Serlin
f955393f13 allows .btn* classes to be specified in any order and still receive proper hover state colors 2015-01-02 15:04:01 -08:00
FezVrasta
fcd35da52b full color palette + ripples.js (WIP) 2014-12-29 14:33:55 +01:00
Fez Vrasta
c03c4ddf56 Merge pull request #331 from grvcoelho/patch-2
Fix ripples.js to allow multiple elements using ripples
2014-12-29 13:43:33 +01:00
Guilherme Rv Coelho
8160bd63e7 Update ripples.js to allow multiple elements using ripples
There was a problem with the last update when two or more elements of the page used the ripple effect. This is fixed with this commit.
2014-12-29 10:30:53 -02:00
Fez Vrasta
e88262858a Merge pull request #330 from grvcoelho/patch-1
Fix #327 on ripples.js and improve structure
2014-12-28 17:10:38 +01:00
Guilherme Rv Coelho
789d3517db Update ripples.js to pass travis validation 2014-12-28 13:52:06 -02:00
Guilherme Rv Coelho
27d1a7a8e5 Update ripples.js to double quotes 2014-12-28 13:36:55 -02:00
FezVrasta
bb77e97ec7 Merge remote-tracking branch 'origin/master' 2014-12-28 15:47:15 +01:00
Guilherme Rv Coelho
0de9d60e30 Fix #327 on ripples.js and improve structure
I've fixed #327 and I also passed the plugin to a jQuery Boilerplate structure. I only made changes on the structure and not in the functions themselves, so the  code could be a little bit neater, cleaner and intuitive.

Now the plugin can be accessed alone, by doing: 
```javascript
$(selector).ripples();
```

Note: I've removed the default elements targeted by the plugin, for IMHO I think that should be in the initialization, and not in the plugin itself.
2014-12-28 12:41:17 -02:00
FezVrasta
1fcca23ec5 bower badge added 2014-12-28 15:39:03 +01:00
Fez Vrasta
60cfbbd6d6 Merge pull request #326 from edlau/master
Fixed a couple bugs in LESS scripts
2014-12-27 10:00:07 +01:00
Edmond Lau
5211de142a the default button doesn't get the right font color 2014-12-26 18:00:36 -05:00
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