Skip to content

Commit

Permalink
Merge branch 'master' into loading-explicit-id
Browse files Browse the repository at this point in the history
  • Loading branch information
asudoh authored Apr 3, 2020
2 parents d149792 + acf0592 commit 6d95d48
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 4 deletions.
30 changes: 27 additions & 3 deletions packages/components/docs/sass.md
Original file line number Diff line number Diff line change
Expand Up @@ -3523,6 +3523,7 @@ $carbon--spacing-08: 2.5rem;
- **Used by**:
- [snippet [mixin]](#snippet-mixin)
- [listbox [mixin]](#listbox-mixin)
- [inline-notifications [mixin]](#inline-notifications-mixin)
- [search [mixin]](#search-mixin)
- [text-area [mixin]](#text-area-mixin)
- [text-input [mixin]](#text-input-mixin)
Expand All @@ -3548,6 +3549,7 @@ $carbon--spacing-09: 3rem;
- [file-uploader [mixin]](#file-uploader-mixin)
- [listbox [mixin]](#listbox-mixin)
- [modal [mixin]](#modal-mixin)
- [inline-notifications [mixin]](#inline-notifications-mixin)
- [tile [mixin]](#tile-mixin)

### ✅carbon--spacing-10 [variable]
Expand Down Expand Up @@ -19491,7 +19493,8 @@ Modal styles
}

.#{$prefix}--modal-container {
position: relative;
position: fixed;
top: 0;
display: grid;
grid-template-rows: auto 1fr auto;
grid-template-columns: auto;
Expand All @@ -19508,6 +19511,7 @@ Modal styles
transition: transform $duration--moderate-02 motion(exit, expressive);

@include carbon--breakpoint(md) {
position: static;
width: 84%;
max-height: 90%;
height: auto;
Expand Down Expand Up @@ -19874,6 +19878,7 @@ Inline notification styles
@include reset;

display: flex;
flex-wrap: wrap;
position: relative;
height: auto;
min-height: rem(48px);
Expand All @@ -19886,6 +19891,7 @@ Inline notification styles

@include carbon--breakpoint(md) {
max-width: rem(608px);
flex-wrap: nowrap;
}

@include carbon--breakpoint(lg) {
Expand Down Expand Up @@ -20008,7 +20014,11 @@ Inline notification styles
.#{$prefix}--inline-notification__details {
display: flex;
flex-grow: 1;
margin: 0 $carbon--spacing-05;
margin: 0 $carbon--spacing-09 0 $carbon--spacing-05;

@include carbon--breakpoint(md) {
margin: 0 $carbon--spacing-05;
}
}

.#{$prefix}--inline-notification__icon {
Expand All @@ -20035,7 +20045,12 @@ Inline notification styles

.#{$prefix}--inline-notification__action-button.#{$prefix}--btn--ghost {
height: rem(32px);
margin: $carbon--spacing-03 0;
margin-bottom: $carbon--spacing-03;
margin-left: $carbon--spacing-08;

@include carbon--breakpoint(md) {
margin: $carbon--spacing-03 0;
}

&,
&:hover,
Expand All @@ -20062,6 +20077,9 @@ Inline notification styles

.#{$prefix}--inline-notification__close-button {
@include focus-outline('reset');
position: absolute;
top: 0;
right: 0;
display: flex;
flex-direction: column;
justify-content: center;
Expand All @@ -20085,6 +20103,10 @@ Inline notification styles
.#{$prefix}--inline-notification__close-icon {
fill: $inverse-01;
}

@include carbon--breakpoint(md) {
position: static;
}
}

.#{$prefix}--inline-notification--low-contrast {
Expand Down Expand Up @@ -20128,8 +20150,10 @@ Inline notification styles
- [support-04 [variable]](#support-04-variable)
- [inverse-support-03 [variable]](#inverse-support-03-variable)
- [support-03 [variable]](#support-03-variable)
- [carbon--spacing-09 [variable]](#carbon--spacing-09-variable)
- [carbon--spacing-02 [variable]](#carbon--spacing-02-variable)
- [carbon--spacing-03 [variable]](#carbon--spacing-03-variable)
- [carbon--spacing-08 [variable]](#carbon--spacing-08-variable)
- [inverse-focus-ui [variable]](#inverse-focus-ui-variable)
- [inverse-hover-ui [variable]](#inverse-hover-ui-variable)

Expand Down
4 changes: 3 additions & 1 deletion packages/components/src/components/modal/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
}

.#{$prefix}--modal-container {
position: relative;
position: fixed;
top: 0;
display: grid;
grid-template-rows: auto 1fr auto;
grid-template-columns: auto;
Expand All @@ -84,6 +85,7 @@
transition: transform $duration--moderate-02 motion(exit, expressive);

@include carbon--breakpoint(md) {
position: static;
width: 84%;
max-height: 90%;
height: auto;
Expand Down

0 comments on commit 6d95d48

Please sign in to comment.