mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2025-02-02 12:54:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

First pass with default mdb-form-group-size-variant. Removed references to control-label as they were mostly used incorrectly in the previous version. They are now form-control-label and only necessary for inline forms etc

Browse Source
This commit is contained in:
Kevin Ross 2015-12-10 15:49:02 -06:00
parent ca916b4729
commit 2b64baf94c
4 changed files with 92 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scss/.scss-lint.yml
View File

@ -20,7 +20,7 @@ linters:
exclude: ['_normalize.scss', 'bootstrap.scss'] exclude: ['_normalize.scss', 'bootstrap.scss']
DebugStatement: DebugStatement:
enabled: true enabled: false
DeclarationOrder: DeclarationOrder:
enabled: false enabled: false

68
scss/_forms.scss
View File

@ -1,4 +1,3 @@
@include mdb-form-color($mdb-label-color, $input-border-color); @include mdb-form-color($mdb-label-color, $input-border-color);
@include mdb-form-control-validation(warning, $brand-warning); @include mdb-form-control-validation(warning, $brand-warning);
@include mdb-form-control-validation(danger, $brand-danger); @include mdb-form-control-validation(danger, $brand-danger);
@ -52,6 +51,7 @@
right: 50%; right: 50%;
} }
} }
// End: Focus underline animation ================================= // End: Focus underline animation =================================
// Help blocks (not in v4) // Help blocks (not in v4)
@ -75,7 +75,7 @@
// //
// Reference http://www.google.com/design/spec/components/text-fields.html // Reference http://www.google.com/design/spec/components/text-fields.html
// MDL implementation: http://www.getmdl.io/components/index.html#textfields-section // MDL implementation: http://www.getmdl.io/components/index.html#textfields-section
//.variations(unquote(" label.control-label"), color, $mdb-input-placeholder-color); // default label color variations //.variations(unquote(" label"), color, $mdb-input-placeholder-color); // default label color variations
.mdb-form-group { .mdb-form-group {
position: relative; position: relative;
@ -88,39 +88,47 @@
&.label-static, &.label-static,
&.label-placeholder, &.label-placeholder,
&.label-floating { &.label-floating {
label.control-label { //> label {
position: absolute; // position: absolute;
pointer-events: none; // pointer-events: none;
transition: 0.3s ease all; // transition: 0.3s ease all;
} //
// label {
// position: relative;
// }
//}
} }
// hint to browser for optimization // hint to browser for optimization
&.label-floating label.control-label { &.label-floating {
will-change: left, top, contents; // TODO: evaluate effectiveness - looking for community feedback label {
will-change: left, top, contents; // TODO: evaluate effectiveness - looking for community feedback
}
} }
// hide label-placeholders when the field is not empty // hide label-placeholders when the field is not empty
&.label-placeholder:not(.is-empty) { &.label-placeholder:not(.is-empty) {
label.control-label { label {
display: none; display: none;
} }
} }
&.is-focused { &.is-focused {
label, // this is a control-label, but often times (too often) not marked as such so work around bad markup label {
label.control-label {
color: $brand-primary; color: $brand-primary;
label { // inner label label { // inner label e.g. checkbox or radio label
color: $mdb-label-color-inner-focus; color: $mdb-label-color-inner-focus;
} }
} }
&.label-placeholder { &.label-placeholder {
label, label {
label.control-label {
color: $mdb-label-color; color: $mdb-label-color;
label { // inner label e.g. checkbox or radio label
color: $mdb-label-color-inner-focus;
}
} }
} }
@ -128,8 +136,23 @@
color: $mdb-label-color-inner-focus; color: $mdb-label-color-inner-focus;
} }
} }
// default floating size/location with an mdb-form-group
@include mdb-form-group-size-variant($font-size-base, $mdb-label-top-margin-base, $mdb-input-padding-y-base, $line-height, $mdb-label-as-placeholder-shim-base, "mdb-form-group default");
// sm floating size/location
//&.mdb-form-group-sm {
// @include mdb-form-group-size-variant($font-size-sm, $mdb-label-top-margin-sm, $mdb-input-padding-y-sm, $line-height-sm, $mdb-label-as-placeholder-shim-sm, "mdb-form-group sm");
//}
//
//// lg floating size/location
//&.mdb-form-group-lg {
// @include mdb-form-group-size-variant($font-size-lg, $mdb-label-top-margin-lg, $mdb-input-padding-y-lg, $line-height-lg, $mdb-label-as-placeholder-shim-lg, "mdb-form-group lg");
//}
} }
// default floating size/location without a form-group (will skip form-group styles, and just render default sizing variation)
//@include mdb-form-group-size-variant($font-size-base, $mdb-label-top-margin-base, $mdb-input-padding-y-base, $line-height, $mdb-label-as-placeholder-shim-base);
select { select {
&, &,
&.form-control { &.form-control {
@ -139,19 +162,6 @@ select {
} }
} }
// default floating size/location without a form-group (will skip form-group styles, and just render default sizing variation)
@include mdb-form-group-size-variant(null, $font-size-base, $mdb-label-top-margin-base, $mdb-input-padding-y-base, $line-height, $mdb-label-as-placeholder-shim-base);
// default floating size/location with a form-group (need margin etc from a default form-group)
@include mdb-form-group-size-variant(unquote(".mdb-form-group"), $font-size-base, $mdb-label-top-margin-base, $mdb-input-padding-y-base, $line-height, $mdb-label-as-placeholder-shim-base);
// sm floating size/location
@include mdb-form-group-size-variant(unquote(".mdb-form-group.mdb-form-group-sm"), $font-size-sm, $mdb-label-top-margin-sm, $mdb-input-padding-y-sm, $line-height-sm, $mdb-label-as-placeholder-shim-sm);
// lg floating size/location
@include mdb-form-group-size-variant(unquote(".mdb-form-group.mdb-form-group-lg"), $font-size-lg, $mdb-label-top-margin-lg, $mdb-input-padding-y-lg, $line-height-lg, $mdb-label-as-placeholder-shim-lg);
// Input files - hide actual input - requires specific markup in the sample. // Input files - hide actual input - requires specific markup in the sample.
//.mdb-form-group input[type=file] { //.mdb-form-group input[type=file] {
// opacity: 0; // opacity: 0;
@ -189,7 +199,7 @@ select {
// text-align: right; // text-align: right;
// } // }
// //
// label.control-label { // label {
// margin: 0; // margin: 0;
// } // }
//} //}

2
scss/_variables.scss
View File

@ -58,7 +58,7 @@ $contrast-factor: 40% !default;
//$mdb-input-underline-color: #d2d2d2 !default; //$mdb-input-underline-color: #d2d2d2 !default;
$mdb-label-static-size-ratio: 75 / 100 !default; $mdb-label-static-size-ratio: 75 / 100 !default;
$mdb-help-block-size-ratio: 75 / 100 !default; $mdb-help-size-ratio: 75 / 100 !default;
// FIXME: with #733 customization of bootstrap, consider how these could be based on the original bs customized variables // FIXME: with #733 customization of bootstrap, consider how these could be based on the original bs customized variables
// //

100
scss/mixins/_forms.scss
View File

@ -1,19 +1,19 @@
// must be broken out for reuse - webkit selector breaks firefox // must be broken out for reuse - webkit selector breaks firefox
@mixin label-static($label-top, $static-font-size, $static-line-height) { @mixin label-static($label-top, $static-font-size, $static-line-height) {
label.control-label { label {
top: $label-top; top: $label-top;
left: 0; left: 0;
// must repeat because the selector above is more specific than the general label sizing // must repeat because the selector above is more specific than the general label sizing
//font-size: $static-font-size; font-size: $static-font-size;
//line-height: $static-line-height; line-height: $static-line-height;
} }
} }
@mixin label-size-variant($placeholder-font-size, $vertical-padding, $line-height, $static-font-size, $static-line-height, $help-block-font-size) { @mixin label-size-variant($placeholder-font-size, $vertical-padding, $line-height, $static-font-size, $static-line-height, $help-font-size) {
.form-control { .form-control {
@include mdb-input-placeholder { @include mdb-input-placeholder {
font-size: $placeholder-font-size; font-size: $placeholder-font-size;
// line-height: $line-height; line-height: $line-height;
} }
// //
// // margin-bottom must be specified to give help-block vertical space. // // margin-bottom must be specified to give help-block vertical space.
@ -25,21 +25,21 @@
.checkbox label, .checkbox label,
.radio label, .radio label,
label { label {
//font-size: $placeholder-font-size; font-size: $placeholder-font-size;
//line-height: $line-height; line-height: $line-height;
} }
// smaller focused or static size // smaller focused or static size
label.control-label { label {
//font-size: $static-font-size; font-size: $static-font-size;
//line-height: $static-line-height; line-height: $static-line-height;
//margin: 16px 0 0 0; // std and lg //margin: 16px 0 0 0; // std and lg
} }
//.mdb-help { .mdb-help {
// margin-top: 0; // allow the input margin to set-off the top of the help-block margin-top: 0; // allow the input margin to set-off the top of the help-block
// font-size: $help-block-font-size; font-size: $help-font-size;
//} }
} }
@mixin mdb-form-color($label-color, $border-color) { @mixin mdb-form-color($label-color, $border-color) {
@ -92,54 +92,56 @@
} }
} }
@mixin mdb-form-group-size-variant($parent, $placeholder-font-size, $label-top-margin, $vertical-padding, $line-height, $label-as-placeholder-shim) { @mixin mdb-form-group-size-variant($font-size, $label-top-margin, $vertical-padding, $line-height, $label-as-placeholder-shim, $context: null) {
$static-font-size: ceil(($mdb-label-static-size-ratio * $placeholder-font-size)) !default; $static-font-size: ($mdb-label-static-size-ratio * $font-size) !default;
$static-line-height: ($mdb-label-static-size-ratio * $line-height) !default; $static-line-height: ($mdb-label-static-size-ratio * $line-height) !default;
$label-as-placeholder-top: -1 * ($vertical-padding + $label-as-placeholder-shim) !default; $label-as-placeholder-top: -1 * ($vertical-padding + $label-as-placeholder-shim) !default;
$label-top: $label-as-placeholder-top - ($placeholder-font-size + $vertical-padding) !default; $label-top: $label-as-placeholder-top - ($font-size + $vertical-padding) !default;
$help-block-font-size: ceil(($mdb-help-block-size-ratio * $placeholder-font-size)) !default; $help-font-size: ($mdb-help-size-ratio * $font-size) !default;
$help-block-line-height: ($mdb-help-block-size-ratio * $line-height) !default; $help-line-height: ($mdb-help-size-ratio * $line-height) !default;
@debug "font-size: #{$font-size} static-font-size: #{$static-font-size} help-font-size: #{$help-font-size} context: #{$context} ";
// this is outside a form-group // this is outside a form-group
@if not $parent { @if not $context {
@include label-size-variant($placeholder-font-size, $vertical-padding, $line-height, $static-font-size, $static-line-height, $help-block-font-size); @include label-size-variant($font-size, $vertical-padding, $line-height, $static-font-size, $static-line-height, $help-font-size);
} @else { } @else {
// this is inside a form-group, may be .mdb-form-group.mdb-form-group-sm or .mdb-form-group.mdb-form-group-lg // this is inside a form-group, may be .mdb-form-group.mdb-form-group-sm or .mdb-form-group.mdb-form-group-lg
#{$parent} { @include label-size-variant($font-size, $vertical-padding, $line-height, $static-font-size, $static-line-height, $help-font-size);
@include label-size-variant($placeholder-font-size, $vertical-padding, $line-height, $static-font-size, $static-line-height, $help-block-font-size);
// form-group padding-bottom // form-group padding-bottom
// upon collapsing margins, the largest margin is honored which collapses the form-control margin-bottom, // upon collapsing margins, the largest margin is honored which collapses the form-control margin-bottom,
// so the form-control margin-bottom must also be expressed as form-group padding // so the form-control margin-bottom must also be expressed as form-group padding
//padding-bottom: $vertical-padding; //padding-bottom: $vertical-padding;
// FIXME: need to avoid top margin http://v4-alpha.getbootstrap.com/content/reboot/#approach // FIXME: need to avoid top margin http://v4-alpha.getbootstrap.com/content/reboot/#approach
// form-group margin-top must be large enough for the label and the label's top padding since label is absolutely positioned // form-group margin-top must be large enough for the label and the label's top padding since label is absolutely positioned
//margin: ($label-top-margin + $static-font-size) 0 0 0; // old, try padding below //margin: ($label-top-margin + $static-font-size) 0 0 0; // old, try padding below
//padding-top: ($label-top-margin + $static-font-size); //padding-top: ($label-top-margin + $static-font-size);
// larger labels as placeholders // placeholder positioning
&.label-floating, &.label-floating,
&.label-placeholder { &.label-placeholder {
label.control-label { label,
top: $label-as-placeholder-top; // place the floating label to look like a placeholder with input padding label {
//font-size: $placeholder-font-size; @debug "top: #{$label-as-placeholder-top}";
//line-height: $line-height; top: $label-as-placeholder-top; // place the floating label to look like a placeholder with input padding
} //font-size: $placeholder-font-size;
//line-height: $line-height;
} }
}
// static, focused, or autofill floating labels // static, focused, or autofill floating labels
&.label-static, &.label-static,
&.label-floating.is-focused, &.label-floating.is-focused,
&.label-floating:not(.is-empty) { &.label-floating:not(.is-empty) {
@include label-static($label-top, $static-font-size, $static-line-height); @include label-static($label-top, $static-font-size, $static-line-height);
} }
// #559 Fix for webkit/chrome autofill - rule must be separate because it breaks firefox otherwise #731 // #559 Fix for webkit/chrome autofill - rule must be separate because it breaks firefox otherwise #731
&.label-floating input.form-control:-webkit-autofill ~ label.control-label { &.label-floating input.form-control:-webkit-autofill ~ label {
@include label-static($label-top, $static-font-size, $static-line-height); @include label-static($label-top, $static-font-size, $static-line-height);
}
} }
} }
} }