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.

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

[Feature Branch] Update compressed form control styles #2174

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exports[`renders EuiColorPicker 1`] = `
<input
aria-label="Press the down key to open a popover containing color options"
autocomplete="off"
class="euiFieldText euiFieldText--withIcon"
class="euiFieldText euiColorPicker__input euiFieldText--withIcon"
data-test-subj="colorPickerAnchor"
maxlength="7"
type="text"
Expand Down Expand Up @@ -99,7 +99,7 @@ exports[`renders EuiColorPicker with a color swatch when color is defined 1`] =
<input
aria-label="Press the down key to open a popover containing color options"
autocomplete="off"
class="euiFieldText euiFieldText--withIcon"
class="euiFieldText euiColorPicker__input euiFieldText--withIcon"
data-test-subj="colorPickerAnchor"
maxlength="7"
type="text"
Expand Down Expand Up @@ -171,7 +171,7 @@ exports[`renders EuiColorPicker with an empty swatch when color is "" 1`] = `
<input
aria-label="Press the down key to open a popover containing color options"
autocomplete="off"
class="euiFieldText euiFieldText--withIcon"
class="euiFieldText euiColorPicker__input euiFieldText--withIcon"
data-test-subj="colorPickerAnchor"
maxlength="7"
placeholder="Transparent"
Expand Down Expand Up @@ -244,7 +244,7 @@ exports[`renders EuiColorPicker with an empty swatch when color is null 1`] = `
<input
aria-label="Press the down key to open a popover containing color options"
autocomplete="off"
class="euiFieldText euiFieldText--withIcon"
class="euiFieldText euiColorPicker__input euiFieldText--withIcon"
data-test-subj="colorPickerAnchor"
maxlength="7"
placeholder="Transparent"
Expand Down Expand Up @@ -319,7 +319,7 @@ exports[`renders compressed EuiColorPicker 1`] = `
<input
aria-label="Press the down key to open a popover containing color options"
autocomplete="off"
class="euiFieldText euiFieldText--withIcon euiFieldText--compressed"
class="euiFieldText euiColorPicker__input euiFieldText--withIcon euiFieldText--compressed"
data-test-subj="colorPickerAnchor"
maxlength="7"
type="text"
Expand Down Expand Up @@ -393,7 +393,7 @@ exports[`renders disabled EuiColorPicker 1`] = `
<input
aria-label="Press the down key to open a popover containing color options"
autocomplete="off"
class="euiFieldText euiFieldText--withIcon"
class="euiFieldText euiColorPicker__input euiFieldText--withIcon"
data-test-subj="colorPickerAnchor"
disabled=""
maxlength="7"
Expand Down Expand Up @@ -468,7 +468,7 @@ exports[`renders fullWidth EuiColorPicker 1`] = `
<input
aria-label="Press the down key to open a popover containing color options"
autocomplete="off"
class="euiFieldText euiFieldText--withIcon euiFieldText--fullWidth"
class="euiFieldText euiColorPicker__input euiFieldText--withIcon euiFieldText--fullWidth"
data-test-subj="colorPickerAnchor"
maxlength="7"
type="text"
Expand Down Expand Up @@ -542,7 +542,7 @@ exports[`renders readOnly EuiColorPicker 1`] = `
<input
aria-label="Press the down key to open a popover containing color options"
autocomplete="off"
class="euiFieldText euiFieldText--withIcon"
class="euiFieldText euiColorPicker__input euiFieldText--withIcon"
data-test-subj="colorPickerAnchor"
maxlength="7"
readonly=""
Expand Down
15 changes: 15 additions & 0 deletions src/components/color_picker/_color_picker.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
@import '../form/mixins';

.euiColorPicker {
position: relative;
// 5 columns of swatches + margins + border
width: ($euiSizeL * 5) + ($euiSizeS * 4);

}

.euiColorPicker__popoverAnchor {
// Nested needed for specificity of overriding .euiFieldText
.euiColorPicker__input {
@include euiFormControlWithIcon($isIconOptional: false, $side: 'right');

&[class*='--compressed'] {
@include euiFormControlWithIcon($isIconOptional: false, $side: 'right', $compressed: true);
}
}
}



// Adds a stroke color for the swatchInput icon. Unlike most EuiIcons it has a stroke in the SVG
.euiSwatchInput__stroke {
fill: none;
Expand Down
1 change: 1 addition & 0 deletions src/components/color_picker/color_picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ export const EuiColorPicker = ({
]}>
{([openLabel, closeLabel]) => (
<EuiFieldText
className="euiColorPicker__input"
onClick={handleInputActivity}
onKeyDown={handleInputActivity}
value={color ? color.toUpperCase() : ''}
Expand Down
9 changes: 7 additions & 2 deletions src/components/combo_box/_combo_box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}

.euiComboBox__inputWrap {
@include euiFormControlStyle($includeStates: false, $includeSizes: false);
@include euiFormControlStyle($includeStates: false, $includeSizes: true);
@include euiFormControlWithIcon($isIconOptional: true);
@include euiFormControlSize(auto, $includeAlternates: true);
padding: $euiSizeXS $euiSizeS;
Expand Down Expand Up @@ -54,7 +54,7 @@
.euiComboBox__input {
// sass-lint:disable-block no-important
display: inline-flex !important; /* 1 */
height: 32px; /* 2 */
height: $euiSizeXL; /* 2 */
overflow: hidden; /* 5 */

> input {
Expand All @@ -73,6 +73,10 @@
&.euiComboBox-isOpen {
.euiComboBox__inputWrap {
@include euiFormControlFocusStyle;

&--compressed {
@include euiFormControlFocusStyle($borderOnly: true);
}
}
}

Expand All @@ -90,6 +94,7 @@

&.euiComboBox--compressed {
.euiComboBox__inputWrap {
// height: $euiFormControlCompressedHeight; /* 2 */
line-height: $euiFormControlCompressedHeight; /* 2 */
padding-top: 0;
padding-bottom: 0;
Expand Down
18 changes: 15 additions & 3 deletions src/components/combo_box/combo_box_input/_combo_box_pill.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
// Overwrites the base styling of EuiBadge, to give it a larger size and margins
// that make sense in the input wrap.
/*
* 1. Overwrites the base styling of EuiBadge, to give it a larger size and margins
* that make sense in the input wrap.
*/
.euiComboBoxPill {
margin: $euiSizeXS !important; // sass-lint:disable-line no-important
height: $euiSizeL - 2px;
line-height: $euiSizeL - 2px;
vertical-align: baseline;

&,
& + & /* 1 */ {
margin: $euiSizeXS;
}

.euiComboBox--compressed &,
.euiComboBox--compressed & + & /* 1 */ {
margin: $euiSizeXS $euiSizeXS 0 0;
}

&--plainText {
@include euiFont;
@include euiTextTruncate;
Expand Down
4 changes: 4 additions & 0 deletions src/components/date_picker/_date_picker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
// This is mostly here so that we can provide an inline version that doesn't have the
// shadows and depth.
.euiDatePicker {
.euiFormControlLayout {
height: auto;
}

&.euiDatePicker--shadow {
.react-datepicker-popper {
@include euiBottomShadowMedium;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

exports[`EuiQuickSelectPopover is rendered 1`] = `
<EuiPopover
anchorClassName="euiQuickSelectPopover__anchor"
anchorPosition="downLeft"
button={
<EuiButtonEmpty
Expand Down Expand Up @@ -89,6 +90,7 @@ exports[`EuiQuickSelectPopover is rendered 1`] = `

exports[`EuiQuickSelectPopover isAutoRefreshOnly 1`] = `
<EuiPopover
anchorClassName="euiQuickSelectPopover__anchor"
anchorPosition="downLeft"
button={
<EuiButtonEmpty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@
// Override specificity from universal and sibiling selectors
margin-right: $euiSizeXS !important;
}

.euiQuickSelectPopover__anchor {
height: 100%;
}
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export class EuiQuickSelectPopover extends Component {
isOpen={this.state.isOpen}
closePopover={this.closePopover}
anchorPosition="downLeft"
anchorClassName="euiQuickSelectPopover__anchor"
ownFocus>
<div
className="euiQuickSelectPopover__content"
Expand Down
50 changes: 34 additions & 16 deletions src/components/form/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import 'variables';
@import 'form_control_layout/variables';
@import 'form_control_layout/mixins';

@mixin euiPlaceholderPerBrowser {
// sass-lint:disable-block no-vendor-prefixes
Expand All @@ -21,7 +22,6 @@
}

/**
* 2. Account for inner box-shadow style border when in group
* 3. Must supply both values to background-size or some browsers apply the single value to both directions
*/

Expand All @@ -37,7 +37,6 @@
}
}


@mixin euiFormControlSize(
$height: $euiFormControlHeight,
$includeAlternates: false
Expand All @@ -56,25 +55,21 @@
height: $euiFormControlCompressedHeight;
}

&--inGroup:not(:read-only) {
height: $euiFormControlLayoutGroupInputHeight; /* 2 */
}

&--inGroup#{&}--compressed:not(:read-only) {
height: $euiFormControlLayoutGroupInputCompressedHeight; /* 2 */
&--inGroup {
height: 100%;
}
}
}

@mixin euiFormControlWithIcon($isIconOptional: false, $side: 'left') {
@mixin euiFormControlWithIcon($isIconOptional: false, $side: 'left', $compressed: false) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

@if ($isIconOptional) {
@at-root {
#{&}--withIcon {
@include euiFormControlLayoutPadding(1, $side);
@include euiFormControlLayoutPadding(1, $side, $compressed);
}
}
} @else {
@include euiFormControlLayoutPadding(1, $side);
@include euiFormControlLayoutPadding(1, $side, $compressed);
}
}

Expand Down Expand Up @@ -172,25 +167,49 @@
border-radius: 0;
padding: $euiFormControlPadding;

@if ($includeStates) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

&:invalid { /* 4 */
@include euiFormControlInvalidStyle;
}

&:focus { /* 4 */
@include euiFormControlFocusStyle;
}

&:disabled {
@include euiFormControlDisabledStyle;
}

&[readOnly] {
@include euiFormControlReadOnlyStyle;
}
}

@if ($includeSizes) {
&--compressed {
padding-top: $euiFormControlCompressedPadding;
padding-bottom: $euiFormControlCompressedPadding;
@include euiFormControlStyleCompressed($borderOnly, $includeStates);
}

&--inGroup {
// sass-lint:disable-block no-important
box-shadow: none !important;
border-radius: 0;
}
}
}

@mixin euiFormControlStyleCompressed($borderOnly: false, $includeStates: true) {
@include euiFormControlDefaultShadow($borderOnly: true);
padding: $euiFormControlCompressedPadding;
border-radius: $euiFormControlCompressedBorderRadius;

@if ($includeStates) {
&:invalid { /* 4 */
@include euiFormControlInvalidStyle;
}

&:focus { /* 4 */
@include euiFormControlFocusStyle;
@include euiFormControlFocusStyle($borderOnly: true);
}

&:disabled {
Expand All @@ -201,7 +220,6 @@
@include euiFormControlReadOnlyStyle;
}
}

}

// Custom styles and states for checkboxes and radios
Expand Down Expand Up @@ -248,4 +266,4 @@
@mixin euiCustomControlFocused {
@include euiFocusRing;
border-color: $euiColorPrimary;
}
}
5 changes: 3 additions & 2 deletions src/components/form/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $euiFormControlHeight: $euiSizeXXL !default;
$euiFormControlCompressedHeight: $euiSizeXL !default;
$euiFormControlPadding: $euiSizeM !default;
$euiFormControlCompressedPadding: $euiSizeS !default;
$euiFormControlCompressedBorderRadius: $euiBorderRadius / 2 !default;

$euiRadioSize: $euiSize !default;
$euiCheckBoxSize: $euiSize !default;
Expand All @@ -21,5 +22,5 @@ $euiFormBorderColor: transparentize($euiFormBorderOpaqueColor, .9) !default;
$euiFormBorderDisabledColor: transparentize($euiFormBorderOpaqueColor, .9) !default;
$euiFormCustomControlDisabledIconColor: shadeOrTint($euiColorMediumShade, 38%, 48.5%) !default; // exact 508c foreground for $euiColorLightShade
$euiFormControlDisabledColor: $euiColorMediumShade !default;
$euiFormControlBoxShadow: 0 1px 1px -1px transparentize($euiShadowColor, .8), 0 3px 2px -2px transparentize($euiShadowColor, .8);
$euiFormInputGroupLabelBackground: shadeOrTint($euiFormBackgroundDisabledColor, 0, 3%);
$euiFormControlBoxShadow: 0 1px 1px -1px transparentize($euiShadowColor, .8), 0 3px 2px -2px transparentize($euiShadowColor, .8) !default;
$euiFormInputGroupLabelBackground: shadeOrTint($euiFormBackgroundDisabledColor, 0, 3%) !default;
4 changes: 4 additions & 0 deletions src/components/form/field_number/_field_number.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
@include euiFormControlWithIcon($isIconOptional: true);
@include euiFormControlIsLoading;
}

.euiFieldNumber--withIcon.euiFieldNumber--compressed {
@include euiFormControlWithIcon($isIconOptional: false, $side: 'left', $compressed: true);
}
4 changes: 4 additions & 0 deletions src/components/form/field_password/_field_password.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
@include euiFormControlStyle;
@include euiFormControlWithIcon($isIconOptional: false);
@include euiFormControlIsLoading;

&.euiFieldPassword--compressed {
@include euiFormControlWithIcon($isIconOptional: false, $side: 'left', $compressed: true);
}
}
4 changes: 4 additions & 0 deletions src/components/form/field_search/_field_search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@
&::-webkit-search-decoration {
-webkit-appearance: none; /* 1 */
}

&.euiFieldSearch--compressed {
@include euiFormControlWithIcon($isIconOptional: false, $side: 'left', $compressed: true);
}
}
4 changes: 4 additions & 0 deletions src/components/form/field_text/_field_text.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@
@include euiFormControlInvalidStyle;
}
}

.euiFieldText--withIcon.euiFieldText--compressed {
@include euiFormControlWithIcon($isIconOptional: false, $side: 'left', $compressed: true);
}
Loading