Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(input): fix input icon size & field border #59

Merged
merged 2 commits into from
Jul 12, 2023
Merged

fix(input): fix input icon size & field border #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77bdf29
update input icon sizing
mlmoravek Jul 11, 2023
634b732
fix field border bug
mlmoravek Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/assets/scss/components/_field.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
73 changes: 17 additions & 56 deletions src/assets/scss/components/_input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
}
}

Expand All @@ -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;
}
}
}
}