Skip to content

Commit

Permalink
Merge branch 'master' into icons-new-january-february
Browse files Browse the repository at this point in the history
  • Loading branch information
joshblack authored Feb 19, 2020
2 parents b974e7d + 5db2d1e commit 44ec10a
Show file tree
Hide file tree
Showing 65 changed files with 12,152 additions and 14,779 deletions.
Binary file removed .yarn/offline-mirror/fast-extend-0.0.2.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/fast-extend-1.0.2.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/memfs-2.17.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/memfs-3.0.4.tgz
Binary file not shown.
66 changes: 35 additions & 31 deletions packages/components/docs/sass.md
Original file line number Diff line number Diff line change
Expand Up @@ -3675,7 +3675,6 @@ $spacing-04: $carbon--spacing-04;
- **Used by**:
- [carbon--theme [mixin]](#carbon--theme-mixin)
- [data-table-core [mixin]](#data-table-core-mixin)
- [data-table-sort [mixin]](#data-table-sort-mixin)
- [tabs [mixin]](#tabs-mixin)

### ✅spacing-05 [variable]
Expand All @@ -3700,6 +3699,7 @@ $spacing-05: $carbon--spacing-05;
- [data-table-v2-action [mixin]](#data-table-v2-action-mixin)
- [data-table-core [mixin]](#data-table-core-mixin)
- [data-table-expandable [mixin]](#data-table-expandable-mixin)
- [data-table-sort [mixin]](#data-table-sort-mixin)
- [modal [mixin]](#modal-mixin)
- [pagination [mixin]](#pagination-mixin)
- [select [mixin]](#select-mixin)
Expand Down Expand Up @@ -6084,6 +6084,7 @@ $interactive-04: if(
- [file-uploader [mixin]](#file-uploader-mixin)
- [inline-loading [mixin]](#inline-loading-mixin)
- [loading [mixin]](#loading-mixin)
- [progress-indicator [mixin]](#progress-indicator-mixin)
- [slider [mixin]](#slider-mixin)
- [tabs [mixin]](#tabs-mixin)

Expand Down Expand Up @@ -6111,8 +6112,6 @@ $ui-background: if(
- **Type**: `{undefined}`
- **Used by**:
- [carbon--theme [mixin]](#carbon--theme-mixin)
- [dropdown [mixin]](#dropdown-mixin)
- [listbox [mixin]](#listbox-mixin)
- [tooltip [mixin]](#tooltip-mixin)

### ✅ui-01 [variable]
Expand Down Expand Up @@ -6393,6 +6392,7 @@ $text-02: if(
- [modal [mixin]](#modal-mixin)
- [overflow-menu [mixin]](#overflow-menu-mixin)
- [pagination [mixin]](#pagination-mixin)
- [progress-indicator [mixin]](#progress-indicator-mixin)
- [tabs [mixin]](#tabs-mixin)
- [toggle [mixin]](#toggle-mixin)
- [toolbar [mixin]](#toolbar-mixin)
Expand Down Expand Up @@ -7498,7 +7498,7 @@ $hover-danger: if(
'hover-danger'
),
map-get($carbon--theme, 'hover-danger'),
#ba1b23
#b81921
);
```

Expand Down Expand Up @@ -14919,8 +14919,8 @@ Data table core styles

.#{$prefix}--data-table th,
.#{$prefix}--data-table td {
padding-left: $spacing-04;
padding-right: $spacing-04;
padding-left: $spacing-05;
padding-right: $spacing-05;
vertical-align: top;
text-align: left;
}
Expand Down Expand Up @@ -14952,7 +14952,7 @@ Data table core styles
color: $text-02;
border-top: 1px solid $ui-01;
border-bottom: 1px solid $ui-03;
padding: rem(14px) $spacing-04;
padding: rem(14px) $spacing-05;
padding-bottom: rem(13px);

& + td:first-of-type {
Expand Down Expand Up @@ -15781,12 +15781,12 @@ Data table sort styles
}

.#{$prefix}--data-table--sort td {
padding-left: $spacing-03;
padding-right: $spacing-03;
padding-left: $spacing-05;
padding-right: $spacing-05;
}

.#{$prefix}--data-table--sort th:first-of-type .#{$prefix}--table-sort {
padding-left: $spacing-04;
padding-left: $spacing-05;
}

// -------------------------------------
Expand All @@ -15801,7 +15801,7 @@ Data table sort styles
justify-content: space-between;
width: 100%;
color: $text-01;
padding: 0 $spacing-03;
padding: 0 $spacing-05;
height: 100%;
background-color: $ui-03;
transition: background-color $duration--fast-01 motion(entrance, productive),
Expand Down Expand Up @@ -15942,10 +15942,10 @@ Data table sort styles
- **Requires**:
- [prefix [variable]](#prefix-variable)
- [layout-04 [variable]](#layout-04-variable)
- [spacing-03 [variable]](#spacing-03-variable)
- [spacing-04 [variable]](#spacing-04-variable)
- [spacing-05 [variable]](#spacing-05-variable)
- [text-01 [variable]](#text-01-variable)
- [ui-03 [variable]](#ui-03-variable)
- [spacing-03 [variable]](#spacing-03-variable)
- [ui-05 [variable]](#ui-05-variable)
- [layout-01 [variable]](#layout-01-variable)

Expand Down Expand Up @@ -16789,15 +16789,15 @@ Dropdown styles
border-bottom-color: transparent;
width: auto;
height: rem(32px);
background-color: $ui-background;
background-color: transparent;
transition: background $duration--fast-01 motion(entrance, productive);

&:hover {
background-color: $hover-ui;
}

&.#{$prefix}--dropdown--disabled {
background-color: $ui-background;
background-color: transparent;
}

.#{$prefix}--dropdown__arrow {
Expand Down Expand Up @@ -16896,7 +16896,6 @@ Dropdown styles
- [selected-ui [variable]](#selected-ui-variable)
- [text-02 [variable]](#text-02-variable)
- [disabled-02 [variable]](#disabled-02-variable)
- [ui-background [variable]](#ui-background-variable)
- [carbon--spacing-04 [variable]](#carbon--spacing-04-variable)

## file-uploader
Expand Down Expand Up @@ -17853,7 +17852,7 @@ List box styles

// Inline variant for a `list-box`
.#{$prefix}--list-box.#{$prefix}--list-box--inline {
background-color: $ui-background;
background-color: transparent;
border-width: 0;

&:hover {
Expand Down Expand Up @@ -18000,6 +17999,9 @@ List box styles
.#{$prefix}--list-box__selection {
position: absolute;
right: rem(33px); // to preserve .5rem space between icons according to spec
// top/transform used to center invalid icon in IE11
top: 50%;
transform: translateY(-50%);
display: flex;
justify-content: center;
align-items: center;
Expand Down Expand Up @@ -18285,7 +18287,6 @@ List box styles
- [support-01 [variable]](#support-01-variable)
- [disabled-02 [variable]](#disabled-02-variable)
- [carbon--spacing-09 [variable]](#carbon--spacing-09-variable)
- [ui-background [variable]](#ui-background-variable)
- [carbon--spacing-03 [variable]](#carbon--spacing-03-variable)
- [carbon--spacing-07 [variable]](#carbon--spacing-07-variable)
- [carbon--spacing-05 [variable]](#carbon--spacing-05-variable)
Expand Down Expand Up @@ -20464,11 +20465,12 @@ Progress indicator styles
height: $carbon--spacing-05;
border-radius: 50%;
margin: 9px $carbon--spacing-03 0 0;
fill: $interactive-01;
fill: $interactive-04;
}

.#{$prefix}--progress-label {
@include type-style('body-short-01');
color: $text-01;
line-height: 1.45;
max-width: rem(88px);
margin: $carbon--spacing-03 0 0 0;
Expand Down Expand Up @@ -20546,7 +20548,7 @@ Progress indicator styles
left: 0;
margin-left: $carbon--spacing-06;
margin-top: rem(28px);
color: $text-01;
color: $text-02;
text-align: start;
}

Expand All @@ -20558,8 +20560,8 @@ Progress indicator styles
}

.#{$prefix}--progress-step--current svg {
stroke: $interactive-01;
fill: $interactive-01;
stroke: $interactive-04;
fill: $interactive-04;

path:last-of-type {
stroke-width: 40%;
Expand Down Expand Up @@ -20640,12 +20642,11 @@ Progress indicator styles
width: rem(40px);
}

.#{$prefix}--progress--vertical {
display: block;
}
// Vertical Variant

.#{$prefix}--progress--vertical .#{$prefix}--progress-step {
padding-bottom: rem(24px);
.#{$prefix}--progress--vertical {
display: flex;
flex-direction: column;
}

.#{$prefix}--progress--vertical .#{$prefix}--progress-step,
Expand Down Expand Up @@ -20685,12 +20686,10 @@ Progress indicator styles

.#{$prefix}--progress--vertical .#{$prefix}--progress-optional {
margin-top: auto;
position: initial;
margin-left: 2.25rem;
}

.#{$prefix}--progress--vertical .#{$prefix}--progress-line {
top: 0;
left: 0;
height: 100%;
width: 1px;
Expand All @@ -20705,11 +20704,13 @@ Progress indicator styles
- [prefix [variable]](#prefix-variable)
- [carbon--spacing-05 [variable]](#carbon--spacing-05-variable)
- [carbon--spacing-03 [variable]](#carbon--spacing-03-variable)
- [interactive-01 [variable]](#interactive-01-variable)
- [interactive-04 [variable]](#interactive-04-variable)
- [text-01 [variable]](#text-01-variable)
- [link-01 [variable]](#link-01-variable)
- [interactive-01 [variable]](#interactive-01-variable)
- [carbon--spacing-06 [variable]](#carbon--spacing-06-variable)
- [inverse-01 [variable]](#inverse-01-variable)
- [text-01 [variable]](#text-01-variable)
- [text-02 [variable]](#text-02-variable)
- [ui-05 [variable]](#ui-05-variable)
- [ui-03 [variable]](#ui-03-variable)
- [support-01 [variable]](#support-01-variable)
Expand Down Expand Up @@ -22561,6 +22562,9 @@ Text input styles
.#{$prefix}--text-input__invalid-icon {
position: absolute;
right: $carbon--spacing-05;
// top/transform used to center invalid icon in IE11
top: 50%;
transform: translateY(-50%);
fill: $support-01;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@import '../../globals/scss/vars';
@import '../../globals/scss/vendor/@carbon/elements/scss/import-once/import-once';
@import '../list-box/list-box';
@import '../../globals/scss/css--reset';

/// Combo box styles
/// @access private
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@

.#{$prefix}--data-table th,
.#{$prefix}--data-table td {
padding-left: $spacing-04;
padding-right: $spacing-04;
padding-left: $spacing-05;
padding-right: $spacing-05;
vertical-align: top;
text-align: left;
}
Expand Down Expand Up @@ -120,7 +120,7 @@
color: $text-02;
border-top: 1px solid $ui-01;
border-bottom: 1px solid $ui-03;
padding: rem(14px) $spacing-04;
padding: rem(14px) $spacing-05;
padding-bottom: rem(13px);

& + td:first-of-type {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
}

.#{$prefix}--data-table--sort td {
padding-left: $spacing-03;
padding-right: $spacing-03;
padding-left: $spacing-05;
padding-right: $spacing-05;
}

.#{$prefix}--data-table--sort th:first-of-type .#{$prefix}--table-sort {
padding-left: $spacing-04;
padding-left: $spacing-05;
}

// -------------------------------------
Expand All @@ -49,7 +49,7 @@
justify-content: space-between;
width: 100%;
color: $text-01;
padding: 0 $spacing-03;
padding: 0 $spacing-05;
height: 100%;
background-color: $ui-03;
transition: background-color $duration--fast-01 motion(entrance, productive),
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/components/dropdown/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,15 @@
border-bottom-color: transparent;
width: auto;
height: rem(32px);
background-color: $ui-background;
background-color: transparent;
transition: background $duration--fast-01 motion(entrance, productive);

&:hover {
background-color: $hover-ui;
}

&.#{$prefix}--dropdown--disabled {
background-color: $ui-background;
background-color: transparent;
}

.#{$prefix}--dropdown__arrow {
Expand Down
5 changes: 4 additions & 1 deletion packages/components/src/components/list-box/_list-box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ $list-box-menu-width: rem(300px);

// Inline variant for a `list-box`
.#{$prefix}--list-box.#{$prefix}--list-box--inline {
background-color: $ui-background;
background-color: transparent;
border-width: 0;

&:hover {
Expand Down Expand Up @@ -343,6 +343,9 @@ $list-box-menu-width: rem(300px);
.#{$prefix}--list-box__selection {
position: absolute;
right: rem(33px); // to preserve .5rem space between icons according to spec
// top/transform used to center invalid icon in IE11
top: 50%;
transform: translateY(-50%);
display: flex;
justify-content: center;
align-items: center;
Expand Down
Loading

0 comments on commit 44ec10a

Please sign in to comment.