resolved mergeconflicts

CHANGELOG.md

@@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Change getting started -> bundle to refer to npm instead of github
 - Change "pages" reference to "templates"
 
+### Removed
+
+- Removed column gap on service header.
+
+## [1.0.3] - 25.10.2023
+
 ### Fixed
 
 - Remove font styles from lists and update the list's clean variant padding. This fixes the lists styles in the Banner component.

README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
 
-![Version](https://img.shields.io/badge/Version-1.0.0-blue?style=for-the-badge&logo=rocket&label=Version)
+![Version](https://img.shields.io/badge/Version-1.0.3-blue?style=for-the-badge&logo=rocket&label=Version)
 [![License](https://img.shields.io/badge/License-MIT-green?style=for-the-badge&logo=open-source-initiative&label=License)](https://opensource.org/licenses/MIT)
 [![JavaScript](https://img.shields.io/badge/JS-F7DF1E?style=for-the-badge&logo=javascript&logoColor=ffffff&label=JavaScript)](https://developer.mozilla.org/en-US/docs/Web/JavaScript)
 [![Vue](https://img.shields.io/badge/Vue-2.x-green?style=for-the-badge&logo=vue.js&label=Vue)](https://v2.vuejs.org/)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oslokommune/oslo-designsystem",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Oslo Designsystem",
   "main": "index.js",
   "scripts": {

src/components/service_header/service_header.scss

@@ -7,7 +7,6 @@
   display: grid;
   align-items: center;
   grid-template-columns: repeat(12, 1fr);
-  column-gap: grid.$gutter-size-large;
   row-gap: grid.$gutter-size-large;
 
   &__main {