From 1f5d27c94baf3a5209133e97b7dc8bab68a2c98a Mon Sep 17 00:00:00 2001 From: Joy A Date: Tue, 22 Oct 2024 11:12:24 +0100 Subject: [PATCH] resolved conflict from main --- assets/static/vocabulary/css/vocabulary.css | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/assets/static/vocabulary/css/vocabulary.css b/assets/static/vocabulary/css/vocabulary.css index a0e95541..c76740b0 100644 --- a/assets/static/vocabulary/css/vocabulary.css +++ b/assets/static/vocabulary/css/vocabulary.css @@ -43,15 +43,9 @@ EX: /* typography */ body { -<<<<<<< HEAD - display: grid; - grid-template-columns: 5% 3% 6% 6% 15% 30% 15% 6% 6% 3% 5%; - overflow-x: hidden; -======= /* display: grid; grid-template-columns: 5% 3% 6% 6% 15% 30% 15% 6% 6% 3% 5%; overflow-x: hidden; */ ->>>>>>> 6a24dd1f (feaure/ Align header with the Vocabulary design system) font-weight: 400; -moz-osx-font-smoothing: grayscale; @@ -953,10 +947,7 @@ body > header .ancilliary-menu { top: 0; /* right: var(--vocabulary-page-edges-space); */ right: 0; -<<<<<<< HEAD -======= margin-right: 4rem; ->>>>>>> 6a24dd1f (feaure/ Align header with the Vocabulary design system) font-family: "Source Sans Pro"; font-style: normal; @@ -979,11 +970,8 @@ body > header .ancilliary-menu ul li { body > header .ancilliary-menu ul li a { /* generalize this */ display: inline-block; -<<<<<<< HEAD -======= ->>>>>>> 6a24dd1f (feaure/ Align header with the Vocabulary design system) } body > header .ancilliary-menu ul li a,