Merge branch 'io-426' into test

oslokommune · Nov 23, 2023 · 74a1eef · 74a1eef
2 parents 0deffd0 + 248d191
commit 74a1eef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed spacing around links and buttons in portrait card on all breakpoints.
 - Fixed hardcoded references to use s3.dualstack for IPv6 support.
 - Prevent plus/minus icon to show in other variants than filter.
 

diff --git a/src/components/cards/portrait_card/portrait_card.scss b/src/components/cards/portrait_card/portrait_card.scss
@@ -35,8 +35,12 @@ $ods-portrait-card-image-height-large: 290px;
   }
 
   &__actions {
-    @extend %ods-padding-horizontal-3, %ods-padding-bottom-4, %ods-padding-top-0-breakpoint-medium, %ods-padding-horizontal-4-breakpoint-medium, %ods-padding-bottom-8-breakpoint-medium, %ods-padding-top-0-breakpoint-large, %ods-padding-horizontal-8-breakpoint-large, %ods-padding-bottom-8-breakpoint-large;
+    @extend %ods-padding-horizontal-5, %ods-padding-bottom-4, %ods-padding-top-0-breakpoint-medium, %ods-padding-horizontal-4-breakpoint-medium, %ods-padding-bottom-8-breakpoint-medium, %ods-padding-top-0-breakpoint-large, %ods-padding-horizontal-4-breakpoint-large, %ods-padding-bottom-8-breakpoint-large;
     @extend %ods-color-bg-gray-light;
+
+    & .ods-button {
+      padding: 0;
+    }
   }
 
   &__heading {
@@ -71,7 +75,7 @@ $ods-portrait-card-image-height-large: 290px;
 
   &--xs {
     & .ods-portrait-card__content {
-      @extend %ods-padding-5, %ods-padding-4-breakpoint-medium, %ods-padding-5-breakpoint-large;
+      @extend %ods-padding-4, %ods-padding-4-breakpoint-medium, %ods-padding-4-breakpoint-large;
     }
 
     & .ods-portrait-card__heading {
@@ -98,7 +102,7 @@ $ods-portrait-card-image-height-large: 290px;
     }
 
     & .ods-portrait-card__actions {
-      @extend %ods-padding-top-0-breakpoint-large, %ods-padding-horizontal-8-breakpoint-large, %ods-padding-bottom-4-breakpoint-large;
+      @extend %ods-padding-top-0-breakpoint-large, %ods-padding-horizontal-4-breakpoint-large, %ods-padding-bottom-4-breakpoint-large;
     }
   }