resolved conflict from main

creativecommons · Oct 22, 2024 · 1f5d27c · 1f5d27c
1 parent 332e0a7
commit 1f5d27c
Showing 1 changed file with 0 additions and 12 deletions.
diff --git 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,