mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2025-07-26 16:09:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issue #957

Browse Source
This commit is contained in:
Jörg Riemenschneider 2017-05-09 23:22:42 +02:00
parent 38d19b2818
commit 8fde68df7d
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scss/mixins/_drawer.scss
View File

@ -2,7 +2,7 @@
@mixin bmd-drawer-x-out($size) { @mixin bmd-drawer-x-out($size) {
@each $side, $abbrev in (left: l, right: r) { @each $side, $abbrev in (left: l, right: r) {
&.bmd-drawer-f-#{$abbrev} { @at-root #{if(not &, '.bmd-drawer-f-#{$abbrev}', selector-append(&, '.bmd-drawer-f-#{$abbrev}'))} {
> .bmd-layout-drawer { > .bmd-layout-drawer {
// position // position
top: 0; top: 0;
@ -28,7 +28,7 @@
@mixin bmd-drawer-y-out($size) { @mixin bmd-drawer-y-out($size) {
@each $side, $abbrev in (top: t, bottom: b) { @each $side, $abbrev in (top: t, bottom: b) {
&.bmd-drawer-f-#{$abbrev} { @at-root #{if(not &, '.bmd-drawer-f-#{$abbrev}', selector-append(&, '.bmd-drawer-f-#{$abbrev}'))} {
> .bmd-layout-drawer { > .bmd-layout-drawer {
// position // position
#{$side}: 0; #{$side}: 0;
@ -62,7 +62,7 @@
@mixin bmd-drawer-x-in($size) { @mixin bmd-drawer-x-in($size) {
@each $side, $abbrev in (left: l, right: r) { @each $side, $abbrev in (left: l, right: r) {
&.bmd-drawer-f-#{$abbrev} { @at-root #{if(not &, '.bmd-drawer-f-#{$abbrev}', selector-append(&, '.bmd-drawer-f-#{$abbrev}'))} {
// Push - drawer will push the header and content (default behavior) // Push - drawer will push the header and content (default behavior)
> .bmd-layout-header { > .bmd-layout-header {
width: calc(100% - #{$size}); width: calc(100% - #{$size});
@ -82,8 +82,7 @@
@mixin bmd-drawer-y-in($size) { @mixin bmd-drawer-y-in($size) {
@each $side, $abbrev in (top: t, bottom: b) { @each $side, $abbrev in (top: t, bottom: b) {
&.bmd-drawer-f-#{$abbrev} { @at-root #{if(not &, '.bmd-drawer-f-#{$abbrev}', selector-append(&, '.bmd-drawer-f-#{$abbrev}'))} {
// 1. Push - drawer will push the header or content // 1. Push - drawer will push the header or content
> .bmd-layout-header { > .bmd-layout-header {
@if $side == top { // only add margin-top on a header when the drawer is at the top @if $side == top { // only add margin-top on a header when the drawer is at the top

13
scss/mixins/_forms.scss
View File

@ -118,10 +118,9 @@
} }
} }
.is-focused, // may or may not be a form-group or bmd-form-group // may or may not be a form-group or bmd-form-group
&.is-focused { @at-root #{if(not &, 'is-focused', selector-append(&, 'is-focused'))} {
// on focus set borders and labels to the validation color // on focus set borders and labels to the validation color
// Use the BS provided mixin for the bulk of the color // Use the BS provided mixin for the bulk of the color
@include form-control-validation($label-color); @include form-control-validation($label-color);
@ -143,7 +142,6 @@
//.input-group-addon { //.input-group-addon {
// border-color: $border-color; // border-color: $border-color;
//} //}
.bmd-help { .bmd-help {
color: $bmd-label-color-inner-focus; color: $bmd-label-color-inner-focus;
} }
@ -233,14 +231,13 @@
} }
// floating focused/filled will look like static // floating focused/filled will look like static
&.is-focused, @each $sel in '.is-focused', 'is-filled' {
.is-focused, @at-root #{if(not &, $sel, selector-append(&, $sel))} {
&.is-filled,
.is-filled {
.bmd-label-floating { .bmd-label-floating {
@include bmd-label-static($label-static-top, $static-font-size); @include bmd-label-static($label-static-top, $static-font-size);
} }
} }
}
// static // static
.bmd-label-static { .bmd-label-static {