diff --git a/src/assets/scss/components/_field.scss b/src/assets/scss/components/_field.scss index 70b1393..0b5aff5 100644 --- a/src/assets/scss/components/_field.scss +++ b/src/assets/scss/components/_field.scss @@ -20,14 +20,14 @@ $input-field-btn-border-color: $input-border-color !default; @mixin radii($selector) { // the first and the last inputs should be rounded - &:first-child { + &:first-child:not(:last-child) { #{$selector} { border-bottom-right-radius: 0; border-top-right-radius: 0; } } - &:last-child { + &:last-child:not(:first-child) { #{$selector} { border-bottom-left-radius: 0; border-top-left-radius: 0; diff --git a/src/assets/scss/components/_input.scss b/src/assets/scss/components/_input.scss index 21f30f9..166adb4 100644 --- a/src/assets/scss/components/_input.scss +++ b/src/assets/scss/components/_input.scss @@ -2,19 +2,9 @@ $input-icon-color: $input-color !default; $input-icon-spacer: 0.75rem !default; -$input-icon-left-padding-sm: $input-btn-padding-y-sm $input-btn-padding-x-sm - $input-btn-padding-y-sm 2rem !default; -$input-icon-left-padding: $input-btn-padding-y $input-btn-padding-x - $input-btn-padding-y 2.5rem !default; -$input-icon-left-padding-lg: $input-btn-padding-y-lg $input-btn-padding-x-lg - $input-btn-padding-y-lg 3rem !default; - -$input-icon-right-padding-sm: $input-btn-padding-y-sm 2rem - $input-btn-padding-y-sm $input-btn-padding-x-sm !default; -$input-icon-right-padding: $input-btn-padding-y 2.5rem $input-btn-padding-y - $input-btn-padding-x !default; -$input-icon-right-padding-lg: $input-btn-padding-y-lg 3rem - $input-btn-padding-y-lg $input-btn-padding-x-lg !default; +$input-icon-padding-sm: 2rem !default; +$input-icon-padding: 2.5rem !default; +$input-icon-padding-lg: 3rem !default; /* @docs */ /* @bootstrap docs */ @@ -150,32 +140,24 @@ $input-icon-right-padding-lg: $input-btn-padding-y-lg 3rem // Space for the icon .form-select, .form-control { + --#{$prefix}input-icon-padding: #{$input-icon-padding}; + + &.form-control-sm { + --#{$prefix}input-icon-padding: #{$input-icon-padding-sm}; + } + // if icon and the input are large, we give more space to icon + &.form-control-lg { + --#{$prefix}input-icon-padding: #{$input-icon-padding-lg}; + } + // if the icon is in left then set that padding &.icon-left { - --#{$prefix}input-icon-left-padding: #{$input-icon-left-padding}; - padding: var(--#{$prefix}input-icon-left-padding); - // if icon and the input are large, we give more space to icon - &.form-control-sm { - --#{$prefix}input-icon-left-padding: #{$input-icon-left-padding-sm}; - } - // if icon and the input are large, we give more space to icon - &.form-control-lg { - --#{$prefix}input-icon-left-padding: #{$input-icon-left-padding-lg}; - } + padding-left: var(--#{$prefix}input-icon-padding); } // if the icon is in right then set that padding &.icon-right { - --#{$prefix}input-icon-right-padding: #{$input-icon-right-padding}; - padding: var(--#{$prefix}input-icon-right-padding); - // if icon and the input are large, we give more space to icon - &.form-control-sm { - --#{$prefix}input-icon-right-padding: #{$input-icon-right-padding-sm}; - } - // if icon and the input are large, we give more space to icon - &.form-control-lg { - --#{$prefix}input-icon-right-padding: #{$input-icon-right-padding-lg}; - } + padding-right: var(--#{$prefix}input-icon-padding); } } @@ -186,37 +168,16 @@ $input-icon-right-padding-lg: $input-btn-padding-y-lg 3rem position: absolute; margin: 0; + top: 0; + height: 100%; color: var(--#{$prefix}input-icon-color); &.icon-left { - top: 12px; left: var(--#{$prefix}input-icon-spacer); } &.icon-right { - top: 12px; right: var(--#{$prefix}input-icon-spacer); } - - &.size-small { - &.icon-left, - &.icon-right { - top: 15px; - } - } - - &.size-medium { - &.icon-left, - &.icon-right { - top: 17px; - } - } - - &.size-large { - &.icon-left, - &.icon-right { - top: 8px; - } - } } }