diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml index 313aa38c..e7d2329e 100644 --- a/docs/_data/nav.yml +++ b/docs/_data/nav.yml @@ -26,6 +26,7 @@ - title: Material Design pages: - title: Test + - title: Buttons - title: Forms - title: Labels - title: Selections diff --git a/docs/_includes/header.html b/docs/_includes/header.html index d54e7e42..5de970f3 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -13,6 +13,10 @@ {% endif %} + + + + diff --git a/docs/material-design/buttons.md b/docs/material-design/buttons.md new file mode 100644 index 00000000..3bd59293 --- /dev/null +++ b/docs/material-design/buttons.md @@ -0,0 +1,148 @@ +--- +layout: docs +title: Buttons +group: material-design +--- + +## Contents + +* Will be replaced with the ToC, excluding the "Contents" header +{:toc} + +## Flat + +{% example html %} + + + + + + + + + +{% endexample %} + +### Disabled + +{% example html %} +
+{% endexample %} + +## Raised + +{% example html %} + + + + + + + + +{% endexample %} + +### Disabled +{% example html %} + +{% endexample %} + +## Floating Action + +{% example html %} + + + + + + +{% endexample %} + +### Disabled +{% example html %} + +{% endexample %} + +### Mini +{% example html %} + +{% endexample %} + + +## Sizes +{% example html %} + + + +{% endexample %} + +## x +{% example html %} +{% endexample %} diff --git a/js/src/util.js b/js/src/util.js index 1ffaa13f..721e1eea 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -62,16 +62,16 @@ const Util = (($) => { return true } else if (typeof event.which === 'number' && event.which > 0) { return ( - !evt.ctrlKey - && !evt.metaKey - && !evt.altKey - && evt.which != 8 // backspace - && evt.which != 9 // tab - && evt.which != 13 // enter - && evt.which != 16 // shift - && evt.which != 17 // ctrl - && evt.which != 20 // caps lock - && evt.which != 27 // escape + !event.ctrlKey + && !event.metaKey + && !event.altKey + && event.which != 8 // backspace + && event.which != 9 // tab + && event.which != 13 // enter + && event.which != 16 // shift + && event.which != 17 // ctrl + && event.which != 20 // caps lock + && event.which != 27 // escape ) } return false diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 3243531e..bebafe2a 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -13,7 +13,6 @@ } // mdb default buttons are flat by default -// synchronized with mdl 11/23/15 .btn, .input-group-btn .btn { position: relative;