Skip to content

Commit

Permalink
Merge pull request #413 from dcos-labs/ph/fix/DCOS-59470-fix-tab-margin
Browse files Browse the repository at this point in the history
DCOS-59470: fix(tabs): fix tab margin
  • Loading branch information
mperrotti authored Oct 9, 2019
2 parents 80ec97e + 2ad470b commit a2874c4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion packages/badge/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const badge = appearance => {
border-style: solid;
padding: 0 8px 0;
font-size: 80%;
line-height: inherit;
line-height: 20px;
text-decoration: none;
text-rendering: optimizeLegibility;
border-radius: ${borderRadiusSmall};
Expand Down
14 changes: 7 additions & 7 deletions packages/badge/tests/__snapshots__/badge.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`Badge accept jsx as children 1`] = `
<span
className="css-17jd12v"
className="css-iu2at0"
data-cy="badge"
>
<span>
Expand All @@ -13,7 +13,7 @@ exports[`Badge accept jsx as children 1`] = `

exports[`Badge danger 1`] = `
<span
className="css-1g44s7u"
className="css-1v2vcel"
data-cy="badge"
>
danger
Expand All @@ -22,7 +22,7 @@ exports[`Badge danger 1`] = `

exports[`Badge default 1`] = `
<span
className="css-17jd12v"
className="css-iu2at0"
data-cy="badge"
>
default
Expand All @@ -31,7 +31,7 @@ exports[`Badge default 1`] = `

exports[`Badge outline 1`] = `
<span
className="css-bvpqwa"
className="css-wrizyw"
data-cy="badge"
>
outline
Expand All @@ -40,7 +40,7 @@ exports[`Badge outline 1`] = `

exports[`Badge primary 1`] = `
<span
className="css-11hyrb9"
className="css-1bcogwf"
data-cy="badge"
>
primary
Expand All @@ -49,7 +49,7 @@ exports[`Badge primary 1`] = `

exports[`Badge success 1`] = `
<span
className="css-y6ql0v"
className="css-1nxr7gm"
data-cy="badge"
>
success
Expand All @@ -58,7 +58,7 @@ exports[`Badge success 1`] = `

exports[`Badge warning 1`] = `
<span
className="css-1fasnxp"
className="css-dsjkko"
data-cy="badge"
>
warning
Expand Down
14 changes: 7 additions & 7 deletions packages/badge/tests/__snapshots__/badgeButton.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`BadgeButton accept jsx as children 1`] = `
<span
className="css-19iuzmr"
className="css-s6zkqq"
data-cy="badgeButton"
onClick={[Function]}
onKeyPress={[Function]}
Expand All @@ -17,7 +17,7 @@ exports[`BadgeButton accept jsx as children 1`] = `

exports[`BadgeButton danger 1`] = `
<span
className="css-1jlwe7l"
className="css-6mw7po"
data-cy="badgeButton"
onClick={[Function]}
onKeyPress={[Function]}
Expand All @@ -30,7 +30,7 @@ exports[`BadgeButton danger 1`] = `

exports[`BadgeButton default 1`] = `
<span
className="css-19iuzmr"
className="css-s6zkqq"
data-cy="badgeButton"
onClick={[Function]}
onKeyPress={[Function]}
Expand All @@ -43,7 +43,7 @@ exports[`BadgeButton default 1`] = `

exports[`BadgeButton outline 1`] = `
<span
className="css-nrwsml"
className="css-17724iu"
data-cy="badgeButton"
onClick={[Function]}
onKeyPress={[Function]}
Expand All @@ -56,7 +56,7 @@ exports[`BadgeButton outline 1`] = `

exports[`BadgeButton primary 1`] = `
<span
className="css-5fnbh1"
className="css-hs8vpl"
data-cy="badgeButton"
onClick={[Function]}
onKeyPress={[Function]}
Expand All @@ -69,7 +69,7 @@ exports[`BadgeButton primary 1`] = `

exports[`BadgeButton success 1`] = `
<span
className="css-l1zuud"
className="css-13uvf5y"
data-cy="badgeButton"
onClick={[Function]}
onKeyPress={[Function]}
Expand All @@ -82,7 +82,7 @@ exports[`BadgeButton success 1`] = `

exports[`BadgeButton warning 1`] = `
<span
className="css-wldna8"
className="css-thsdwi"
data-cy="badgeButton"
onClick={[Function]}
onKeyPress={[Function]}
Expand Down
2 changes: 1 addition & 1 deletion packages/tabs/components/Tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ injectGlobal`
position: relative;
list-style: none;
${padding("vert", "s")}
${margin("right", "s")}
${margin("right", "m")}
cursor: pointer;
font-weight: ${fontWeightMedium};
color: ${themeTextColorPrimary};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ exports[`TextInputWithBadges renders badges with custom BadgeAppearance 1`] = `
border-style: solid;
padding: 0 8px 0;
font-size: 80%;
line-height: inherit;
line-height: 20px;
-webkit-text-decoration: none;
text-decoration: none;
text-rendering: optimizeLegibility;
Expand Down Expand Up @@ -959,7 +959,7 @@ exports[`TextInputWithBadges renders with badges 1`] = `
border-style: solid;
padding: 0 8px 0;
font-size: 80%;
line-height: inherit;
line-height: 20px;
-webkit-text-decoration: none;
text-decoration: none;
text-rendering: optimizeLegibility;
Expand Down

0 comments on commit a2874c4

Please sign in to comment.