commit intermédiaire

assets/css/src/pages/_events.scss

@@ -25,7 +25,6 @@
 
   main {
     .events-grid {
-<<<<<<< HEAD
 	box-sizing: border-box;
 	padding: 2rem;
 	padding-top: 9rem;
@@ -36,16 +35,6 @@
 	gap: 2rem;
 
   
-=======
-      box-sizing: border-box;
-      padding: 0 2rem;
-      padding-top: 9rem;
-      width: 100%;
-      display: grid;
-      grid-template-columns: repeat(3, 1fr);
-      align-items: flex-end;
-      gap: 2rem;
->>>>>>> 2a65419f5702312315458c40dfa984967b36fc20
 
       .event-card {
         h2 {

assets/css/style.css

@@ -164,8 +164,9 @@ summary {
 }
 
 .bottom-tab--invert {
-  background-color: #000;
-  color: #fff;
+  background-color: var(--color-beige);
+  color: #000;
+  border: var(--border);
 }
 
 .bottom-tab:not(.bottom-tab--invert) {
@@ -259,27 +260,6 @@ summary {
 .main-header.menu-transitioning .characters svg {
   transition: width 0.5s var(--curve), height 0.5s var(--curve);
 }
-.main-header .filters {
-  position: absolute;
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  gap: 0.7rem;
-  bottom: -2.5rem;
-}
-.main-header .filters button {
-  transform: translateY(0rem);
-  transition: background-color 0.2s var(--curve), transform 0.3s var(--curve);
-}
-.main-header .filters button:hover {
-  transform: translateY(0.5rem) !important;
-}
-.main-header .filters button.active {
-  transform: translateY(0rem);
-  background-color: #000;
-  color: #fff;
-  outline: 2px solid var(--color-beige);
-}
 .main-header .header-menu not * {
   font-weight: 600;
   text-align: center;
@@ -458,9 +438,29 @@ summary {
   transform: translateY(18vh);
 }
 
+[data-template=events] .filters {
+  position: relative;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  gap: 0.7rem;
+  bottom: -2.5rem;
+}
+[data-template=events] .filters button {
+  transform: translateY(0rem);
+  transition: background-color 0.2s var(--curve), transform 0.3s var(--curve);
+  padding: 0.5rem 0.9rem;
+  border-radius: var(--border-radius);
+}
+[data-template=events] .filters button.active {
+  transform: translateY(0rem);
+  background-color: #000;
+  color: #fff;
+  outline: 2px solid var(--color-beige);
+}
 [data-template=events] main .events-grid {
   box-sizing: border-box;
-  padding: 0 2rem;
+  padding: 2rem;
   padding-top: 9rem;
   width: 100%;
   display: grid;
@@ -621,7 +621,6 @@ summary {
 [data-template=agenda] main ul.sort-buttons li button {
   font-family: var(--font-sans);
   font-size: var(--font-size-L);
-  font-weight: 600;
 }
 [data-template=agenda] main ul.sort-buttons li button.active {
   text-decoration: underline;
@@ -644,7 +643,8 @@ summary {
   font-weight: 500;
 }
 [data-template=agenda] main .dates-container .month-switcher button {
-  font-size: 2rem;
+  font-size: inherit;
+  font-family: var(--font-serif);
 }
 [data-template=agenda] main .dates-container .month {
   width: 40rem;