Skip to content

Commit

Permalink
fix: use explicit spacing versus browser default (#939)
Browse files Browse the repository at this point in the history
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
SimonFinney and kodiakhq[bot] authored Apr 19, 2021
1 parent 636d539 commit 82c7693
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 5 deletions.
9 changes: 9 additions & 0 deletions src/__tests__/scss/__snapshots__/SCSS.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2668,6 +2668,8 @@ body {
font-weight: 400;
line-height: 1.34;
letter-spacing: 0.32px;
margin-top: 0.75rem;
margin-bottom: 0.75rem;
}

.security--card__body {
Expand Down Expand Up @@ -5892,6 +5894,7 @@ a.bx--overflow-menu-options__btn::before {
line-height: 1.4;
letter-spacing: 0;
display: block;
margin-top: 1rem;
margin-bottom: 0.75rem;
}

Expand Down Expand Up @@ -9240,6 +9243,7 @@ li.bx--accordion__item--disabled:last-of-type {
letter-spacing: 0.32px;
font-weight: 600;
display: flex;
margin-top: 0.5rem;
margin-bottom: 1rem;
justify-content: space-between;
}
Expand Down Expand Up @@ -9647,6 +9651,8 @@ li.bx--accordion__item--disabled:last-of-type {
font-weight: 400;
line-height: 1.29;
letter-spacing: 0.16px;
margin-top: 0.75rem;
margin-bottom: 0.75rem;
}

.security--filter-panel__search {
Expand Down Expand Up @@ -16974,6 +16980,8 @@ li.bx--accordion__item--disabled:last-of-type {
font-weight: 400;
line-height: 1.34;
letter-spacing: 0.32px;
margin-top: 0.5rem;
margin-bottom: 0.5rem;
}

.security--tag-wall > .security--tag--interactive {
Expand Down Expand Up @@ -17982,6 +17990,7 @@ li.bx--accordion__item--disabled:last-of-type {
letter-spacing: 0;
padding-right: 1.5rem;
margin-top: 0;
margin-bottom: 1.5rem;
}

.security--tearsheet__main__content {
Expand Down
6 changes: 5 additions & 1 deletion src/components/Card/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
////
/// Card mixins.
/// @group card
/// @copyright IBM Security 2019
/// @copyright IBM Security 2019 - 2021
////

@import '@carbon/layout/scss/mini-unit';
Expand Down Expand Up @@ -70,7 +70,11 @@ $card__name: card;
}

&__tag {
$card__tag__spacing: $carbon--spacing-04;

@include carbon--type-style($name: caption-01);
margin-top: $card__tag__spacing;
margin-bottom: $card__tag__spacing;
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
////
/// Filter category styles.
/// @group filter-panel
/// @copyright IBM Security 2019
/// @copyright IBM Security 2019 - 2021
////

@import '@carbon/layout/scss/mini-unit';
Expand All @@ -28,6 +28,7 @@
@include carbon--font-weight($weight: semibold);

display: flex;
margin-top: $carbon--spacing-03;
margin-bottom: $carbon--spacing-05;
justify-content: space-between;
}
Expand Down
7 changes: 6 additions & 1 deletion src/components/FilterPanel/_index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
////
/// Filter panel styles.
/// @group filter-panel
/// @copyright IBM Security 2020
/// @copyright IBM Security 2020 - 2021
////

@import '@carbon/layout/scss/spacing';
Expand All @@ -21,7 +21,12 @@

@include security--component($name: filter-panel) {
&__title {
$filter-panel__spacing: $carbon--spacing-04;

@include carbon--type-style($name: body-short-01);

margin-top: $filter-panel__spacing;
margin-bottom: $filter-panel__spacing;
}

&__search {
Expand Down
3 changes: 2 additions & 1 deletion src/components/PanelV2/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
////
/// Panel mixins.
/// @group panel
/// @copyright IBM Security 2019 - 2020
/// @copyright IBM Security 2019 - 2021
////

@import '@carbon/layout/scss/mini-unit';
Expand Down Expand Up @@ -118,6 +118,7 @@
@include carbon--type-style($name: productive-heading-03);

display: block;
margin-top: $carbon--spacing-05;
margin-bottom: $carbon--spacing-04;
}

Expand Down
6 changes: 5 additions & 1 deletion src/components/TagWall/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
////
/// Tag wall mixins.
/// @group tag-wall
/// @copyright IBM Security 2019
/// @copyright IBM Security 2019 - 2021
////

@import '@carbon/type/scss/index';
Expand All @@ -10,7 +10,11 @@

@mixin tag-wall {
&__label {
$tag-wall__spacing: $carbon--spacing-03;

@include carbon--type-style($name: caption-01);
margin-top: $tag-wall__spacing;
margin-bottom: $tag-wall__spacing;
}

> #{$tag--interactive__namespace} {
Expand Down
1 change: 1 addition & 0 deletions src/components/Tearsheet/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ $tearsheet__layer: z(
@include carbon--type-style($name: productive-heading-04);
padding-right: $tearsheet__spacing__padding;
margin-top: 0;
margin-bottom: $tearsheet__spacing__padding;
}

&__content {
Expand Down

0 comments on commit 82c7693

Please sign in to comment.