From 2ef5b6d54a9b5b04a9eafdfa31fbeefedda22e7c Mon Sep 17 00:00:00 2001
From: Fluffy-Bean <michal-gdula@protonmail.com>
Date: Wed, 2 Nov 2022 16:02:40 +0000
Subject: [PATCH] Logo support slowly coming Fixing CSS typos Fixing alert
 typos

---
 .gitignore                |  1 +
 app/account/account.php   |  2 +-
 assets/ui/nav.php         |  5 +++++
 css/main.css              | 22 +++++++++++++++++++---
 css/main.scss             | 17 ++++++++++++++---
 css/scss/_navigation.scss | 21 +++++++++++++++++++--
 usr/conf.default.json     |  1 +
 7 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index e28a543..073e05c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Dont include user generated content in github repo
 images/
 conf/
+usr/logo.*
 *.map
 
 # Dont include PHPStorm project files
diff --git a/app/account/account.php b/app/account/account.php
index f981df3..3c28cba 100644
--- a/app/account/account.php
+++ b/app/account/account.php
@@ -242,7 +242,7 @@ if (isset($_POST['submit_signup'])) {
             $error = $error + 1;
         } elseif(strlen(trim($_POST["password"])) < 6){
             // Password not long enough 👀
-            echo "<p class='alert alert-warning'>Not long enough for my taste 👀</p>";
+            echo "<p class='alert alert-warning'>(Password) Not long enough for my taste 👀</p>";
             $error = $error + 1;
         } else {
             $password = trim($_POST["password"]);
diff --git a/assets/ui/nav.php b/assets/ui/nav.php
index 0cec3b7..927564f 100644
--- a/assets/ui/nav.php
+++ b/assets/ui/nav.php
@@ -7,6 +7,11 @@ $loggedin = new Account();
 
 <nav class="nav-root">
 	<div class="nav-name">
+		<?php
+			if (isset($user_settings['logo']) && $user_settings['logo'] != "") {
+				echo "<img src='usr/".$user_settings['logo']."' alt='Logo'>";
+			}
+		?>
 		<p><?php echo $user_settings['website_name']; ?></p>
 	</div>
 	<div class="nav-links">
diff --git a/css/main.css b/css/main.css
index 4e38284..bffed00 100644
--- a/css/main.css
+++ b/css/main.css
@@ -82,8 +82,16 @@ nav .btn {
   justify-content: space-around;
   margin: 0;
   font-family: "Lexend Deca", sans-serif;
-  font-size: 22px;
-  display: block;
+  font-size: 1.5rem;
+  line-height: 1.69rem;
+}
+.nav-name img {
+  margin: 0 0.5rem 0 0;
+  padding: 0;
+  width: 1.69rem;
+  height: 1.69rem;
+  display: inline;
+  border-radius: 3px;
 }
 
 .nav-links {
@@ -1131,6 +1139,13 @@ a.btn {
   background-image: linear-gradient(120deg, rgba(140, 151, 125, 0.3), rgba(21, 21, 21, 0));
 }
 
+.alert-box > * {
+  margin: 0 0 0.5rem 0;
+}
+.alert-box > *:last-child {
+  margin: 0;
+}
+
 /*
  |-------------------------------------------------------------
  | BADGES
@@ -1141,10 +1156,11 @@ a.btn {
   box-sizing: border-box;
   padding: 0.2em 0.4em;
   border: #121212 0.2rem solid;
-  border-radius: 0.4rem;
+  border-radius: 3px;
   color: #E8E3E3;
   font-size: 0.8em;
   font-weight: bold;
+  font-family: "Secular One", sans-serif;
   line-height: 1;
   vertical-align: baseline;
   white-space: nowrap;
diff --git a/css/main.scss b/css/main.scss
index 8e7ec9e..8989904 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -196,6 +196,16 @@ a.btn {
     background-image: linear-gradient(120deg, rgba($page-accent, 0.3), rgba($bg, 0));
 }
 
+.alert-box {
+    > * {
+        margin: 0 0 0.5rem 0;
+    }
+
+    > *:last-child {
+        margin: 0;
+    }
+}
+
 /*
  |-------------------------------------------------------------
  | BADGES
@@ -216,14 +226,15 @@ a.btn {
     //margin: 0 0.25rem;
     padding: 0.2em 0.4em;
     border: $black $border-thickness solid;
-    @if $rad <= 0 {
-        border-radius: 3px;
+    @if calc($rad - 0.5rem) > 0 {
+        border-radius: calc($rad - 0.3rem);
     } @else {
-        border-radius: $rad;
+        border-radius: 3px;
     }
     color: $fg;
     font-size: 0.8em;
     font-weight: bold;
+    font-family: $font-body;
     line-height: 1;
     vertical-align: baseline;
     white-space: nowrap;
diff --git a/css/scss/_navigation.scss b/css/scss/_navigation.scss
index 57ba011..0a807fe 100644
--- a/css/scss/_navigation.scss
+++ b/css/scss/_navigation.scss
@@ -48,9 +48,26 @@ nav {
 
     font-family: $font-header;
 
-    font-size: 22px;
+    font-size: 1.5rem;
+    line-height: 1.69rem;
 
-    display: block;
+    img {
+        margin: 0 0.5rem 0 0;
+        padding: 0;
+
+        width: 1.69rem;
+        height: 1.69rem;
+
+        //vertical-align: middle;
+
+        display: inline;
+
+        @if calc($rad - 0.5rem) > 0 {
+            border-radius: calc($rad - 0.3rem);
+        } @else {
+            border-radius: 3px;
+        }
+    }
 }
 
 .nav-links {
diff --git a/usr/conf.default.json b/usr/conf.default.json
index e8fcb41..1687183 100644
--- a/usr/conf.default.json
+++ b/usr/conf.default.json
@@ -1,6 +1,7 @@
 {
     "website_name": "Only Legs",
     "website_description": "A simple PHP gallery with multiple users in mind",
+    "logo": "",
     "user_name": "[your name]",
     "is_testing": true,
     "upload": {