Skip to content

Commit

Permalink
[Code] Search results are fixed to top of page (#45182)
Browse files Browse the repository at this point in the history
* Fix main search bar to top of screen

By allowing overflow on the main content, we implicitly fix the sibling
search bar in position.

elastic/code#1606

* Allow search suggestion text to be truncated

This gives the parent element a width, so that our text-overflow
rules apply to these elements.

See https://bugzilla.mozilla.org/show_bug.cgi?id=1086218#c4 for details
on the issue.

* Fix alignment issue with overflowed search suggestions

If both the icon and the text are allowed to grow/shrink as needed,
flexbox will grow truncated text based on its original width, leading to
subtle sub-pixel alignment issues with other rows.

By fixing the icon to a specific width, we can ensure that the
suggestion text does not grow too big.

* Remove unneeded CSS

We don't need to flex these elements currently as they contain either no
children or inline elements only.

* style: prefer camelCase element names over hyphens

* Fix search result suggestion overflow on IE

Without this directive on the parent, it had no width or flex growth and
didn't respect the parent width. This allows it to take on the correct
flexed width, and thus take on the overflow rules.

* Remove unused CSS rule

We have an overriding align-items declaration immediately after this
one.
  • Loading branch information
rylnd authored Sep 11, 2019
1 parent de7da0c commit 98b652b
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 20 deletions.
18 changes: 6 additions & 12 deletions x-pack/legacy/plugins/code/public/components/main/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,18 @@

.codeSearch-suggestion--inner {
display: flex;
align-items: stretch;
flex-grow: 1;
align-items: center;
white-space: nowrap;
}

.codeSearch__suggestionTextContainer {
min-width: 0;
flex: 1;
}

.codeSearch__suggestion-text {
color: $euiColorFullShade;
display: flex;
flex-direction: column;
flex-grow: 0;
flex-basis: auto;
font-family: $euiCodeFontFamily;
margin-right: $euiSizeXL;
width: auto;
Expand Down Expand Up @@ -228,10 +228,6 @@
}

.codeSearch-suggestion__description {
flex-grow: 1;
flex-basis: 0%;
display: flex;
flex-direction: column;
color: $euiColorDarkShade;
overflow: hidden;
text-overflow: ellipsis;
Expand All @@ -242,9 +238,7 @@
.codeSearch-suggestion__token {
color: $euiColorFullShade;
box-sizing: border-box;
flex-grow: 0;
flex-basis: auto;
width: $euiSizeXL;
flex: 0 0 $euiSizeXL;
height: $euiSizeXL;
text-align: center;
overflow: hidden;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const SuggestionComponent: SFC<Props> = props => {
>
<div className="codeSearch-suggestion--inner">
{icon}
<div>
<div className="codeSearch__suggestionTextContainer">
<div className="codeSearch__suggestion-text" data-test-subj={`codeTypeaheadItem`}>
{renderMatchingText(props.suggestion.text)}
</div>
Expand Down
1 change: 1 addition & 0 deletions x-pack/legacy/plugins/code/public/style/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
}

.codeContainer__adminMain {
overflow: auto;
padding: $euiSize $euiSizeXL;
}

Expand Down

0 comments on commit 98b652b

Please sign in to comment.