diff --git a/material/material.js b/material/material.js index d87aad27..d09ca230 100644 --- a/material/material.js +++ b/material/material.js @@ -5,7 +5,7 @@ $(function (){ var withRipple = ".btn:not('.btn-link'), .navbar a, .nav-tabs a"; // Add ripple elements to material buttons - $(withRipple).append(""); + $(withRipple).append("
"); // Add fake-checkbox to material checkboxes $(".checkbox label input").after(""); @@ -14,7 +14,7 @@ $(function (){ $(".radio label input").after(""); // Add elements for material inputs - $("input.form-control, textarea.form-control").each( function() { + $("input.form-control, textarea.form-control, select.form-control").each( function() { $(this).wrap("
"); $(this).after(""); if ($(this).hasClass("floating-label")) { @@ -52,11 +52,17 @@ $(function (){ var relY = e.pageY - parentOffset.top; // Move ripple to the click position - $ripple.attr({"cy":relY, "cx": relX}); + $ripple.attr({"style": "top: " + relY + "px; left:" + relX + "px"}); // Start the animation $rippleWrapper.attr("class", "ripple-wrapper").data("animating", true); - $ripple.attr("class", "ripple ripple-on").css("transform", "scale(" + $rippleWrapper.width() / 20 + ")"); + var scaleVal = "scale(" + Math.round($rippleWrapper.width() / 10) + ")"; + $ripple.attr("class", "ripple ripple-on").css({ + "-ms-transform": scaleVal, + "-moz-transform": scaleVal, + "-webkit-transform": scaleVal, + "transform": scaleVal + }); setTimeout(function() { $rippleWrapper.attr("class", "ripple-wrapper").data("animating", false).trigger("rippleEnd"); }, 500);