Skip to content

Commit

Permalink
Merge branch 'io-1286' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaashl committed Apr 19, 2024
2 parents 0c5b01e + 6dead5e commit 3570f03
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 17 deletions.
3 changes: 1 addition & 2 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"preset": "bem"
},
"selector-class-pattern": null,
"no-descending-specificity": null,
"declaration-block-no-redundant-longhand-properties": null
"no-descending-specificity": null
}
}
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Changed font-weight in video heading and refactored to correct scss setup.
- Changed stylelint rules to exclude no-longhand-properties.
- Updated package version for stylelint.
- Changed accordion heading to be inside ods-accordion
- **Breaking change:** Updated checkbox and radio component according to adjustments from design (Figma), both now have label options, correct spacing and correct font size and weight. Also changed naming of modifiers to be more consistent with other components.
Expand All @@ -32,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed spacing and some other design adjustments on menu component.
- Fixed an issue where long links would not break properly.
- Fixed links on portrait cards to improve screen reader capabilities.
- Fixed linting errors caused by new stylelint version.

### Removed

Expand Down
6 changes: 2 additions & 4 deletions src/components/banner/banner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@
display: grid;
grid-auto-flow: dense;
grid-template-columns: repeat(#{grid.$columns}, 1fr);
column-gap: grid.$gutter-size;
row-gap: grid.$gutter-size;
gap: grid.$gutter-size;
@include breakpoints.medium {
column-gap: grid.$gutter-size-large;
row-gap: grid.$gutter-size-large;
gap: grid.$gutter-size-large;
}

margin: 0 auto;
Expand Down
3 changes: 1 addition & 2 deletions src/components/service_header/service_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
&__image {
grid-row-start: 1;
display: grid;
align-items: center;
grid-column: 3 / 11;
justify-items: center;
place-items: center;

img {
max-width: 10.125rem;
Expand Down
12 changes: 4 additions & 8 deletions src/general/grid/grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,21 @@
}

&--gap {
column-gap: grid.$gap-size-hard;
row-gap: grid.$gap-size-hard;
gap: grid.$gap-size-hard;

@include breakpoints.medium {
column-gap: grid.$gap-size-hard-large;
row-gap: grid.$gap-size-hard-large;
gap: grid.$gap-size-hard-large;
}

&-breakpoint-medium {
@include breakpoints.medium {
column-gap: grid.$gap-size-hard-large;
row-gap: grid.$gap-size-hard-large;
gap: grid.$gap-size-hard-large;
}
}

&-breakpoint-large {
@include breakpoints.large {
column-gap: grid.$gap-size-hard-large;
row-gap: grid.$gap-size-hard-large;
gap: grid.$gap-size-hard-large;
}
}
}
Expand Down

0 comments on commit 3570f03

Please sign in to comment.