Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/karma-firefox-laun…
Browse files Browse the repository at this point in the history
…cher-2.1.0
  • Loading branch information
tw15egan authored Jan 28, 2021
2 parents 2085977 + 0bc8335 commit 89bf2a0
Show file tree
Hide file tree
Showing 11 changed files with 227 additions and 19 deletions.
109 changes: 109 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,115 @@
"contributions": [
"code"
]
},
{
"login": "molyholy",
"name": "molyholy",
"avatar_url": "https://avatars2.githubusercontent.com/u/77503726?v=4",
"profile": "https://github.com/molyholy",
"contributions": [
"code"
]
},
{
"login": "scottdickerson",
"name": "Scott Dickerson",
"avatar_url": "https://avatars.githubusercontent.com/u/6663002?v=4",
"profile": "https://github.com/scottdickerson",
"contributions": [
"code"
]
},
{
"login": "epodgaetskiy",
"name": "Evgeniy Podgaetskiy",
"avatar_url": "https://avatars.githubusercontent.com/u/15031623?v=4",
"profile": "https://start.reactwarriors.com/join",
"contributions": [
"code"
]
},
{
"login": "CassidyJensen",
"name": "CassidyJensen",
"avatar_url": "https://avatars.githubusercontent.com/u/45407808?v=4",
"profile": "https://github.com/CassidyJensen",
"contributions": [
"code",
"a11y"
]
},
{
"login": "lattmann",
"name": "Zsolt Lattmann",
"avatar_url": "https://avatars.githubusercontent.com/u/1108945?v=4",
"profile": "https://github.com/lattmann",
"contributions": [
"code"
]
},
{
"login": "ConradSchmidt",
"name": "Conrad Schmidt",
"avatar_url": "https://avatars.githubusercontent.com/u/3808948?v=4",
"profile": "https://conrad.codes/",
"contributions": [
"code"
]
},
{
"login": "IgnacioBecerra",
"name": "Ignacio Becerra",
"avatar_url": "https://avatars.githubusercontent.com/u/24970122?v=4",
"profile": "https://github.com/IgnacioBecerra",
"contributions": [
"code"
]
},
{
"login": "swapnilpatil21",
"name": "Swapnil Patil",
"avatar_url": "https://avatars.githubusercontent.com/u/46713873?v=4",
"profile": "https://github.com/swapnilpatil21",
"contributions": [
"doc"
]
},
{
"login": "sophiiae",
"name": "Fei Z",
"avatar_url": "https://avatars.githubusercontent.com/u/18622886?v=4",
"profile": "https://github.com/sophiiae",
"contributions": [
"code"
]
},
{
"login": "IgnasA",
"name": "Ignas Ausiejus",
"avatar_url": "https://avatars.githubusercontent.com/u/7099068?v=4",
"profile": "https://github.com/IgnasA",
"contributions": [
"doc"
]
},
{
"login": "ryanomackey",
"name": "Ryan O. Mackey",
"avatar_url": "https://avatars.githubusercontent.com/u/17710824?v=4",
"profile": "https://ryanomackey.com/",
"contributions": [
"code"
]
},
{
"login": "skateman",
"name": "Dávid Halász",
"avatar_url": "https://avatars.githubusercontent.com/u/649130?v=4",
"profile": "http://www.skateman.eu/",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,20 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
</tr>
<tr>
<td align="center"><a href="https://github.com/DavidSCChen"><img src="https://avatars1.githubusercontent.com/u/54974983?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DavidSCChen</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=DavidSCChen" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/molyholy"><img src="https://avatars2.githubusercontent.com/u/77503726?v=4?s=100" width="100px;" alt=""/><br /><sub><b>molyholy</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=molyholy" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/scottdickerson"><img src="https://avatars.githubusercontent.com/u/6663002?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Dickerson</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=scottdickerson" title="Code">💻</a></td>
<td align="center"><a href="https://start.reactwarriors.com/join"><img src="https://avatars.githubusercontent.com/u/15031623?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Evgeniy Podgaetskiy</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=epodgaetskiy" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/CassidyJensen"><img src="https://avatars.githubusercontent.com/u/45407808?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CassidyJensen</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=CassidyJensen" title="Code">💻</a> <a href="#a11y-CassidyJensen" title="Accessibility">️️️️♿️</a></td>
<td align="center"><a href="https://github.com/lattmann"><img src="https://avatars.githubusercontent.com/u/1108945?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zsolt Lattmann</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=lattmann" title="Code">💻</a></td>
<td align="center"><a href="https://conrad.codes/"><img src="https://avatars.githubusercontent.com/u/3808948?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Conrad Schmidt</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ConradSchmidt" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/IgnacioBecerra"><img src="https://avatars.githubusercontent.com/u/24970122?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ignacio Becerra</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=IgnacioBecerra" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/swapnilpatil21"><img src="https://avatars.githubusercontent.com/u/46713873?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Swapnil Patil</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=swapnilpatil21" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/sophiiae"><img src="https://avatars.githubusercontent.com/u/18622886?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fei Z</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=sophiiae" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/IgnasA"><img src="https://avatars.githubusercontent.com/u/7099068?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ignas Ausiejus</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=IgnasA" title="Documentation">📖</a></td>
<td align="center"><a href="https://ryanomackey.com/"><img src="https://avatars.githubusercontent.com/u/17710824?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryan O. Mackey</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ryanomackey" title="Code">💻</a></td>
<td align="center"><a href="http://www.skateman.eu/"><img src="https://avatars.githubusercontent.com/u/649130?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Halász Dávid</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=skateman" title="Code">💻</a></td>
</tr>
</table>

Expand Down
34 changes: 26 additions & 8 deletions packages/components/docs/sass.md
Original file line number Diff line number Diff line change
Expand Up @@ -8834,6 +8834,7 @@ $hover-primary-text: if(
- **Type**: `{undefined}`
- **Used by**:
- [carbon--theme [mixin]](#carbon--theme-mixin)
- [breadcrumb [mixin]](#breadcrumb-mixin)
- [button [mixin]](#button-mixin)
- [link [mixin]](#link-mixin)

Expand Down Expand Up @@ -14979,6 +14980,10 @@ Breadcrumb styles

.#{$prefix}--breadcrumb-item .#{$prefix}--link:visited {
color: $link-01;

&:hover {
color: $hover-primary-text;
}
}

.#{$prefix}--breadcrumb-item::after {
Expand Down Expand Up @@ -15031,6 +15036,7 @@ Breadcrumb styles
- [prefix [variable]](#prefix-variable)
- [carbon--spacing-03 [variable]](#carbon--spacing-03-variable)
- [link-01 [variable]](#link-01-variable)
- [hover-primary-text [variable]](#hover-primary-text-variable)
- [text-01 [variable]](#text-01-variable)

## button
Expand Down Expand Up @@ -26237,7 +26243,9 @@ Tag styles

// tags used for filtering
.#{$prefix}--tag--filter {
padding-right: rem(2px);
padding-top: 0;
padding-right: 0;
padding-bottom: 0;
cursor: pointer;

&:hover {
Expand All @@ -26246,17 +26254,21 @@ Tag styles
}

.#{$prefix}--tag__close-icon {
display: flex;
flex-shrink: 0;
width: rem(16px);
height: rem(16px);
margin: 0 0 0 rem(4px);
align-items: center;
justify-content: center;
width: rem(24px);
height: rem(24px);
margin: 0 0 0 rem(2px);
padding: 0;
color: currentColor;
background-color: transparent;
border: 0;
border-radius: 50%;
cursor: pointer;

transition: background-color $duration--fast-01 motion(standard, productive),
box-shadow $duration--fast-01 motion(standard, productive);
svg {
fill: currentColor;
}
Expand Down Expand Up @@ -26285,7 +26297,7 @@ Tag styles
.#{$prefix}--tag__close-icon:focus {
border-radius: 50%;
outline: none;
box-shadow: inset 0 0 0 2px $focus;
box-shadow: inset 0 0 0 1px $focus;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
Expand All @@ -26296,7 +26308,7 @@ Tag styles
}

.#{$prefix}--tag--high-contrast .#{$prefix}--tag__close-icon:focus {
box-shadow: inset 0 0 0 2px $inverse-focus-ui;
box-shadow: inset 0 0 0 1px $inverse-focus-ui;
}

.#{$prefix}--tag--filter.#{$prefix}--tag--disabled
Expand All @@ -26315,7 +26327,13 @@ Tag styles
}

.#{$prefix}--tag--sm.#{$prefix}--tag--filter {
padding-right: rem(2px);
padding-right: 0;
}

.#{$prefix}--tag--sm .#{$prefix}--tag__close-icon {
width: rem(18px);
height: rem(18px);
margin-left: rem(5px);
}

// Skeleton state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@

.#{$prefix}--breadcrumb-item .#{$prefix}--link:visited {
color: $link-01;

&:hover {
color: $hover-primary-text;
}
}

.#{$prefix}--breadcrumb-item::after {
Expand Down
28 changes: 20 additions & 8 deletions packages/components/src/components/tag/_tag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@

// tags used for filtering
.#{$prefix}--tag--filter {
padding-right: rem(2px);
padding-top: 0;
padding-right: 0;
padding-bottom: 0;
cursor: pointer;

&:hover {
Expand All @@ -156,17 +158,21 @@
}

.#{$prefix}--tag__close-icon {
display: flex;
flex-shrink: 0;
width: rem(16px);
height: rem(16px);
margin: 0 0 0 rem(4px);
align-items: center;
justify-content: center;
width: rem(24px);
height: rem(24px);
margin: 0 0 0 rem(2px);
padding: 0;
color: currentColor;
background-color: transparent;
border: 0;
border-radius: 50%;
cursor: pointer;

transition: background-color $duration--fast-01 motion(standard, productive),
box-shadow $duration--fast-01 motion(standard, productive);
svg {
fill: currentColor;
}
Expand Down Expand Up @@ -195,7 +201,7 @@
.#{$prefix}--tag__close-icon:focus {
border-radius: 50%;
outline: none;
box-shadow: inset 0 0 0 2px $focus;
box-shadow: inset 0 0 0 1px $focus;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
Expand All @@ -206,7 +212,7 @@
}

.#{$prefix}--tag--high-contrast .#{$prefix}--tag__close-icon:focus {
box-shadow: inset 0 0 0 2px $inverse-focus-ui;
box-shadow: inset 0 0 0 1px $inverse-focus-ui;
}

.#{$prefix}--tag--filter.#{$prefix}--tag--disabled
Expand All @@ -225,7 +231,13 @@
}

.#{$prefix}--tag--sm.#{$prefix}--tag--filter {
padding-right: rem(2px);
padding-right: 0;
}

.#{$prefix}--tag--sm .#{$prefix}--tag__close-icon {
width: rem(18px);
height: rem(18px);
margin-left: rem(5px);
}

// Skeleton state
Expand Down
17 changes: 17 additions & 0 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,9 @@ Map {
"selectorPrimaryFocus": "[data-modal-primary-focus]",
},
"propTypes": Object {
"aria-label": Object {
"type": "string",
},
"children": Object {
"type": "node",
},
Expand Down Expand Up @@ -2079,9 +2082,11 @@ Map {
Array [
"ar",
"at",
"az",
"be",
"bg",
"bn",
"bs",
"cat",
"cs",
"cy",
Expand All @@ -2093,16 +2098,22 @@ Map {
"et",
"fa",
"fi",
"fo",
"fr",
"ga",
"gr",
"he",
"hi",
"hr",
"hu",
"id",
"is",
"it",
"ja",
"ka",
"km",
"ko",
"kz",
"lt",
"lv",
"mk",
Expand All @@ -2120,12 +2131,15 @@ Map {
"sk",
"sl",
"sq",
"sr-cyr",
"sr",
"sv",
"th",
"tr",
"uk",
"uz",
"vn",
"zh-tw",
"zh",
],
],
Expand Down Expand Up @@ -2309,6 +2323,9 @@ Map {
],
"type": "oneOfType",
},
"hideLabel": Object {
"type": "bool",
},
"id": Object {
"isRequired": true,
"type": "string",
Expand Down
Loading

0 comments on commit 89bf2a0

Please sign in to comment.