From 96f3e53b2ada905e258e451e91f88611778af298 Mon Sep 17 00:00:00 2001
From: Fluffy-Bean <michal-gdula@protonmail.com>
Date: Mon, 26 Sep 2022 20:37:26 +0000
Subject: [PATCH] Sass fixy

---
 app/settings/manifest.json |  2 +-
 css/main.css               | 13 +++++++-----
 css/scss/_body.scss        | 14 ++++++++-----
 css/scss/_mixin.scss       |  4 ++--
 css/scss/_navigation.scss  |  2 +-
 css/scss/_variables.scss   |  3 +++
 group.php                  |  2 --
 profile.php                | 42 +++++++++++++++++++++-----------------
 8 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/app/settings/manifest.json b/app/settings/manifest.json
index 91f5d74..25be4d5 100644
--- a/app/settings/manifest.json
+++ b/app/settings/manifest.json
@@ -24,7 +24,7 @@
         "Eat hotchip and lie"
     ],
     "license":"GPL 3.0",
-    "version": "22.09.23",
+    "version": "22.09.26",
     "user_name": "[your name]",
     "is_testing": "true",
     "upload_max": "32"
diff --git a/css/main.css b/css/main.css
index 9dbbfb9..1e1ac27 100644
--- a/css/main.css
+++ b/css/main.css
@@ -33,7 +33,7 @@ nav {
   background-color: #151515;
   color: #E8E3E3;
   border-radius: 0.4rem;
-  border: 0.2rem solid #8C977D;
+  border: #8C977D 0.2rem solid;
   box-shadow: 6px 6px 2px rgba(21, 21, 21, 0.4);
   display: flex;
   flex-direction: row;
@@ -109,7 +109,7 @@ nav .btn {
     -webkit-backdrop-filter: blur(8px);
             backdrop-filter: blur(8px);
     border: none;
-    border-top: 3px solid #8C977D;
+    border-top: #8C977D 0.2rem solid;
     border-radius: 0;
     -webkit-backdrop-filter: blur(16px);
             backdrop-filter: blur(16px);
@@ -153,7 +153,7 @@ nav .btn {
   background-color: #151515;
   color: #E8E3E3;
   border-radius: 0.4rem;
-  border: 0.2rem solid #8C977D;
+  border: #8C977D 0.2rem solid;
   box-shadow: 6px 6px 2px rgba(21, 21, 21, 0.4);
 }
 
@@ -161,7 +161,7 @@ nav .btn {
   background-color: #151515;
   color: #E8E3E3;
   border-radius: 0.4rem;
-  border: 0.2rem solid #B66467;
+  border: #B66467 0.2rem solid;
   box-shadow: 6px 6px 2px rgba(21, 21, 21, 0.4);
 }
 
@@ -516,6 +516,9 @@ nav .btn {
 .group-description a:hover {
   color: #8C977D;
 }
+.group-description .btn:hover {
+  color: #E8E3E3;
+}
 
 .group-cover {
   height: 100%;
@@ -871,7 +874,7 @@ nav .btn {
 }
 
 .perm {
-  border-left: #B66467 0.2rem solid;
+  border-left: #8C977D 0.2rem solid;
 }
 
 .ban:first-of-type {
diff --git a/css/scss/_body.scss b/css/scss/_body.scss
index 5d49a8c..e49c7f6 100644
--- a/css/scss/_body.scss
+++ b/css/scss/_body.scss
@@ -424,6 +424,10 @@
             color: $page-accent;
         }
     }
+
+    .btn:hover {
+        color: $fg;
+    }
 }
 
 .group-cover {
@@ -452,7 +456,7 @@
 
         z-index: +1;
 
-        border-radius: calc($rad - 0.2rem);
+        border-radius: calc($rad - $border-thickness);
     }
 
     img {
@@ -463,7 +467,7 @@
 
         margin-left: auto;
 
-        border-radius: calc($rad - 0.2rem);
+        border-radius: calc($rad - $border-thickness);
     }
 }
 
@@ -621,7 +625,7 @@
         transform: translateX(-50%);
 
         border-radius: $rad;
-        border: $page-accent 0.2rem solid;
+        border: $border;
 
         background-color: $bg;
     }
@@ -846,7 +850,7 @@
     }
 }
 .perm {
-    border-left: $red 0.2rem solid;
+    border-left: $border;
 }
 .ban:first-of-type {
     background-color: $bg;
@@ -907,7 +911,7 @@
     }
 }
 .is-admin {
-    border-left: $page-accent 0.2rem solid;
+    border-left: $border;
 }
 .user:first-of-type {
     background-color: $bg;
diff --git a/css/scss/_mixin.scss b/css/scss/_mixin.scss
index dcc5897..be2d555 100644
--- a/css/scss/_mixin.scss
+++ b/css/scss/_mixin.scss
@@ -1,9 +1,9 @@
-@mixin defaultDecoration($border) {
+@mixin defaultDecoration($border-colour) {
     background-color: $bg;
     color: $fg;
 
     border-radius: $rad;
-    border: 0.2rem solid $border;
+    border: $border-colour $border-thickness solid;
 
     box-shadow: $shadow;
 }
diff --git a/css/scss/_navigation.scss b/css/scss/_navigation.scss
index 0ef6565..45976a5 100644
--- a/css/scss/_navigation.scss
+++ b/css/scss/_navigation.scss
@@ -88,7 +88,7 @@ nav {
         backdrop-filter: blur(8px);
 
         border: none;
-        border-top: 3px solid $green;
+        border-top: $border;
         border-radius: 0;
 
         backdrop-filter: blur(16px);
diff --git a/css/scss/_variables.scss b/css/scss/_variables.scss
index 1104a3c..cd0eccd 100644
--- a/css/scss/_variables.scss
+++ b/css/scss/_variables.scss
@@ -14,6 +14,9 @@ $page-accent: #8C977D;
 
 $shadow: 6px 6px 2px #15151566;
 $rad: 0.4rem;
+$border-thickness: 0.2rem;
+
+$border: $page-accent $border-thickness solid;
 
 $weight-bold: 621;
 $weight-normal: 400;
diff --git a/group.php b/group.php
index 7ee3e64..79c38f6 100644
--- a/group.php
+++ b/group.php
@@ -148,9 +148,7 @@
 
             echo "</div>";
 
-            $image_list = explode(" ", $group['image_list']);
             $cover_image = $image_info->get_image_info($conn, $image_list[array_rand($image_list, 1)]);
-
             if (!empty($cover_image['imagename'])) {
                 ?>
                     <div class='group-cover'>
diff --git a/profile.php b/profile.php
index 7c572ef..5274c97 100644
--- a/profile.php
+++ b/profile.php
@@ -1,4 +1,19 @@
-<?php require_once __DIR__."/app/required.php"; ?>
+<?php
+    require_once __DIR__."/app/required.php"; 
+
+    use App\Account;
+    use App\Diff;
+
+    $user_info = new Account();
+    $diff = new Diff();
+
+    if (!isset($_GET['user']) || empty($_GET['user'])) {
+        header("Location: index.php");
+    } elseif (isset($_GET['user'])) {
+        $user = $user_info->get_user_info($conn, $_GET['user']);
+
+    $join_date = new DateTime($user['created_at']);
+?>
 
 <!DOCTYPE html>
 <html>
@@ -8,22 +23,7 @@
 </head>
 
 <body>
-	<?php
-		require_once __DIR__."/assets/ui/nav.php";
-
-        use App\Account;
-		use App\Diff;
-
-		$user_info = new Account();
-		$diff = new Diff();
-
-        if (!isset($_GET['user']) || empty($_GET['user'])) {
-            header("Location: index.php");
-        } elseif (isset($_GET['user'])) {
-            $user = $user_info->get_user_info($conn, $_GET['user']);
-
-            $join_date = new DateTime($user['created_at']);
-	?>
+	<?php require_once __DIR__."/assets/ui/nav.php"; ?>
 
         <div class="profile-root defaultDecoration defaultSpacing defaultFonts">
             <?php
@@ -34,8 +34,12 @@
                         echo "<img src='assets/no_image.png'>";
                     }
                     ?>
-                        <h2><?php echo $user['username']; ?></h2>
-                        <?php if ($user_info->is_admin($conn, $user['id'])) echo "<p style='color: var(--accent);'>Admin</p>"; ?>
+                        <h2>
+                            <?php
+                                echo $user['username'];
+                                if ($user_info->is_admin($conn, $user['id'])) echo "<span style='color: var(--accent); font-size: 16px; margin-left: 0.5rem;'>Admin</span>";
+                            ?>
+                        </h2>
                         <div class="profile-info">
                             <p id="joinDate">Member since: <?php echo $join_date->format('d/m/Y T'); ?></p>
                             <p id="postCount"></p>