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

Fixed EuiComboBox padding on the right #2135

Merged
merged 3 commits into from
Jul 17, 2019
Merged

Fixed EuiComboBox padding on the right #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3edbee6
Fix EuiComboBox padding on the right
Jul 10, 2019
99e05d9
cl
Jul 17, 2019
419a724
Update src/components/combo_box/_combo_box.scss
cchaos Jul 17, 2019
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: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## [`master`](https://github.com/elastic/eui/tree/master)

No public interface changes since `12.4.0`.
**Bug fixes**

- Fixed `EuiComboBox`'s padding on the right ([#2135](https://github.com/elastic/eui/pull/2135))

## [`12.4.0`](https://github.com/elastic/eui/tree/v12.4.0)

Expand Down
19 changes: 12 additions & 7 deletions src/components/combo_box/_combo_box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../form/form_control_layout/mixins';

.euiComboBox {
@include euiFormControlSize(auto, $includeAlternates: true);
position: relative;
Expand All @@ -18,17 +20,16 @@
@include euiFormControlWithIcon($isIconOptional: true);
@include euiFormControlSize(auto, $includeAlternates: true);
padding: $euiSizeXS $euiSizeS;
// sass-lint:disable-block mixins-before-declarations
@include euiFormControlLayoutPadding(1); /* 2 */

display: flex; /* 1 */

&.euiComboBox__inputWrap-isClearable {
@include euiFormControlLayoutPadding(2); /* 2 */
}
// sass-lint:disable-block mixins-before-declarations
// to override the padding added above
@include euiFormControlLayoutPadding(1); /* 2 */

&:not(.euiComboBox__inputWrap--noWrap) {
padding: $euiSizeXS;
padding-top: $euiSizeXS;
padding-bottom: $euiSizeXS;
padding-left: $euiSizeXS;
height: auto; /* 3 */
flex-wrap: wrap; /* 1 */
align-content: flex-start;
Expand All @@ -37,6 +38,10 @@
cursor: text;
}
}

&.euiComboBox__inputWrap-isClearable {
@include euiFormControlLayoutPadding(2); /* 2 */
}
}

/**
Expand Down