diff --git a/app/image/group.php b/app/image/group.php index 1450186..f6d1b1d 100644 --- a/app/image/group.php +++ b/app/image/group.php @@ -116,6 +116,13 @@ if (isset($_POST['title_submit'])) { } } +/* + |------------------------------------------------------------- + | New Group + |------------------------------------------------------------- + | + |------------------------------------------------------------- +*/ if (isset($_POST['new_group_submit'])) { if ($user_info->is_loggedin()) { $group_name = $_SESSION['username']."\'s Group"; @@ -140,6 +147,13 @@ if (isset($_POST['new_group_submit'])) { } } +/* + |------------------------------------------------------------- + | Delete Group + |------------------------------------------------------------- + | + |------------------------------------------------------------- +*/ if (isset($_POST['group_delete'])) { $query = $group_info->get_group_info($conn, $_POST['group_id']); @@ -153,16 +167,15 @@ if (isset($_POST['group_delete'])) { if ($stmt->execute()) { ?> * { margin: 0 0 0.5rem 0; } +.group-description a { + text-decoration: none; +} +.group-description a:hover { + color: #8C977D; +} .group-cover { height: 100%; - max-width: 40%; + max-width: 50%; width: auto; position: absolute; display: inline-block; @@ -516,7 +532,7 @@ nav .btn { width: 100%; height: 100%; position: absolute; - background: linear-gradient(to right, #151515, rgba(21, 21, 21, 0.7333333333)); + background: linear-gradient(to right, #151515, rgba(21, 21, 21, 0.8), rgba(21, 21, 21, 0.2)); z-index: 1; border-radius: 0.2rem; } @@ -707,7 +723,7 @@ nav .btn { margin: 0 auto; max-width: 100%; max-height: 15rem; - border-radius: -0.3rem; + border-radius: -0.1rem; display: flex; flex-direction: column; } @@ -727,7 +743,7 @@ nav .btn { height: 7.813rem; -o-object-fit: cover; object-fit: cover; - border-radius: -0.3rem; + border-radius: -0.1rem; background-color: #121212; } .pfp-upload form > * { @@ -772,7 +788,7 @@ nav .btn { display: none; flex-direction: column; background-color: #151515; - border-radius: -0.3rem; + border-radius: -0.1rem; } .log { @@ -819,7 +835,7 @@ nav .btn { display: none; flex-direction: column; background-color: #151515; - border-radius: -0.3rem; + border-radius: -0.1rem; } .ban { @@ -873,7 +889,7 @@ nav .btn { display: none; flex-direction: column; background-color: #151515; - border-radius: -0.3rem; + border-radius: -0.1rem; } .user { @@ -1002,7 +1018,7 @@ body * { font-family: "Secular One", sans-serif; text-decoration: none; border: none; - border-radius: -0.3rem; + border-radius: -0.1rem; transition: outline 0.1s cubic-bezier(0.19, 1, 0.22, 1); } .btn:hover { @@ -1018,7 +1034,7 @@ body * { text-decoration: none; background-color: #E8E3E3; border: none; - border-radius: -0.3rem; + border-radius: -0.1rem; } .btn:where(input[type=file])::file-selector-button { margin: -0.25rem 0.5rem -0.25rem -0.25rem; @@ -1028,7 +1044,7 @@ body * { text-decoration: none; background-color: #E8E3E3; border: none; - border-radius: -0.3rem; + border-radius: -0.1rem; } a.btn { diff --git a/css/main.scss b/css/main.scss index 6ab093d..82ee3f9 100644 --- a/css/main.scss +++ b/css/main.scss @@ -78,7 +78,7 @@ body { text-decoration: none; border: none; - border-radius: calc($rad - 0.7rem); + border-radius: calc($rad - 0.5rem); transition: outline 0.1s cubic-bezier(.19, 1, .22, 1); @@ -102,7 +102,7 @@ body { background-color: $white; border: none; - border-radius: calc($rad - 0.7rem); + border-radius: calc($rad - 0.5rem); } } diff --git a/css/scss/_body.scss b/css/scss/_body.scss index 2ff51f5..5d49a8c 100644 --- a/css/scss/_body.scss +++ b/css/scss/_body.scss @@ -72,7 +72,7 @@ min-width: calc(20% - 0.5rem); background-color: $bg; - border-radius: calc($rad - 0.7rem); + border-radius: calc($rad - 0.5rem); position: relative; @@ -370,7 +370,7 @@ background-color: $page-accent; - border-radius: calc($rad - 0.7rem); + border-radius: calc($rad - 0.5rem); font-family: $font-body; @@ -396,14 +396,39 @@ z-index: +1; + h2 { + span { + margin-left: 0.25rem; + + font-size: 16px; + } + a { + margin-left: 0.25rem; + + font-size: 16px; + + color: $page-accent; + + text-decoration: none; + } + } + & > * { margin: 0 0 0.5rem 0; } + + a { + text-decoration: none; + + &:hover { + color: $page-accent; + } + } } .group-cover { height: 100%; - max-width: 40%; + max-width: 50%; width: auto; position: absolute; @@ -423,7 +448,7 @@ position: absolute; - background: linear-gradient(to right, $bg, $bg-alt); + background: linear-gradient(to right, $bg, rgba($bg, 0.8), rgba($bg, 0.2)); z-index: +1; @@ -655,7 +680,7 @@ max-width: 100%; max-height: 15rem; - border-radius: calc($rad - 0.7rem); + border-radius: calc($rad - 0.5rem); display: flex; flex-direction: column; @@ -678,7 +703,7 @@ object-fit: cover; - border-radius: calc($rad - 0.7rem); + border-radius: calc($rad - 0.5rem); background-color: $black; } @@ -730,7 +755,7 @@ display: none; flex-direction: column; background-color: $bg; - border-radius: calc($rad - 0.7rem); + border-radius: calc($rad - 0.5rem); } .log { min-width: 850px; @@ -782,7 +807,7 @@ display: none; flex-direction: column; background-color: $bg; - border-radius: calc($rad - 0.7rem); + border-radius: calc($rad - 0.5rem); } .ban { min-width: 900px; @@ -840,7 +865,7 @@ display: none; flex-direction: column; background-color: $bg; - border-radius: calc($rad - 0.7rem); + border-radius: calc($rad - 0.5rem); } .user { min-width: 950px; diff --git a/group.php b/group.php index 37aba37..7ee3e64 100644 --- a/group.php +++ b/group.php @@ -27,37 +27,37 @@ - + + + - -
"; - echo "

".$group['group_name']."

"; - $author_info = $user_info->get_user_info($conn, $group['author']); - echo "

By: ".$author_info['username']."

"; + echo "

".$group['group_name']."by".$author_info['username']."

"; $group_members = $group_info->get_group_members($conn, $_GET['id']); if (!empty($group_members)) { $members_array = array(); foreach ($group_members as $member) { $member_info = $user_info->get_user_info($conn, $member); - if (!empty($member_info['username'])) $members_array[] = "".$member_info['username'].""; + if (!empty($member_info['username'])) $members_array[] = "".$member_info['username'].""; } - echo "

Members: ".implode(", ", $members_array)."

"; + echo "

Featured: ".implode(", ", $members_array)."

"; } if (!empty($group['image_list'])) echo "

Images: ".count(explode(" ", $group['image_list']))."

";