From a51f3bef4351b867b3b0bdd9c6a086b53e08b09a Mon Sep 17 00:00:00 2001
From: yaemiku <me@yaemiku.dev>
Date: Thu, 18 Aug 2022 03:15:30 +0200
Subject: [PATCH] [fix] green buttons shenanigans

---
 core/templates/base.html         | 60 +++++++++-----------
 static/css/dist/styles.css       | 94 +++++++++++++++++++++++++++++---
 theme/static/css/dist/styles.css | 86 +++++++++++++++++++++++++++++
 3 files changed, 199 insertions(+), 41 deletions(-)
diff --git a/core/templates/base.html b/core/templates/base.html
index 8793f35..6f252b2 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -34,13 +34,13 @@
 
   <body class="antialiased flex flex-col gap-4 bg-stone-50">
     <header class="w-full bg-white shadow-md border-b border-slate-400 pb-1">
-      <div
-        class="m-4 container flex flex-col lg:flex-row items-center lg:items-start justify-around mx-auto"
+      <nav
+        class="m-4 container flex flex-col lg:flex-row items-center lg:items-start justify-center mx-auto"
       >
         <div class="self-center">
           <img class="max-h-[200px]" src="{% static 'podlzbs.jpg' %}" alt="" />
         </div>
-        <div class="flex flex-col lg:self-end">
+        <div class="flex flex-col lg:self-end w-full">
           <div class="mb-4 mx-auto p-2 text-center">
             <h1>
               Podlaski Związek <br />
@@ -48,45 +48,39 @@
             </h1>
           </div>
           {% if nav %}
-          <nav>
-            <ul
-              class="flex flex-wrap justify-center lg:items-end gap-3 text-[15px] leading-5 m-2"
-            >
-              {% for button in nav %}
-              <li>
-                <a
-                  class="nbutton home {% if button.href == '/' %}{{ home }}{% elif button.href in request.path %}active{% endif %}"
-                  href="{{ button.href }}"
-                  target="{% if button.blank %}_blank{% else %}_self{% endif %}"
-                  >{{ button.title }}</a
-                >
-              </li>
-              {% endfor %}
-            </ul>
-          </nav>
-          {% endif %}
-        </div>
-        {% if uppernav %}
-        <nav>
           <ul
-            class="flex flex-wrap justify-center lg:items-end gap-3 text-[15px] leading-5 m-2"
+            class="flex flex-wrap justify-center lg:items-end gap-3 text-[15px] leading-5 my-2"
           >
-            {% for button in uppernav %}
-            <li title="{{ button.title }}">
+            {% for button in nav %}
+            <li>
               <a
+                class="nbutton home {% if button.href == '/' %}{{ home }}{% elif button.href in request.path %}active{% endif %}"
                 href="{{ button.href }}"
                 target="{% if button.blank %}_blank{% else %}_self{% endif %}"
-                ><img
-                  class="max-h-12"
-                  src="{{ button.photo.url }}"
-                  alt="{{ button.title }}"
-              /></a>
+                >{{ button.title }}</a
+              >
             </li>
             {% endfor %}
           </ul>
-        </nav>
+          {% endif %}
+        </div>
+        {% if uppernav %}
+        <ul class="flex flex-wrap justify-center lg:w-40 gap-3 lg:m-0 mt-2">
+          {% for button in uppernav %}
+          <li title="{{ button.title }}">
+            <a
+              href="{{ button.href }}"
+              target="{% if button.blank %}_blank{% else %}_self{% endif %}"
+              ><img
+                class="max-h-12"
+                src="{{ button.photo.url }}"
+                alt="{{ button.title }}"
+            /></a>
+          </li>
+          {% endfor %}
+        </ul>
         {% endif %}
-      </div>
+      </nav>
     </header>
     <main
       class="container xl:max-w-screen-xl mx-auto p-4 prose-img:my-1 prose-p:my-[0.3em]"
diff --git a/static/css/dist/styles.css b/static/css/dist/styles.css
index 3d02224..d9aa7e0 100644
--- a/static/css/dist/styles.css
+++ b/static/css/dist/styles.css
@@ -1270,6 +1270,10 @@ select {
   margin: 0.5rem;
 }
 
+.m-0 {
+  margin: 0px;
+}
+
 .mx-auto {
   margin-left: auto;
   margin-right: auto;
@@ -1280,6 +1284,11 @@ select {
   margin-bottom: 0px;
 }
 
+.my-2 {
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
 .mb-2 {
   margin-bottom: 0.5rem;
 }
@@ -1304,10 +1313,6 @@ select {
   margin-bottom: auto;
 }
 
-.mt-0 {
-  margin-top: 0px;
-}
-
 .mt-2 {
   margin-top: 0.5rem;
 }
@@ -1348,6 +1353,16 @@ select {
   height: 100vh;
 }
 
+.h-12 {
+  height: 3rem;
+}
+
+.h-max {
+  height: -webkit-max-content;
+  height: -moz-max-content;
+  height: max-content;
+}
+
 .max-h-\[200px\] {
   max-height: 200px;
 }
@@ -1360,6 +1375,24 @@ select {
   max-height: 18rem;
 }
 
+.min-h-min {
+  min-height: -webkit-min-content;
+  min-height: -moz-min-content;
+  min-height: min-content;
+}
+
+.min-h-fit {
+  min-height: -webkit-fit-content;
+  min-height: -moz-fit-content;
+  min-height: fit-content;
+}
+
+.min-h-max {
+  min-height: -webkit-max-content;
+  min-height: -moz-max-content;
+  min-height: max-content;
+}
+
 .w-full {
   width: 100%;
 }
@@ -1368,6 +1401,10 @@ select {
   width: 9rem;
 }
 
+.w-auto {
+  width: auto;
+}
+
 .max-w-screen-lg {
   max-width: 1024px;
 }
@@ -1384,6 +1421,14 @@ select {
   max-width: 768px;
 }
 
+.shrink {
+  flex-shrink: 1;
+}
+
+.grow {
+  flex-grow: 1;
+}
+
 .basis-1\/2 {
   flex-basis: 50%;
 }
@@ -1400,6 +1445,10 @@ select {
   resize: both;
 }
 
+.grid-cols-2 {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
 .flex-col {
   flex-direction: column;
 }
@@ -1589,6 +1638,11 @@ select {
   line-height: 1;
 }
 
+.text-sm {
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+
 .font-medium {
   font-weight: 500;
 }
@@ -1621,6 +1675,14 @@ select {
   line-height: 1.5;
 }
 
+.leading-3 {
+  line-height: .75rem;
+}
+
+.leading-4 {
+  line-height: 1rem;
+}
+
 .tracking-normal {
   letter-spacing: 0em;
 }
@@ -1799,20 +1861,36 @@ h4 {
   margin-bottom: 0.3em;
 }
 
-.prose-figure\:mt-0 :is(:where(figure):not(:where([class~="not-prose"] *))) {
-  margin-top: 0px;
-}
-
 .prose-img\:my-1 :is(:where(img):not(:where([class~="not-prose"] *))) {
   margin-top: 0.25rem;
   margin-bottom: 0.25rem;
 }
 
 @media (min-width: 1024px) {
+  .lg\:m-0 {
+    margin: 0px;
+  }
+
   .lg\:w-screen {
     width: 100vw;
   }
 
+  .lg\:w-10 {
+    width: 2.5rem;
+  }
+
+  .lg\:w-40 {
+    width: 10rem;
+  }
+
+  .lg\:max-w-md {
+    max-width: 28rem;
+  }
+
+  .lg\:max-w-xs {
+    max-width: 20rem;
+  }
+
   .lg\:flex-row {
     flex-direction: row;
   }
diff --git a/theme/static/css/dist/styles.css b/theme/static/css/dist/styles.css
index 5881d58..d9aa7e0 100644
--- a/theme/static/css/dist/styles.css
+++ b/theme/static/css/dist/styles.css
@@ -1270,6 +1270,10 @@ select {
   margin: 0.5rem;
 }
 
+.m-0 {
+  margin: 0px;
+}
+
 .mx-auto {
   margin-left: auto;
   margin-right: auto;
@@ -1280,6 +1284,11 @@ select {
   margin-bottom: 0px;
 }
 
+.my-2 {
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
 .mb-2 {
   margin-bottom: 0.5rem;
 }
@@ -1344,6 +1353,16 @@ select {
   height: 100vh;
 }
 
+.h-12 {
+  height: 3rem;
+}
+
+.h-max {
+  height: -webkit-max-content;
+  height: -moz-max-content;
+  height: max-content;
+}
+
 .max-h-\[200px\] {
   max-height: 200px;
 }
@@ -1356,6 +1375,24 @@ select {
   max-height: 18rem;
 }
 
+.min-h-min {
+  min-height: -webkit-min-content;
+  min-height: -moz-min-content;
+  min-height: min-content;
+}
+
+.min-h-fit {
+  min-height: -webkit-fit-content;
+  min-height: -moz-fit-content;
+  min-height: fit-content;
+}
+
+.min-h-max {
+  min-height: -webkit-max-content;
+  min-height: -moz-max-content;
+  min-height: max-content;
+}
+
 .w-full {
   width: 100%;
 }
@@ -1364,6 +1401,10 @@ select {
   width: 9rem;
 }
 
+.w-auto {
+  width: auto;
+}
+
 .max-w-screen-lg {
   max-width: 1024px;
 }
@@ -1380,6 +1421,14 @@ select {
   max-width: 768px;
 }
 
+.shrink {
+  flex-shrink: 1;
+}
+
+.grow {
+  flex-grow: 1;
+}
+
 .basis-1\/2 {
   flex-basis: 50%;
 }
@@ -1396,6 +1445,10 @@ select {
   resize: both;
 }
 
+.grid-cols-2 {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
 .flex-col {
   flex-direction: column;
 }
@@ -1585,6 +1638,11 @@ select {
   line-height: 1;
 }
 
+.text-sm {
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+
 .font-medium {
   font-weight: 500;
 }
@@ -1617,6 +1675,14 @@ select {
   line-height: 1.5;
 }
 
+.leading-3 {
+  line-height: .75rem;
+}
+
+.leading-4 {
+  line-height: 1rem;
+}
+
 .tracking-normal {
   letter-spacing: 0em;
 }
@@ -1801,10 +1867,30 @@ h4 {
 }
 
 @media (min-width: 1024px) {
+  .lg\:m-0 {
+    margin: 0px;
+  }
+
   .lg\:w-screen {
     width: 100vw;
   }
 
+  .lg\:w-10 {
+    width: 2.5rem;
+  }
+
+  .lg\:w-40 {
+    width: 10rem;
+  }
+
+  .lg\:max-w-md {
+    max-width: 28rem;
+  }
+
+  .lg\:max-w-xs {
+    max-width: 20rem;
+  }
+
   .lg\:flex-row {
     flex-direction: row;
   }
