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

Adds lab icon and updates beta badge style #1291

Merged
merged 4 commits into from
Nov 6, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Added `beaker` icon to `EuiIcon` and updated the `EuiBetaBadge` styling ([#1291](https://github.com/elastic/eui/pull/1291/))
- Removed calls to deprecated `findDOMNode` ([#1285](https://github.com/elastic/eui/pull/1285))

**Breaking changes**
Expand Down
2 changes: 1 addition & 1 deletion src-docs/src/views/badge/beta_badge.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default () => (
 
<EuiBetaBadge label="Lab" title="Laboratory" tooltipContent="This module is not GA. Please help us by reporting any bugs." />
&emsp;
<EuiBetaBadge label="Lightening" iconType="bolt" />
<EuiBetaBadge label="Lab" iconType="beaker" />

<EuiSpacer />
<EuiTitle>
Expand Down
1 change: 1 addition & 0 deletions src-docs/src/views/icon/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const iconTypes = [
'arrowRight',
'arrowUp',
'asterisk',
'beaker',
'bolt',
'boxesHorizontal',
'boxesVertical',
Expand Down
6 changes: 2 additions & 4 deletions src/components/badge/beta_badge/_beta_badge.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
.euiBetaBadge {
display: inline-block;
padding: 0 $euiSizeL;
padding: 0 $euiSize;
border-radius: $euiSizeL;
background-color: $euiColorAccent;
box-shadow: inset 0 0 0 1px $euiBorderColor;
vertical-align: super; // if displayed inline with text
@include euiSlightShadowHover($euiColorAccent);

font-size: $euiFontSizeXS;
font-weight: $euiFontWeightBold;
text-transform: uppercase;
letter-spacing: .05em;
color: chooseLightOrDarkText($euiColorAccent, $euiColorEmptyShade, $euiColorFullShade);
line-height: $euiSizeL;
text-align: center;
white-space: nowrap;
Expand Down
1 change: 1 addition & 0 deletions src/components/badge/beta_badge/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
.#{$selector}__betaBadge {
overflow: hidden;
text-overflow: ellipsis;
background-color: $euiColorEmptyShade;
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/icon/assets/beaker.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/components/icon/icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import arrowRight from './assets/arrow_right.svg';
import arrowUp from './assets/arrow_up.svg';
import asterisk from './assets/asterisk.svg';
import auditbeatApp from './assets/app_auditbeat.svg';
import beaker from './assets/beaker.svg';
import bolt from './assets/bolt.svg';
import boxesHorizontal from './assets/boxes_horizontal.svg';
import boxesVertical from './assets/boxes_vertical.svg';
Expand Down Expand Up @@ -250,6 +251,7 @@ const typeToIconMap = {
arrowRight,
arrowUp,
asterisk,
beaker,
bolt,
boxesHorizontal,
boxesVertical,
Expand Down
1 change: 1 addition & 0 deletions src/components/icon/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ declare module '@elastic/eui' {
| 'kqlOperand'
| 'kqlSelector'
| 'kqlValue'
| 'lab'
| 'link'
| 'list'
| 'listAdd'
Expand Down