Merge remote-tracking branch 'origin/master'

FezVrasta · FezVrasta · commit b155b255558e · 2014-10-03T11:52:35.000+02:00
diff --git a/scripts/material.js b/scripts/material.js
@@ -3,7 +3,7 @@
 $(function (){
 
     if (ripples) {
-        ripples.init(".btn:not(.btn-link), .navbar a, .nav-tabs a, .withripple");
+        ripples.init(".btn:not(.btn-link), .navbar a:not(.withoutripple), .nav-tabs a:not(.withoutripple), .withripple");
     }
 
     var initInputs = function() {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`$(function (){`
`4`	`4`
`5`	`5`	`if (ripples) {`
`6`		`- ripples.init(".btn:not(.btn-link), .navbar a, .nav-tabs a, .withripple");`
	`6`	`+ ripples.init(".btn:not(.btn-link), .navbar a:not(.withoutripple), .nav-tabs a:not(.withoutripple), .withripple");`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`var initInputs = function() {`