From dd2b41c11f7241b9c3cd864d8930b27148dd54df Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Mon, 8 Sep 2014 09:39:40 +0200 Subject: [PATCH 01/12] js fix --- scripts/material.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/material.js b/scripts/material.js index 04be9b07..afa0d0e4 100644 --- a/scripts/material.js +++ b/scripts/material.js @@ -24,12 +24,15 @@ $(function (){ } }); - $(document).on("keyup", ".form-control", function() { + $(document).on("keyup change", ".form-control", function() { if ($(this).val() !== "") { $(this).removeClass("empty"); } else { $(this).addClass("empty"); } }); + $(document).on("keydown", ".form-control", function() { + $(this).removeClass("empty"); + }); }); From 4e44df5a0f206c0d034584ea9716c8fc3350104f Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Tue, 9 Sep 2014 15:22:45 +0200 Subject: [PATCH 02/12] class to let users force focus status --- css-compiled/material.css | 115 +++++++++++++++++++++++++++++++++----- less/inputs.less | 27 ++++----- less/test.css | 10 ++++ less/test.less | 39 +++++++++++++ 4 files changed, 164 insertions(+), 27 deletions(-) create mode 100644 less/test.css create mode 100644 less/test.less diff --git a/css-compiled/material.css b/css-compiled/material.css index d2fd2bfa..a3c50cdb 100644 --- a/css-compiled/material.css +++ b/css-compiled/material.css @@ -1176,7 +1176,9 @@ h6, .form-control-wrapper .form-control, .form-control, .form-control-wrapper .form-control:focus, -.form-control:focus { +.form-control:focus, +.form-control-wrapper .form-control.focus, +.form-control.focus { height: 28px; padding: 0; float: none; @@ -1189,21 +1191,25 @@ h6, .form-control-wrapper .form-control:disabled, .form-control:disabled, .form-control-wrapper .form-control:focus:disabled, -.form-control:focus:disabled { +.form-control:focus:disabled, +.form-control-wrapper .form-control.focus:disabled, +.form-control.focus:disabled { border-style: dashed; } select.form-control { height: 23px; } select[multiple].form-control, -select[multiple].form-control:focus { +select[multiple].form-control:focus, +select[multiple].form-control.focus { height: 85px; } .form-control-wrapper { position: relative; /* active state */ } -.form-control-wrapper .form-control:focus { +.form-control-wrapper .form-control:focus, +.form-control-wrapper .form-control.focus { outline: none; } .form-control-wrapper .floating-label { @@ -1221,14 +1227,18 @@ select[multiple].form-control:focus { font-size: 10px; opacity: 1; } -.form-control-wrapper .form-control:focus:invalid ~ .floating-label { +.form-control-wrapper .form-control:focus:invalid ~ .floating-label, +.form-control-wrapper .form-control.focus:invalid ~ .floating-label { color: #f44336; } -.form-control-wrapper .form-control:focus ~ .material-input:after { +.form-control-wrapper .form-control:focus ~ .material-input:after, +.form-control-wrapper .form-control.focus ~ .material-input:after { background-color: #5264ae; } .form-control-wrapper .form-control:focus:invalid ~ .material-input:before, -.form-control-wrapper .form-control:focus:invalid ~ .material-input:after { +.form-control-wrapper .form-control.focus:invalid ~ .material-input:before, +.form-control-wrapper .form-control:focus:invalid ~ .material-input:after, +.form-control-wrapper .form-control.focus:invalid ~ .material-input:after { background-color: #f44336; } .form-control-wrapper .form-control.empty ~ .floating-label { @@ -1245,7 +1255,8 @@ select[multiple].form-control:focus { transform: scaleX(0); transition: transform 0s; } -.form-control-wrapper .form-control:focus ~ .material-input:before { +.form-control-wrapper .form-control:focus ~ .material-input:before, +.form-control-wrapper .form-control.focus ~ .material-input:before { transform: scaleX(1); transition: transform 0.2s ease-out; } @@ -1270,7 +1281,8 @@ select[multiple].form-control:focus { .form-control-wrapper textarea ~ .form-control-highlight { margin-top: -11px; } -.form-control-wrapper .form-control:focus ~ .material-input:after { +.form-control-wrapper .form-control:focus ~ .material-input:after, +.form-control-wrapper .form-control.focus ~ .material-input:after { -webkit-animation: input-highlight 0.3s ease; animation: input-highlight 0.3s ease; -webkit-animation-fill-mode: forwards; @@ -1284,7 +1296,8 @@ select[multiple].form-control:focus { display: none; } .form-group.has-warning .material-input:before, -.form-group.has-warning input.form-control:focus ~ .material-input:after { +.form-group.has-warning input.form-control:focus ~ .material-input:after, +.form-group.has-warning input.form-control.focus ~ .material-input:after { background: #ff5722; } .form-group.has-warning .control-label, @@ -1292,7 +1305,8 @@ select[multiple].form-control:focus { color: #ff5722; } .form-group.has-error .material-input:before, -.form-group.has-error input.form-control:focus ~ .material-input:after { +.form-group.has-error input.form-control:focus ~ .material-input:after, +.form-group.has-error input.form-control.focus ~ .material-input:after { background: #f44336; } .form-group.has-error .control-label, @@ -1300,7 +1314,8 @@ select[multiple].form-control:focus { color: #f44336; } .form-group.has-success .material-input:before, -.form-group.has-success input.form-control:focus ~ .material-input:after { +.form-group.has-success input.form-control:focus ~ .material-input:after, +.form-group.has-success input.form-control.focus ~ .material-input:after { background: #0f9d58; } .form-group.has-success .control-label, @@ -1308,7 +1323,8 @@ select[multiple].form-control:focus { color: #0f9d58; } .form-group.has-info .material-input:before, -.form-group.has-info input.form-control:focus ~ .material-input:after { +.form-group.has-info input.form-control:focus ~ .material-input:after, +.form-group.has-info input.form-control.focus ~ .material-input:after { background: #03a9f4; } .form-group.has-info .control-label, @@ -1455,6 +1471,76 @@ select[multiple].form-control:focus { .form-group-material-lightgrey input.form-control:focus ~ .material-input:after { background-color: #ececec; } +.form-group input.form-control.focus ~ .material-input:after, +.form-group-default input.form-control.focus ~ .material-input:after { + background-color: #3f51b5; +} +.form-group-primary input.form-control.focus ~ .material-input:after { + background-color: #4285f4; +} +.form-group-success input.form-control.focus ~ .material-input:after { + background-color: #0f9d58; +} +.form-group-info input.form-control.focus ~ .material-input:after { + background-color: #03a9f4; +} +.form-group-warning input.form-control.focus ~ .material-input:after { + background-color: #ff5722; +} +.form-group-danger input.form-control.focus ~ .material-input:after { + background-color: #f44336; +} +.form-group-material-red input.form-control.focus ~ .material-input:after { + background-color: #f44336; +} +.form-group-material-pink input.form-control.focus ~ .material-input:after { + background-color: #e91e63; +} +.form-group-material-purple input.form-control.focus ~ .material-input:after { + background-color: #9c27b0; +} +.form-group-material-deeppurple input.form-control.focus ~ .material-input:after { + background-color: #673ab7; +} +.form-group-material-indigo input.form-control.focus ~ .material-input:after { + background-color: #3f51b5; +} +.form-group-material-lightblue input.form-control.focus ~ .material-input:after { + background-color: #03a9f4; +} +.form-group-material-cyan input.form-control.focus ~ .material-input:after { + background-color: #00bcd4; +} +.form-group-material-teal input.form-control.focus ~ .material-input:after { + background-color: #009688; +} +.form-group-material-lightgreen input.form-control.focus ~ .material-input:after { + background-color: #8bc34a; +} +.form-group-material-lime input.form-control.focus ~ .material-input:after { + background-color: #cddc39; +} +.form-group-material-lightyellow input.form-control.focus ~ .material-input:after { + background-color: #ffeb3b; +} +.form-group-material-orange input.form-control.focus ~ .material-input:after { + background-color: #ff9800; +} +.form-group-material-deeporange input.form-control.focus ~ .material-input:after { + background-color: #ff5722; +} +.form-group-material-grey input.form-control.focus ~ .material-input:after { + background-color: #9e9e9e; +} +.form-group-material-bluegrey input.form-control.focus ~ .material-input:after { + background-color: #607d8b; +} +.form-group-material-brown input.form-control.focus ~ .material-input:after { + background-color: #795548; +} +.form-group-material-lightgrey input.form-control.focus ~ .material-input:after { + background-color: #ececec; +} .form-group .control-label, .form-group-default .control-label { color: rgba(0, 0, 0, 0.84); @@ -1615,7 +1701,8 @@ select.form-control { border-bottom: 1px solid #757575; border-radius: 0; } -select.form-control:focus { +select.form-control:focus, +select.form-control.focus { box-shadow: none; border-color: #757575; } diff --git a/less/inputs.less b/less/inputs.less index 2e6b58bc..173421a5 100644 --- a/less/inputs.less +++ b/less/inputs.less @@ -1,7 +1,7 @@ // main: material.less .form-control-wrapper .form-control, .form-control { - &, &:focus { + &, &:focus, &.focus { height: 28px; padding: 0; float: none; @@ -19,7 +19,7 @@ select.form-control { height: 23px; } select[multiple].form-control { - &, &:focus { + &, &:focus, &.focus { height: 85px; } } @@ -27,7 +27,7 @@ select[multiple].form-control { .form-control-wrapper { position: relative; - .form-control:focus { + .form-control:focus, .form-control.focus { outline: none; } @@ -46,13 +46,13 @@ select[multiple].form-control { font-size: 10px; opacity: 1; } - .form-control:focus:invalid ~ .floating-label { + .form-control:focus:invalid ~ .floating-label, .form-control.focus:invalid ~ .floating-label { color: @input-danger; } - .form-control:focus ~ .material-input:after { + .form-control:focus ~ .material-input:after, .form-control.focus ~ .material-input:after { background-color: @input-default; } - .form-control:focus:invalid ~ .material-input { + .form-control:focus:invalid ~ .material-input, .form-control.focus:invalid ~ .material-input { &:before, &:after { background-color: @input-danger; } @@ -71,7 +71,7 @@ select[multiple].form-control { transform: scaleX(0); transition: transform 0s; } - .form-control:focus ~ .material-input:before { + .form-control:focus ~ .material-input:before, .form-control.focus ~ .material-input:before { transform: scaleX(1); transition: transform 0.2s ease-out; } @@ -96,7 +96,7 @@ select[multiple].form-control { } /* active state */ - .form-control:focus ~ .material-input:after { + .form-control:focus ~ .material-input:after, .form-control.focus ~ .material-input:after { -webkit-animation: input-highlight 0.3s ease; animation: input-highlight 0.3s ease; -webkit-animation-fill-mode: forwards; @@ -115,7 +115,7 @@ select[multiple].form-control { .form-group { &.has-warning { - .material-input:before, input.form-control:focus ~ .material-input:after { + .material-input:before, input.form-control:focus ~ .material-input:after, input.form-control.focus ~ .material-input:after { background: @input-warning; } .control-label, input.form-control:not(.empty) ~ .floating-label { @@ -123,7 +123,7 @@ select[multiple].form-control { } } &.has-error { - .material-input:before, input.form-control:focus ~ .material-input:after { + .material-input:before, input.form-control:focus ~ .material-input:after, input.form-control.focus ~ .material-input:after { background: @input-danger; } .control-label, input.form-control:not(.empty) ~ .floating-label { @@ -131,7 +131,7 @@ select[multiple].form-control { } } &.has-success { - .material-input:before, input.form-control:focus ~ .material-input:after { + .material-input:before, input.form-control:focus ~ .material-input:after, input.form-control.focus ~ .material-input:after { background: @input-success; } .control-label, input.form-control:not(.empty) ~ .floating-label { @@ -139,7 +139,7 @@ select[multiple].form-control { } } &.has-info { - .material-input:before, input.form-control:focus ~ .material-input:after { + .material-input:before, input.form-control:focus ~ .material-input:after, input.form-control.focus ~ .material-input:after { background: @input-info; } .control-label, input.form-control:not(.empty) ~ .floating-label { @@ -148,6 +148,7 @@ select[multiple].form-control { } .variations(~" .material-input:before", background-color, @indigo); .variations(~" input.form-control:focus ~ .material-input:after", background-color, @indigo); + .variations(~" input.form-control.focus ~ .material-input:after", background-color, @indigo); .variations(~" .control-label", color, @lightbg-text); .variations(~" input.form-control:not(.empty) ~ .floating-label", color, @indigo); @@ -175,7 +176,7 @@ select.form-control { box-shadow: none; border-bottom: 1px solid #757575; border-radius: 0; - &:focus { + &:focus, &.focus { box-shadow: none; border-color: #757575; } diff --git a/less/test.css b/less/test.css new file mode 100644 index 00000000..03617ac4 --- /dev/null +++ b/less/test.css @@ -0,0 +1,10 @@ +/* Generated by less 1.7.0 */ +.btn-default { + color: #000000; +} +.btn-primary { + color: #4285f4; +} +.btn-success { + color: #0f9d58; +} diff --git a/less/test.less b/less/test.less new file mode 100644 index 00000000..d2f9117e --- /dev/null +++ b/less/test.less @@ -0,0 +1,39 @@ +@import "variables.less"; + +.color(@default) { + &-default { + color: @default; + } + &-primary { + color: @primary; + } + &-success { + color: @success; + } + // etc +} +.btn { + .color(black); +} + +.background(@default) { + &-default { + color: @default; + } + &-primary { + color: @primary; + } + &-success { + color: @success; + } +} + +.variations(@extra, @property) { + &-default@{extra} { &:extend(.@{property}-default); } + &-primary@{extra} { &:extend(.@{property}-primary); } +// etc +} + +.label { + .variations(~"", btn); +} From e2f9e653fa0575a785b4e2d218dc8217423c94b4 Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Wed, 10 Sep 2014 09:33:20 +0200 Subject: [PATCH 03/12] fixes for IE9 and added bower --- bower.json | 26 ++++++++++++++++++++++++++ css-compiled/material.css | 4 ++-- less/checkboxes.less | 4 ++-- 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 00000000..708a0d60 --- /dev/null +++ b/bower.json @@ -0,0 +1,26 @@ +{ + "name": "bootstrap-material-design", + "version": "0.0.8", + "homepage": "http://fezvrasta.github.io/bootstrap-material-design", + "authors": [ + "Federico Zivolo " + ], + "description": "Material Design theme for Bootstrap 3", + "main": "css-compiled/material.css", + "keywords": [ + "material", + "design", + "bootstrap", + "theme", + "google", + "android" + ], + "license": "https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ] +} diff --git a/css-compiled/material.css b/css-compiled/material.css index a3c50cdb..8c5fd5c5 100644 --- a/css-compiled/material.css +++ b/css-compiled/material.css @@ -536,8 +536,8 @@ h6, } .checkbox input[type=checkbox] ~ .check { position: absolute; - top: 0px; - left: 0px; + top: 2px; + left: 11px; width: 18px; height: 18px; border: solid 2px; diff --git a/less/checkboxes.less b/less/checkboxes.less index da4335a5..c559513a 100644 --- a/less/checkboxes.less +++ b/less/checkboxes.less @@ -41,8 +41,8 @@ input[type=checkbox] ~ .check { position: absolute; - top: 0px; - left: 0px; + top: 2px; + left: 11px; width: 18px; height: 18px; border: solid 2px; From 3d234590a63a5777e58bed04172b9001346a7a97 Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Wed, 10 Sep 2014 09:34:31 +0200 Subject: [PATCH 04/12] updated name bower --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 708a0d60..b126bd2e 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,5 @@ { - "name": "bootstrap-material-design", + "name": "Material Design for Bootstrap", "version": "0.0.8", "homepage": "http://fezvrasta.github.io/bootstrap-material-design", "authors": [ From 81571006672301e286ddd40b51a2d31c78eeebfd Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Wed, 10 Sep 2014 09:36:44 +0200 Subject: [PATCH 05/12] updated doc --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index da5cc5d3..2f6269c8 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,12 @@ This theme is in early developement and is not ready for production. Check out [the demo at this link](http://fezvrasta.github.io/bootstrap-material-design/). +## How to install + + bower install bootstrap-material-design --save + + +## Features Currently supported elements: From 0898aa30e006422e28c2985d57df42b8bc2d0522 Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Thu, 11 Sep 2014 12:37:13 +0200 Subject: [PATCH 06/12] fixed js of checkboxes and radios --- scripts/material.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/material.js b/scripts/material.js index afa0d0e4..d88d0628 100644 --- a/scripts/material.js +++ b/scripts/material.js @@ -5,10 +5,10 @@ $(function (){ ripples.init(".btn:not(.btn-link), .navbar a, .nav-tabs a, .withripple"); // Add fake-checkbox to material checkboxes - $(".checkbox label input").after(""); + $(".checkbox > label > input").after(""); // Add fake-radio to material radios - $(".radio label input").after(""); + $(".radio > label > input").after(""); // Add elements for material inputs $("input.form-control, textarea.form-control, select.form-control").each( function() { From 5744c5894ff80bcebb4ad4e56f199bfdabd9ad61 Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Thu, 11 Sep 2014 14:30:55 +0200 Subject: [PATCH 07/12] fixed disabled fieldset style --- css-compiled/material.css | 6 ++++++ less/inputs.less | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/css-compiled/material.css b/css-compiled/material.css index 8c5fd5c5..a1c70850 100644 --- a/css-compiled/material.css +++ b/css-compiled/material.css @@ -1173,10 +1173,13 @@ h6, .radio input[type=radio][disabled] ~ .check { background-color: rgba(0, 0, 0, 0.84); } +fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control, +fieldset[disabled] .form-control:focus, .form-control-wrapper .form-control:focus, .form-control:focus, +fieldset[disabled] .form-control.focus, .form-control-wrapper .form-control.focus, .form-control.focus { height: 28px; @@ -1188,10 +1191,13 @@ h6, background: transparent; border-bottom: 1px solid #757575; } +fieldset[disabled] .form-control:disabled, .form-control-wrapper .form-control:disabled, .form-control:disabled, +fieldset[disabled] .form-control:focus:disabled, .form-control-wrapper .form-control:focus:disabled, .form-control:focus:disabled, +fieldset[disabled] .form-control.focus:disabled, .form-control-wrapper .form-control.focus:disabled, .form-control.focus:disabled { border-style: dashed; diff --git a/less/inputs.less b/less/inputs.less index 173421a5..b0ffa5f5 100644 --- a/less/inputs.less +++ b/less/inputs.less @@ -1,6 +1,6 @@ // main: material.less -.form-control-wrapper .form-control, .form-control { +fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control { &, &:focus, &.focus { height: 28px; padding: 0; From de80d4a99dc4bf99caedfb0f226814761b82387f Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Fri, 12 Sep 2014 11:27:36 +0200 Subject: [PATCH 08/12] updated less to 1.7.5 --- css-compiled/material.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css-compiled/material.css b/css-compiled/material.css index a1c70850..d5e0ec5b 100644 --- a/css-compiled/material.css +++ b/css-compiled/material.css @@ -1,4 +1,4 @@ -/* Generated by less 1.7.0 */ +/* Generated by less 1.7.5 */ @import url(http://fonts.googleapis.com/css?family=Roboto+Condensed:300italic,400italic,700italic,400,700,300|Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic); @-webkit-keyframes input-highlight { 0% { From 06494c86615d4a0fe2331400412eda86cd804646 Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Fri, 12 Sep 2014 11:31:16 +0200 Subject: [PATCH 09/12] changed text of input --- demo/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/index.html b/demo/index.html index b6b7800d..16f92bfb 100644 --- a/demo/index.html +++ b/demo/index.html @@ -1342,7 +1342,7 @@
- +
From 6e5b6af0354a46335541a918127cfc99238fe7d1 Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Fri, 12 Sep 2014 11:34:03 +0200 Subject: [PATCH 10/12] fixed textarea and select height --- css-compiled/material.css | 21 ++++++++++++++++++++- less/inputs.less | 4 +++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/css-compiled/material.css b/css-compiled/material.css index d5e0ec5b..96cab40e 100644 --- a/css-compiled/material.css +++ b/css-compiled/material.css @@ -1182,7 +1182,6 @@ fieldset[disabled] .form-control:focus, fieldset[disabled] .form-control.focus, .form-control-wrapper .form-control.focus, .form-control.focus { - height: 28px; padding: 0; float: none; border: 0; @@ -1191,6 +1190,26 @@ fieldset[disabled] .form-control.focus, background: transparent; border-bottom: 1px solid #757575; } +fieldset[disabled] .form-control:not(textarea), +.form-control-wrapper .form-control:not(textarea), +.form-control:not(textarea), +fieldset[disabled] .form-control:focus:not(textarea), +.form-control-wrapper .form-control:focus:not(textarea), +.form-control:focus:not(textarea), +fieldset[disabled] .form-control.focus:not(textarea), +.form-control-wrapper .form-control.focus:not(textarea), +.form-control.focus:not(textarea), +fieldset[disabled] .form-control:not(select), +.form-control-wrapper .form-control:not(select), +.form-control:not(select), +fieldset[disabled] .form-control:focus:not(select), +.form-control-wrapper .form-control:focus:not(select), +.form-control:focus:not(select), +fieldset[disabled] .form-control.focus:not(select), +.form-control-wrapper .form-control.focus:not(select), +.form-control.focus:not(select) { + height: 28px; +} fieldset[disabled] .form-control:disabled, .form-control-wrapper .form-control:disabled, .form-control:disabled, diff --git a/less/inputs.less b/less/inputs.less index b0ffa5f5..9948f7f9 100644 --- a/less/inputs.less +++ b/less/inputs.less @@ -2,7 +2,9 @@ fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control { &, &:focus, &.focus { - height: 28px; + &:not(textarea), &:not(select) { + height: 28px; + } padding: 0; float: none; border: 0; From 672682ceec90218e96cb039acacaf82b873eb528 Mon Sep 17 00:00:00 2001 From: Federico Zivolo Date: Fri, 12 Sep 2014 11:35:52 +0200 Subject: [PATCH 11/12] fixed css syntax --- css-compiled/material.css | 27 +++++++++------------------ less/inputs.less | 2 +- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/css-compiled/material.css b/css-compiled/material.css index 96cab40e..0a396b53 100644 --- a/css-compiled/material.css +++ b/css-compiled/material.css @@ -1190,24 +1190,15 @@ fieldset[disabled] .form-control.focus, background: transparent; border-bottom: 1px solid #757575; } -fieldset[disabled] .form-control:not(textarea), -.form-control-wrapper .form-control:not(textarea), -.form-control:not(textarea), -fieldset[disabled] .form-control:focus:not(textarea), -.form-control-wrapper .form-control:focus:not(textarea), -.form-control:focus:not(textarea), -fieldset[disabled] .form-control.focus:not(textarea), -.form-control-wrapper .form-control.focus:not(textarea), -.form-control.focus:not(textarea), -fieldset[disabled] .form-control:not(select), -.form-control-wrapper .form-control:not(select), -.form-control:not(select), -fieldset[disabled] .form-control:focus:not(select), -.form-control-wrapper .form-control:focus:not(select), -.form-control:focus:not(select), -fieldset[disabled] .form-control.focus:not(select), -.form-control-wrapper .form-control.focus:not(select), -.form-control.focus:not(select) { +fieldset[disabled] .form-control:not(textarea):not(select), +.form-control-wrapper .form-control:not(textarea):not(select), +.form-control:not(textarea):not(select), +fieldset[disabled] .form-control:focus:not(textarea):not(select), +.form-control-wrapper .form-control:focus:not(textarea):not(select), +.form-control:focus:not(textarea):not(select), +fieldset[disabled] .form-control.focus:not(textarea):not(select), +.form-control-wrapper .form-control.focus:not(textarea):not(select), +.form-control.focus:not(textarea):not(select) { height: 28px; } fieldset[disabled] .form-control:disabled, diff --git a/less/inputs.less b/less/inputs.less index 9948f7f9..ad438a56 100644 --- a/less/inputs.less +++ b/less/inputs.less @@ -2,7 +2,7 @@ fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control { &, &:focus, &.focus { - &:not(textarea), &:not(select) { + &:not(textarea):not(select) { height: 28px; } padding: 0; From 8f1c47470ea8608775a595f529a8bfb8ce32ef79 Mon Sep 17 00:00:00 2001 From: hebbet Date: Sun, 14 Sep 2014 23:17:19 +0200 Subject: [PATCH 12/12] Load Google Font without protocol loading http on a https site won't work --- less/material.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/material.less b/less/material.less index c467ccea..d53340aa 100644 --- a/less/material.less +++ b/less/material.less @@ -2,7 +2,7 @@ // Material Theme 0.0.1 // ----------------------------------------------------- -@import url(http://fonts.googleapis.com/css?family=Roboto+Condensed:300italic,400italic,700italic,400,700,300|Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic); +@import url(//fonts.googleapis.com/css?family=Roboto+Condensed:300italic,400italic,700italic,400,700,300|Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic); @import "variables.less"; @import "mixins.less";