Merge remote-tracking branch 'refs/remotes/origin/main'

merge

assets/style.css

@@ -376,7 +376,8 @@ div#articleslist>article{
 .meme, .meme_body {
     display: flex;
     flex-direction: column;
-    height: fit-content;
+    padding: 0;
+    margin: 0;
 }
 
 .positive {
@@ -408,8 +409,16 @@ div#articleslist>article{
     --pico-border-color: unset;
 }
 
+#meme_gallery {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(600px, 1fr));
+    grid-auto-rows: 1fr;
+    gap: 20px
+}
+
 @media (max-width: 1050px) {
 
+
     table .rozvrh {
         overflow: auto;
     }
@@ -467,7 +476,7 @@ div#articleslist>article{
         display: flex;
         -moz-box-shadow: 0 20px 28px 0 var(--dimmer);
         -webkit-box-shadow: 0 20px 28px 0 var(--dimmer);
-        background-color: var(--dimmer);
+        background-color: var(--pico-primary-background);
         box-shadow: 0 20px 28px 0 var(--dimmer);
         top: 100px;
         text-align: center;

pages/notes/index.html

@@ -4,3 +4,5 @@
     <h1 class="title">Adlerka Zošit</h1>
 </header>
 <hr>
+<h2>Čoskoro bude v prevádzke</h2>
+<h3>Nájdete(a pridáte) tu poznámky a úlohy zo školy</h3>

templates/login.html

@@ -9,20 +9,20 @@
                 <input type="password" name="password" id="login_password" required placeholder="Password">
                 <button type="button" onclick="login()">Login</button>
             </form>
-            <p onclick="toggleRegister()">Register</p>
+            <p onclick="toggleRegister()">Don't have an account</p>
         </div>
-        <div class="form-container sign-up" id="sign_up_form">
+        <div class="form-container sign-up hidden" id="sign_up_form">
             <h1>Create Account</h1>
-            <form class="form-content sign-up hidden">
+            <form class="form-content sign-up">
                 <input type="text" name="firstName" id="register_firstName" required placeholder="First name">
                 <input type="text" name="lastName" id="register_lastName" required placeholder="Last name">
                 <input type="email" name="email" id="register_email" required placeholder="Email">
                 <input type="password" name="password" id="register_password" required placeholder="Password">
                 <input type="text" name="activationToken" id="register_activationToken" required
                        placeholder="Activation Token">
-                <button type="button" onclick="register()">Register</button>
+                <button type="button">Register</button>
             </form>
-            <p onclick="toggleRegister()">Login</p>
+            <p onclick="toggleRegister()">Already have an account</p>
         </div>
     </div>
 </main>

templates/nav.html

@@ -1,9 +1,11 @@
 <div class="logo">
+    <a href="/home/index">
     <picture id="standard-logo">
         <source media="(min-width:4200px)" srcset="/assets/images/adlerka_256.png">
         <source media="(min-width:2100px)" srcset="/assets/images/adlerka_128.png">
         <img src="/assets/images/adlerka_64.png" alt="Adlerka logo" style="width:auto;">
     </picture>
+    </a>
 </div>
 <i class="ri-menu-line" id="toggle_button"></i>
 <ul id="navsite_list">