From 0d194e831137f85942cbe9aaafe048153a0f4fbd Mon Sep 17 00:00:00 2001 From: Birk Johansson Date: Mon, 27 Nov 2023 15:47:05 +0100 Subject: [PATCH] fix: fix bad merge --- .../sectionList/SectionList.module.css | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/components/sectionList/SectionList.module.css b/src/components/sectionList/SectionList.module.css index 6640ebcd..27a3d3e4 100644 --- a/src/components/sectionList/SectionList.module.css +++ b/src/components/sectionList/SectionList.module.css @@ -9,12 +9,6 @@ gap: var(--spacers-dp8); } -<<<<<<< HEAD -.listToolbarWrapper { - display: flex; - flex-direction: column; - grid-area: 'list'; -======= .list { grid-area: list; } @@ -23,21 +17,15 @@ display: flex; flex-direction: column; grid-area: list; ->>>>>>> master } .listDetailsWrapper { display: grid; grid-template-columns: 1fr auto; -<<<<<<< HEAD - grid-template-rows: none; - grid-template-areas: 'list details'; -======= grid-template-rows: auto; grid-template-areas: 'header details' 'list details'; ->>>>>>> master margin-top: var(--spacers-dp8); } @@ -46,14 +34,10 @@ display: grid; grid-template-rows: auto; grid-template-columns: none; -<<<<<<< HEAD - grid-template-areas: 'list' 'details'; -======= grid-template-areas: 'header' 'list' 'details'; ->>>>>>> master margin-top: var(--spacers-dp8); } }