Skip to content

Commit

Permalink
Merge branch 'master' into 4784-remove-tab-keyboard-handler-prevent-d…
Browse files Browse the repository at this point in the history
…efault
  • Loading branch information
tw15egan authored Jan 22, 2020
2 parents 19e73d8 + 9b7b907 commit fa451c8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions packages/components/src/components/dropdown/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
border: none;
border-bottom: 1px solid $ui-04;
width: 100%;
height: rem(40px);
cursor: pointer;
color: $text-01;
outline: 2px solid transparent;
Expand Down
7 changes: 4 additions & 3 deletions packages/components/src/components/modal/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
.#{$prefix}--modal {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: z('modal');
display: flex;
align-items: center;
justify-content: center;
width: 100vw;
height: 100vh;
content: '';
background-color: transparent;
opacity: 0;
Expand All @@ -56,7 +56,8 @@
.#{$prefix}--select-input,
.#{$prefix}--dropdown,
.#{$prefix}--dropdown-list,
.#{$prefix}--number input[type='number'] {
.#{$prefix}--number input[type='number'],
.#{$prefix}--date-picker__input {
background-color: $field-02;
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/Tabs/Tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export default class Tabs extends React.Component {

/**
* Specify whether the Tab content is hidden
*/
hidden: PropTypes.bool,

/**
Expand Down

0 comments on commit fa451c8

Please sign in to comment.