From e4aef92670bceba23515cbafca3f11611d1f1f60 Mon Sep 17 00:00:00 2001 From: Phillip Glenn Libay Date: Mon, 2 Feb 2015 14:15:09 +0800 Subject: [PATCH 1/6] Edit typo on CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8359fc76..4fc39c80 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ ## Playground -Use this pen to test and deveop new features of Material Design for Bootstrap: +Use this pen to test and develop new features of Material Design for Bootstrap: http://codepen.io/FezVrasta/pen/ihmea From a4a79111934077a2cf42fbc8eb0e97b9448f3b21 Mon Sep 17 00:00:00 2001 From: phillc Date: Tue, 10 Feb 2015 19:44:22 -0500 Subject: [PATCH 2/6] Change togglebutton's first-child to first-of-type --- CONTRIBUTING.md | 2 +- less/_togglebutton.less | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8359fc76..4fc39c80 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ ## Playground -Use this pen to test and deveop new features of Material Design for Bootstrap: +Use this pen to test and develop new features of Material Design for Bootstrap: http://codepen.io/FezVrasta/pen/ihmea diff --git a/less/_togglebutton.less b/less/_togglebutton.less index 7f8001fe..7f5a7398 100644 --- a/less/_togglebutton.less +++ b/less/_togglebutton.less @@ -7,13 +7,13 @@ font-weight: 400; cursor: pointer; // Hide original checkbox - input[type=checkbox]:first-child { + input[type=checkbox]:first-of-type { opacity: 0; width: 0; height:0; } // Switch bg on - input[type=checkbox]:first-child:checked + .toggle { + input[type=checkbox]:first-of-type:checked + .toggle { background-color: rgba(0, 149, 135, 0.5); // Handle on &:after { @@ -22,7 +22,7 @@ } // Switch bg off and disabled .toggle, - input[type=checkbox][disabled]:first-child + .toggle { + input[type=checkbox][disabled]:first-of-type + .toggle { content: ""; display: inline-block; width: 30px; @@ -48,20 +48,20 @@ transition: left 0.3s ease, background 0.3s ease, box-shadow 0.1s ease; } // Handle disabled - input[type=checkbox][disabled]:first-child + .toggle:after, - input[type=checkbox][disabled]:checked:first-child + .toggle:after{ + input[type=checkbox][disabled]:first-of-type + .toggle:after, + input[type=checkbox][disabled]:checked:first-of-type + .toggle:after{ background-color: #BDBDBD; } // Ripple on - input[type=checkbox]:first-child:checked ~ .toggle:active:after { + input[type=checkbox]:first-of-type:checked ~ .toggle:active:after { box-shadow: 0 1px 3px 1px rgba(0,0,0,0.4), 0 0 0 15px rgba(0, 149, 135, 0.1); } // Ripple off and disabled - input[type=checkbox]:first-child ~ .toggle:active:after, - input[type=checkbox][disabled]:first-child ~ .toggle:active:after { + input[type=checkbox]:first-of-type ~ .toggle:active:after, + input[type=checkbox][disabled]:first-of-type ~ .toggle:active:after { box-shadow: 0 1px 3px 1px rgba(0,0,0,0.4), 0 0 0 15px rgba(0, 0, 0, 0.1); } - input[type=checkbox]:first-child:checked + .toggle:after { + input[type=checkbox]:first-of-type:checked + .toggle:after { left: 15px; } } From 01b2b7528084a891fd7b23e003fabe1de9f56dc8 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Wed, 11 Feb 2015 17:03:18 +0100 Subject: [PATCH 3/6] added carbon ad --- index.html | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index f4e97a37..cc333bad 100644 --- a/index.html +++ b/index.html @@ -184,6 +184,49 @@

Would you like to use this theme for commercial projects? Visit MyWebExpression and contact me using the form on the bottom of the page. Thanks!


+
+ +
Seems like you are using AdBlock to hide banners... Carbon ADS are quite nice and don't take much space, you may consider disabling it on this website.
This is the only AD on the entire website.

Thanks!
+
+ +

You can get this theme downloading the source from Bower:

bower install bootstrap-material-design
@@ -277,8 +320,10 @@ font-weight: 400; } - #checkbox .sample2 .text { + #checkbox .sample2 { padding: 10px 0; + } + #checkbox .sample2 .text { display: inline-block; } #checkbox .sample2 .checkbox { @@ -392,6 +437,10 @@ +

Disabled

+ + +

Hints

From 83bd41af6704e2c8cd863a41b56d0ed1493791fb Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 12 Feb 2015 18:22:43 +0900 Subject: [PATCH 4/6] Update bootstrap-elements.html Update to latest version of Bootstrap (3.3.2). --- bootstrap-elements.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-elements.html b/bootstrap-elements.html index e5a61354..7fc5e112 100644 --- a/bootstrap-elements.html +++ b/bootstrap-elements.html @@ -4,7 +4,7 @@ Bootstrap Material - + @@ -2264,7 +2264,7 @@
- + - + From f2c8010ce75ae7c8cbfc2905ac7a7d4ffcf5bd4d Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 12 Feb 2015 18:25:27 +0900 Subject: [PATCH 6/6] Update test.html Update CDN links to latest version of Bootstrap (3.3.2) --- dist/test.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/test.html b/dist/test.html index ee97406b..8b35fbe9 100644 --- a/dist/test.html +++ b/dist/test.html @@ -2,7 +2,7 @@ - + @@ -32,7 +32,7 @@ - +