material-sass 0.0.3 → 0.0.4

data/app/assets/javascripts/material/menu.js

@@ -1,25 +1,8 @@
-// menu backdrop
-	if ((($('html').hasClass('touch') && $('.menu').length) || $('.nav-drawer').length) && !$('.menu-backdrop').length) {
-		$('body').append('<div class="menu-backdrop"></div>');
-	};
-
-	var menuBD = document.getElementsByClassName('menu-backdrop')[0];
-
-	if (menuBD !== undefined) {
-		var menuBDTap = new Hammer(menuBD);
-
-		menuBDTap.on('tap', function(e) {
-			if ($('.menu.open').length) {
-				mReset();
-			};
-		});
-	};
-
 // menu close
-	$(document).on('click', function(e) {
+	$(document).on('click touchend', function(e) {
 		var $target = $(e.target);
 
-		if ($('.menu.open').length && !$target.is('.fbtn-container *, .menu *')) {
+		if ($('.menu.open').length && !$target.is('.fbtn-container *, .menu-scroll *')) {
 			mReset();
 		};
 	});
@@ -27,25 +10,20 @@
 	mReset = function () {
 		var $bd = $('body');
 
-		if ($bd.hasClass('menu-open')) {
-			$bd.removeClass('menu-open');
-		};
-
 		if ($bd.hasClass('nav-drawer-open')) {
 			$bd.removeClass('nav-drawer-open');
 		};
 
-		$('.menu-toggle').closest('.active').removeClass('active');
-
-		if ($('.menu.open .menu-search-focus').length) {
-			$('.menu.open .menu-search-focus').blur();
-		};
+    if ($bd.hasClass('menu-open')) {
+      $bd.removeClass('menu-open');
+    };
 
+		$('[data-toggle="menu"]').closest('.active').removeClass('active');
 		$('.menu.open').removeClass('open');
 	}
 
 // menu open
-	$(document).on('click', '.menu-toggle', function(e) {
+	$(document).on('click', '[data-toggle="menu"]', function(e) {
 		e.preventDefault();
 		e.stopPropagation();
 
@@ -60,15 +38,13 @@
 
 			if ($thisMenu.hasClass('nav-drawer')) {
 				$('body').addClass('nav-drawer-open');
-			} else {
-				$('body').addClass('menu-open');
 			}
 
+      if ($thisMenu.hasClass('nav-menu')) {
+        $('body').addClass('menu-open');
+      }
+
 			$thisLi.addClass('active');
 			$thisMenu.addClass('open');
-
-			if ($('.menu-search-focus', $thisMenu).length) {
-				$('.menu-search-focus', $thisMenu).focus();
-			};
 		}
 	});

data/app/assets/javascripts/material/wave.js

@@ -1,13 +1,10 @@
-// waves v0.6.5
-// http://fian.my.id/Waves
-	!function(a,b){"use strict";"function"==typeof define&&define.amd?define([],function(){return b.apply(a)}):"object"==typeof exports?module.exports=b.call(a):a.Waves=b.call(a)}("object"==typeof global?global:this,function(){"use strict";function a(a){return null!==a&&a===a.window}function b(b){return a(b)?b:9===b.nodeType&&b.defaultView}function c(a){var c,d,e={top:0,left:0},f=a&&a.ownerDocument;return c=f.documentElement,"undefined"!=typeof a.getBoundingClientRect&&(e=a.getBoundingClientRect()),d=b(f),{top:e.top+d.pageYOffset-c.clientTop,left:e.left+d.pageXOffset-c.clientLeft}}function d(a){var b="";for(var c in a)a.hasOwnProperty(c)&&(b+=c+":"+a[c]+";");return b}function e(a){if(j.allowEvent(a)===!1)return null;for(var b=null,c=a.target||a.srcElement;null!==c.parentElement;){if(!(c instanceof SVGElement||-1===c.className.indexOf("waves-effect"))){b=c;break}if(c.classList.contains("waves-effect")){b=c;break}c=c.parentElement}return b}function f(a){var b=e(a);null!==b&&(i.show(a,b),"ontouchstart"in window&&(b.addEventListener("touchend",i.hide,!1),b.addEventListener("touchcancel",i.hide,!1)),b.addEventListener("mouseup",i.hide,!1),b.addEventListener("mouseleave",i.hide,!1))}var g=g||{},h=document.querySelectorAll.bind(document),i={duration:750,show:function(a,b){if(2===a.button)return!1;var e=b||this,f=document.createElement("div");f.className="waves-ripple",e.appendChild(f);var g=c(e),h=a.pageY-g.top,j=a.pageX-g.left,k="scale("+e.clientWidth/100*3+")";"touches"in a&&(h=a.touches[0].pageY-g.top,j=a.touches[0].pageX-g.left),f.setAttribute("data-hold",Date.now()),f.setAttribute("data-scale",k),f.setAttribute("data-x",j),f.setAttribute("data-y",h);var l={top:h+"px",left:j+"px"};f.className=f.className+" waves-notransition",f.setAttribute("style",d(l)),f.className=f.className.replace("waves-notransition",""),l["-webkit-transform"]=k,l["-moz-transform"]=k,l["-ms-transform"]=k,l["-o-transform"]=k,l.transform=k,l.opacity="1",l["-webkit-transition-duration"]=i.duration+"ms",l["-moz-transition-duration"]=i.duration+"ms",l["-o-transition-duration"]=i.duration+"ms",l["transition-duration"]=i.duration+"ms",f.setAttribute("style",d(l))},hide:function(a){j.touchup(a);var b=this,c=(1.4*b.clientWidth,null),e=b.getElementsByClassName("waves-ripple");if(!(e.length>0))return!1;c=e[e.length-1];var f=c.getAttribute("data-x"),g=c.getAttribute("data-y"),h=c.getAttribute("data-scale"),k=Date.now()-Number(c.getAttribute("data-hold")),l=350-k;0>l&&(l=0),setTimeout(function(){var a={top:g+"px",left:f+"px",opacity:"0","-webkit-transition-duration":i.duration+"ms","-moz-transition-duration":i.duration+"ms","-o-transition-duration":i.duration+"ms","transition-duration":i.duration+"ms","-webkit-transform":h,"-moz-transform":h,"-ms-transform":h,"-o-transform":h,transform:h};c.setAttribute("style",d(a)),setTimeout(function(){try{b.removeChild(c)}catch(a){return!1}},i.duration)},l)},wrapInput:function(a){for(var b=0;b<a.length;b++){var c=a[b];if("input"===c.tagName.toLowerCase()){var d=c.parentNode;if("i"===d.tagName.toLowerCase()&&-1!==d.className.indexOf("waves-effect"))continue;var e=document.createElement("i");e.className=c.className+" waves-input-wrapper";var f=c.getAttribute("style");f||(f=""),e.setAttribute("style",f),c.className="waves-button-input",c.removeAttribute("style"),d.replaceChild(e,c),e.appendChild(c)}}}},j={touches:0,allowEvent:function(a){var b=!0;return"touchstart"===a.type?j.touches+=1:"touchend"===a.type||"touchcancel"===a.type?setTimeout(function(){j.touches>0&&(j.touches-=1)},500):"mousedown"===a.type&&j.touches>0&&(b=!1),b},touchup:function(a){j.allowEvent(a)}};return g.displayEffect=function(a){a=a||{},"duration"in a&&(i.duration=a.duration),i.wrapInput(h(".waves-effect")),"ontouchstart"in window&&document.body.addEventListener("touchstart",f,!1),document.body.addEventListener("mousedown",f,!1)},g.attach=function(a){"input"===a.tagName.toLowerCase()&&(i.wrapInput([a]),a=a.parentElement),"ontouchstart"in window&&a.addEventListener("touchstart",f,!1),a.addEventListener("mousedown",f,!1)},g});
-
-    //onDOMload
-	document.addEventListener('DOMContentLoaded', function() {
-        Waves.displayEffect({duration: 900});
-    }, false);
-    
-    //turbolink fix
-    $(document).on('ready page:change', function() {
-        Waves.displayEffect({duration: 900});
-    });
+/*!
+ * Waves v0.7.2
+ * http://fian.my.id/Waves
+ *
+ * Copyright 2014 Alfiana E. Sibuea and other contributors
+ * Released under the MIT license
+ * https://github.com/fians/Waves/blob/master/LICENSE
+ */
+!function(a,b){"use strict";"function"==typeof define&&define.amd?define([],function(){return b.apply(a)}):"object"==typeof exports?module.exports=b.call(a):a.Waves=b.call(a)}("object"==typeof global?global:this,function(){"use strict";function a(a){return null!==a&&a===a.window}function b(b){return a(b)?b:9===b.nodeType&&b.defaultView}function c(a){var b=typeof a;return"function"===b||"object"===b&&!!a}function d(a){return c(a)&&a.nodeType>0}function e(a){var b=m.call(a);return"[object String]"===b?l(a):c(a)&&/^\[object (HTMLCollection|NodeList|Object)\]$/.test(b)&&a.hasOwnProperty("length")?a:d(a)?[a]:[]}function f(a){var c,d,e={top:0,left:0},f=a&&a.ownerDocument;return c=f.documentElement,"undefined"!=typeof a.getBoundingClientRect&&(e=a.getBoundingClientRect()),d=b(f),{top:e.top+d.pageYOffset-c.clientTop,left:e.left+d.pageXOffset-c.clientLeft}}function g(a){var b="";for(var c in a)a.hasOwnProperty(c)&&(b+=c+":"+a[c]+";");return b}function h(a,b,c){if(c){c.classList.remove("waves-rippling");var d=c.getAttribute("data-x"),e=c.getAttribute("data-y"),f=c.getAttribute("data-scale"),h=c.getAttribute("data-translate"),i=Date.now()-Number(c.getAttribute("data-hold")),j=350-i;0>j&&(j=0),"mousemove"===a.type&&(j=150);var k="mousemove"===a.type?2500:o.duration;setTimeout(function(){var a={top:e+"px",left:d+"px",opacity:"0","-webkit-transition-duration":k+"ms","-moz-transition-duration":k+"ms","-o-transition-duration":k+"ms","transition-duration":k+"ms","-webkit-transform":f+" "+h,"-moz-transform":f+" "+h,"-ms-transform":f+" "+h,"-o-transform":f+" "+h,transform:f+" "+h};c.setAttribute("style",g(a)),setTimeout(function(){try{b.removeChild(c)}catch(a){return!1}},k)},j)}}function i(a){if(q.allowEvent(a)===!1)return null;for(var b=null,c=a.target||a.srcElement;null!==c.parentElement;){if(c.classList.contains("waves-effect")&&!(c instanceof SVGElement)){b=c;break}c=c.parentElement}return b}function j(a){q.registerEvent(a);var b=i(a);if(null!==b)if("touchstart"===a.type&&o.delay){var c=!1,d=setTimeout(function(){d=null,o.show(a,b)},o.delay),e=function(e){d&&(clearTimeout(d),d=null,o.show(a,b)),c||(c=!0,o.hide(e,b))},f=function(a){d&&(clearTimeout(d),d=null),e(a)};b.addEventListener("touchmove",f,!1),b.addEventListener("touchend",e,!1),b.addEventListener("touchcancel",e,!1)}else o.show(a,b),n&&(b.addEventListener("touchend",o.hide,!1),b.addEventListener("touchcancel",o.hide,!1)),b.addEventListener("mouseup",o.hide,!1),b.addEventListener("mouseleave",o.hide,!1)}var k=k||{},l=document.querySelectorAll.bind(document),m=Object.prototype.toString,n="ontouchstart"in window,o={duration:750,delay:200,show:function(a,b,c){if(2===a.button)return!1;b=b||this;var d=document.createElement("div");d.className="waves-ripple waves-rippling",b.appendChild(d);var e=f(b),h=a.pageY-e.top,i=a.pageX-e.left,j="scale("+b.clientWidth/100*3+")",k="translate(0,0)";c&&(k="translate("+c.x+"px, "+c.y+"px)"),"touches"in a&&a.touches.length&&(h=a.touches[0].pageY-e.top,i=a.touches[0].pageX-e.left),d.setAttribute("data-hold",Date.now()),d.setAttribute("data-x",i),d.setAttribute("data-y",h),d.setAttribute("data-scale",j),d.setAttribute("data-translate",k);var l={top:h+"px",left:i+"px"};d.classList.add("waves-notransition"),d.setAttribute("style",g(l)),d.classList.remove("waves-notransition"),l["-webkit-transform"]=j+" "+k,l["-moz-transform"]=j+" "+k,l["-ms-transform"]=j+" "+k,l["-o-transform"]=j+" "+k,l.transform=j+" "+k,l.opacity="1";var m="mousemove"===a.type?2500:o.duration;l["-webkit-transition-duration"]=m+"ms",l["-moz-transition-duration"]=m+"ms",l["-o-transition-duration"]=m+"ms",l["transition-duration"]=m+"ms",d.setAttribute("style",g(l))},hide:function(a,b){b=b||this;for(var c=b.getElementsByClassName("waves-rippling"),d=0,e=c.length;e>d;d++)h(a,b,c[d])}},p={input:function(a){var b=a.parentNode;if("i"!==b.tagName.toLowerCase()||!b.classList.contains("waves-effect")){var c=document.createElement("i");c.className=a.className+" waves-input-wrapper",a.className="waves-button-input",b.replaceChild(c,a),c.appendChild(a);var d=window.getComputedStyle(a,null),e=d.color,f=d.backgroundColor;c.setAttribute("style","color:"+e+";background:"+f),a.setAttribute("style","background-color:rgba(0,0,0,0);")}},img:function(a){var b=a.parentNode;if("i"!==b.tagName.toLowerCase()||!b.classList.contains("waves-effect")){var c=document.createElement("i");b.replaceChild(c,a),c.appendChild(a)}}},q={touches:0,allowEvent:function(a){var b=!0;return/^(mousedown|mousemove)$/.test(a.type)&&q.touches&&(b=!1),b},registerEvent:function(a){var b=a.type;"touchstart"===b?q.touches+=1:/^(touchend|touchcancel)$/.test(b)&&setTimeout(function(){q.touches&&(q.touches-=1)},500)}};return k.init=function(a){var b=document.body;a=a||{},"duration"in a&&(o.duration=a.duration),"delay"in a&&(o.delay=a.delay),n&&(b.addEventListener("touchstart",j,!1),b.addEventListener("touchcancel",q.registerEvent,!1),b.addEventListener("touchend",q.registerEvent,!1)),b.addEventListener("mousedown",j,!1)},k.attach=function(a,b){a=e(a),"[object Array]"===m.call(b)&&(b=b.join(" ")),b=b?" "+b:"";for(var c,d,f=0,g=a.length;g>f;f++)c=a[f],d=c.tagName.toLowerCase(),-1!==["input","img"].indexOf(d)&&(p[d](c),c=c.parentElement),c.className+=" waves-effect"+b},k.ripple=function(a,b){a=e(a);var c=a.length;if(b=b||{},b.wait=b.wait||0,b.position=b.position||null,c)for(var d,g,h,i={},j=0,k={type:"mousedown",button:1},l=function(a,b){return function(){o.hide(a,b)}};c>j;j++)if(d=a[j],g=b.position||{x:d.clientWidth/2,y:d.clientHeight/2},h=f(d),i.x=h.left+g.x,i.y=h.top+g.y,k.pageX=i.x,k.pageY=i.y,o.show(k,d),b.wait>=0&&null!==b.wait){var m={type:"mouseup",button:1};setTimeout(l(m,d),b.wait)}},k.calm=function(a){a=e(a);for(var b={type:"mouseup",button:1},c=0,d=a.length;d>c;c++)o.hide(b,a[c])},k.displayEffect=function(a){console.error("Waves.displayEffect() has been deprecated and will be removed in future version. Please use Waves.init() to initialize Waves effect"),k.init(a)},k});
+//# sourceMappingURL=waves.min.js.map

data/app/assets/javascripts/material/webfont.js

@@ -1,48 +1,45 @@
 // webfont.js
 	WebFontConfig = {
 		classes: false,
-		fontactive: function() {
-			$('.avoid-fout').each(function(index) {
-				$(this).addClass('avoid-fout-done');
-			});
-
-			// fixed left/right hand side column padding bottom and width
-				contentFixPushCal();
-
-			// footer push
-				footerPush();
-
-			// header height
-				headerHeightCal();
-
-			// tile wrap animation
-				tileInView();
-		},
-		fontinactive: function() {
-			$('.avoid-fout').each(function(index) {
-				$(this).addClass('avoid-fout-done');
-			});
-
-			// fixed left/right hand side column padding bottom and width
-				contentFixPushCal();
-
-			// footer push
-				footerPush();
-
-			// header height
-				headerHeightCal();
-
-			// tile wrap animation
-				tileInView();
-		},
 		google: {
 			families: ['Roboto:300,300italic,400,400italic,700,700italic']
-		}
+		},
+		// callbacks
+			active: function() {
+				$('.avoid-fout').each(function(index) {
+					$(this).addClass('avoid-fout-done');
+				});
+
+				// fixed left/right hand side column padding bottom and width
+					contentFixPushCal();
+
+				// footer push
+					footerPush();
+
+				// header height
+					headerHeightCal();
+
+				// tab indicator
+					$('.tab-nav').each(function() {
+						tabSwitch($('.nav > li.active', $(this)), null);
+					});
+
+				// tile wrap animation
+					tileInView();
+			},
+			inactive: function() {
+				$('.avoid-fout').each(function(index) {
+					$(this).addClass('avoid-fout-done');
+				});
+
+				// tile wrap animation
+					tileInView();
+			}
 	};
 
 	(function() {
 		var wf = document.createElement('script');
-		wf.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://ajax.googleapis.com/ajax/libs/webfont/1.5.10/webfont.js';
+		wf.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
 		wf.type = 'text/javascript';
 		wf.async = 'true';
 		var s = document.getElementsByTagName('script')[0];

data/app/assets/javascripts/material-sprockets.js

@@ -1 +1,2 @@
-//= require_tree ./material
+//= require_tree ./material
+//= require 'init'

data/app/assets/stylesheets/material/_code.scss

@@ -23,7 +23,7 @@ kbd {
 	padding: 2px 4px;
 	kbd {
 		font-size: 100%;
-		font-weight: 700;
+		font-weight: $font-weight-bold;
 		padding: 0;
 	}
 }

data/app/assets/stylesheets/material/_reset.scss

@@ -3,10 +3,9 @@
 *,
 *:after,
 *:before {
-	@include box-sizing(border-box);
+	box-sizing: border-box;
 }
 
-
 @-ms-viewport {
 	width: device-width;
 }
@@ -33,7 +32,7 @@
 		color: $black-text;
 		font-family: $font-fam;
 		font-size: $font-size;
-		font-weight: 400;
+		font-weight: $font-weight;
 		line-height: $line-height;
 		margin: 0;
 		padding: 0;
@@ -159,8 +158,8 @@
 	}
 
 	input[type="search"] {
+		box-sizing: border-box;
 		-webkit-appearance: none;
-		@include box-sizing(border-box);
 	}
 
 	input[type="search"]::-webkit-search-cancel-button,
@@ -170,7 +169,7 @@
 
 	label {
 		display: inline-block;
-		font-weight: 400;
+		font-weight: $font-weight;
 		margin: 0;
 		max-width: 100%;
 	}
@@ -180,7 +179,7 @@
 		color: $black-text;
 		display: block;
 		font-size: $font-size-h3;
-		font-weight: 400;
+		font-weight: $font-weight;
 		line-height: $line-height-h3;
 		margin: 0 0 $line-height;
 		padding: 0;
@@ -188,7 +187,7 @@
 	}
 
 	optgroup {
-		font-weight: 700;
+		font-weight: $font-weight-bold;
 	}
 
 	select[multiple],
@@ -222,21 +221,21 @@
 	address {
 		font-size: $font-size;
 		font-style: normal;
-		font-weight: 400;
+		font-weight: $font-weight;
 		line-height: $line-height;
 		margin: $line-height 0;
 	}
 
 	b,
 	strong {
-		font-weight: 700;
+		font-weight: $font-weight-bold;
 	}
 
 	blockquote,
 	q {
 		font-size: $font-size-h4;
 		font-style: italic;
-		font-weight: 300;
+		font-weight: $font-weight-light;
 		line-height: $line-height-h4;
 		margin: ($line-height * 1.5) 0;
 		padding-right: ($grid-gutter * 2);
@@ -247,7 +246,7 @@
 			color: $brand-color;
 			display: block;
 			font-size: $font-size-h1;
-			font-weight: 700;
+			font-weight: $font-weight-bold;
 			line-height: 0;
 			position: absolute;
 				top: 0;
@@ -282,7 +281,7 @@
 	}
 
 	dt {
-		font-weight: 700;
+		font-weight: $font-weight-bold;
 	}
 
 	h1,
@@ -299,7 +298,7 @@
 	.h6 {
 		color: inherit;
 		font-family: $font-fam;
-		font-weight: 700;
+		font-weight: $font-weight-bold;
 		margin-top: ($line-height * 2);
 		margin-bottom: $line-height;
 	}
@@ -350,7 +349,7 @@
 	.h4 {
 		small {
 			font-size: $font-size;
-			font-weight: 400;
+			font-weight: $font-weight;
 		}
 	}
 
@@ -358,11 +357,11 @@
 	.hr {
 		border: 0;
 		border-top: 1px solid $black-hint;
+		box-sizing: content-box;
 		display: block;
 		height: 0;
 		margin-top: $line-height;
 		margin-bottom: $line-height;
-		@include box-sizing(content-box);
 	}
 
 	img {
@@ -402,7 +401,7 @@
 		// position
 			bottom: -0.25em;
 	}
-	
+
 	sup {
 		// position
 			top: -0.5em;
@@ -420,4 +419,4 @@
 
 	th {
 		text-align: left;
-	}
+	}

data/app/assets/stylesheets/material/_utilities.scss

@@ -61,20 +61,20 @@ body.el-loading {
 .avoid-fout > .avoid-fout-indicator,
 .el-loading > .el-loading-indicator {
 	background-color: $white;
+	box-shadow: 0 -1px 0 $black-bg, 0 0 2px rgba(0, 0, 0, 0.1), 0 2px 4px rgba(0, 0, 0, 0.15);
 	height: 100%;
+	opacity: 1;
 	padding: $line-height $grid-gutter;
 	width: 100%;
-	@include box-shadow(0 -1px 0 $black-bg, 0 0 2px rgba(0, 0, 0, 0.1), 0 2px 4px rgba(0, 0, 0, 0.15));
-	@include opacity(1);
 }
 
 .avoid-fout-done > .avoid-fout-indicator,
 .el-loading-done > .el-loading-indicator {
 	height: 0;
+	opacity: 0;
 	padding: 0;
 	width: 0;
-	@include opacity(0);
-	@include transition(height 0s 0.3s, opacity 0.3s $timing, padding 0s 0.3s, width 0s 0.3s);
+	transition: height 0s 0.3s, opacity 0.3s $timing, padding 0s 0.3s, width 0s 0.3s;
 }
 
 .avoid-fout-indicator-fixed,
@@ -121,14 +121,14 @@ body.el-loading {
 	height: 0;
 	overflow: hidden;
 	position: relative;
-	@include transition(height 0.3s $timing);
+	transition: height 0.3s $timing;
 }
 
 .fade {
-		@include opacity(0);
-		@include transition(opacity 0.3s $timing);
+	opacity: 0;
+	transition: opacity 0.3s $timing;
 	&.in {
-		@include opacity(1);
+		opacity: 1;
 	}
 }
 
@@ -257,16 +257,13 @@ body.el-loading {
 }
 
 .text-break {
+	hyphens: auto;
 	word-break: break-all;
-	-webkit-hyphens: auto;
-	   -moz-hyphens: auto;
-	    -ms-hyphens: auto;
-	        hyphens: auto;
 }
 
 .text-lead {
 	font-size: $font-size-h4;
-	font-weight: 300;
+	font-weight: $font-weight-light;
 	line-height: $line-height-h4;
 }
 
@@ -291,7 +288,7 @@ body.el-loading {
 		text-align: right;
 	}
 
-// color
+// colour
 	.text-bg {
 		color: $black-bg;
 	}
@@ -318,8 +315,8 @@ body.el-loading {
 
 	@each $color in $palette-list {
 		$i: index($palette-list, $color);
-		
+
 		.text-#{$color} {
 			color: nth($palette-color, $i);
 		}
-	}
+	}

data/app/assets/stylesheets/material/_variable.scss

@@ -76,6 +76,11 @@
 		$font-size-h6: ($base * 1.5);       // 12px
 		$font-size-lg: ($base * 7.5);       // 60px
 
+	// font weight
+		$font-weight:       400;
+		$font-weight-bold:  700;
+		$font-weight-light: 300;
+
 	// line height
 		$line-height:    ($base * 3);       // 24px
 		$line-height-h1: ($base * 6);       // 48px
@@ -91,8 +96,6 @@
 		$cell-height:  (($base * 3) * 2);   // 48px
 		$input-height: (($base * 3) * 1.5); // 36px
 
-		$fa-font-size-base: $font-size !default;
-
 // grid
 	$grid-cols: 12;
 	$grid-gutter: ($base * 2);
@@ -114,4 +117,4 @@
 	$bottom-base:  10;
 	$content-base: 20;
 	$header-base:  30;
-	$top-base:     40;
+	$top-base:     40;

data/app/assets/stylesheets/material/addon/_material-design-icon.scss

@@ -1,9 +1,9 @@
-// Material Design Iconic Font 1.0.1 by Sergey Kupletsky (@zavoloklom) - http://zavoloklom.github.io/material-design-iconic-font/
-// License - https://github.com/zavoloklom/material-design-iconic-font/blob/gh-pages/License.md (Attribution-ShareAlike 4.0 International license)
-@import "material-design-icon/variables";
+// material design icons v2.0.0
+// http://google.github.io/material-design-icons/#icon-font-for-the-web
+	@import "material-design-icon/variables";
 
-@import "material-design-icon/path";
+	@import "material-design-icon/path";
 
-@import "material-design-icon/core";
+	@import "material-design-icon/core";
 
-@import "material-design-icon/icons";
+	@import "material-design-icon/larger";

data/app/assets/stylesheets/material/addon/_waves.scss

@@ -1,6 +1,6 @@
-.waves-button, 
+.waves-button,
 .waves-circle {
-	@include transform(translateZ(0));
+	transform: translateZ(0);
 }
 
 .waves-effect {
@@ -10,8 +10,7 @@
 	.waves-ripple {
 		background-color: rgba(0, 0, 0, 0.1);
 		$gradient: rgba(0, 0, 0, 0.1) 0, rgba(0, 0, 0, 0.2) 30%, rgba(0, 0, 0, 0.3) 40%, rgba(0, 0, 0, 0.4) 50%, rgba(255, 255, 255, 0) 60%;
-		background-image: -webkit-radial-gradient($gradient);
-		background-image:         radial-gradient($gradient);
+		background-image: radial-gradient($gradient);
 		border-radius: 50%;
 		height: 100px;
 		margin-top: -50px;
@@ -19,33 +18,28 @@
 		opacity: 0;
 		pointer-events: none;
 		position: absolute;
+		transform: scale(0);
+		transition: all 0.3s $timing;
+		transition-property: opacity, transform;
 		width: 100px;
-		-webkit-transition-property: -webkit-transform, opacity;
-		        transition-property: transform, opacity;
-		@include transform(scale(0));
-		@include transition(all 0.3s $timing);
-		-webkit-transition-property: opacity, -webkit-transform;
-		        transition-property: opacity, transform;
 
 	}
 	&.waves-light .waves-ripple {
 		background-color: rgba(255, 255, 255, 0.4);
 		$gradient: rgba(255, 255, 255, 0.1) 0, rgba(255, 255, 255, 0.2) 30%, rgba(255, 255, 255, 0.3) 40%, rgba(255, 255, 255, 0.4) 50%, rgba(255, 255, 255, 0) 60%;
-		background-image: -webkit-radial-gradient($gradient);
-		background-image:         radial-gradient($gradient);
+		background-image: radial-gradient($gradient);
 	}
 	@each $color in $palette-list {
 		$i: index($palette-list, $color);
-		
+
 		&.waves-color-#{$color} .waves-ripple {
 			background-color: nth($palette-color-light, $i);
 			$gradient: rgba(red(nth($palette-color, $i)), green(nth($palette-color, $i)), blue(nth($palette-color, $i)), 0.1) 0, rgba(red(nth($palette-color, $i)), green(nth($palette-color, $i)), blue(nth($palette-color, $i)), 1) 100%;
-			background-image: -webkit-radial-gradient($gradient);
-			background-image:         radial-gradient($gradient);
+			background-image: radial-gradient($gradient);
 		}
 	}
 }
 
 .waves-notransition {
-	@include transition(none #{"!important"});
-}
+	transition: none !important;
+}

data/app/assets/stylesheets/material/addon/material-design-icon/_core.scss

@@ -1,17 +1,20 @@
 .#{$mdicon-css-prefix} {
-  display: inline-block;
-  font: normal normal normal #{$fa-font-size-base}/1 MaterialDesignIcon;
-  font-size: inherit;
-  speak: none;
-  text-rendering: auto;
-  transform: none;
-  vertical-align: -10%;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
+	font-family: 'Material Icons';
+	font-weight: normal;
+	font-style: normal;
+	font-size: inherit;
+	display: inline-block;
+	height: 1em;
+	line-height: 1;
+	text-rendering: optimizeLegibility;
+	text-transform: none;
+	letter-spacing: normal;
+	vertical-align: -10%;
+	width: 1em;
+	word-wrap: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 
-.#{$mdicon-css-prefix}-lg {
-	font-size: (4em / 3);
-	line-height: (3em / 4);
-	vertical-align: -20%;
-}
+	/* ie */
+	font-feature-settings: 'liga';
+}

data/app/assets/stylesheets/material/addon/material-design-icon/_larger.scss

@@ -0,0 +1,20 @@
+.#{$mdicon-css-prefix}-2x {
+	font-size: 2em;
+}
+
+.#{$mdicon-css-prefix}-3x {
+	font-size: 3em;
+}
+
+.#{$mdicon-css-prefix}-4x {
+	font-size: 4em;
+}
+
+.#{$mdicon-css-prefix}-5x {
+	font-size: 5em;
+}
+
+.#{$mdicon-css-prefix}-lg {
+	font-size: 1.5em;
+	vertical-align: -26%;
+}

data/app/assets/stylesheets/material/addon/material-design-icon/_path.scss

@@ -1,10 +1,11 @@
 @font-face {
-	font-family: "MaterialDesignIcon";
+	font-family: 'Material Icons';
 	font-style: normal;
-	font-weight: normal;
-	src: font-url("MaterialDesignIcon.eot?v=#{$mdicon-version}");
-	src: font-url("MaterialDesignIcon.eot?#iefix&v=#{$mdicon-version}") format("embedded-opentype"),
-	     font-url("MaterialDesignIcon.woff?v=#{$mdicon-version}") format("woff"),
-	     font-url("MaterialDesignIcon.ttf?v=#{$mdicon-version}") format("truetype"),
-	     font-url("MaterialDesignIcon.svg?v=#{$mdicon-version}#MaterialDesignIcon") format("svg");
-}
+	font-weight: $font-weight;
+	src: font-url("MaterialIcons-Regular.eot?v=#{$mdversion}");
+	src: local('Material Icons'),
+	     local('MaterialIcons-Regular'),
+	     font-url("MaterialIcons-Regular.woff2?v=#{$mdversion}") format("woff2"),
+	     font-url("MaterialIcons-Regular.woff?v=#{$mdversion}") format("woff"),
+	     font-url("MaterialIcons-Regular.ttf?v=#{$mdversion}") format("truetype"),
+}