diff --git a/app/app.json b/app/app.json index bbb10e5..1dfc5ea 100644 --- a/app/app.json +++ b/app/app.json @@ -1,5 +1,5 @@ { "license": "GPL 3.0", - "version": "22.10.19", + "version": "22.10.20", "branch": "main" } \ No newline at end of file diff --git a/app/image/image.php b/app/image/image.php index e706b74..d2efd46 100644 --- a/app/image/image.php +++ b/app/image/image.php @@ -113,10 +113,13 @@ if (isset($_POST['submit_description'])) { // Attempt to execute the prepared statement if (mysqli_stmt_execute($stmt)) { + $_SESSION['msg'] = "Description has been updated successfully!"; ?> * { margin-top: 0; @@ -814,6 +816,7 @@ nav .btn { position: -webkit-sticky; position: sticky; top: 0; + z-index: 2; } .bans { @@ -868,6 +871,7 @@ nav .btn { position: -webkit-sticky; position: sticky; top: 0; + z-index: 2; } .user-settings { @@ -925,6 +929,7 @@ nav .btn { position: -webkit-sticky; position: sticky; top: 0; + z-index: 2; } .btn-code { @@ -1057,9 +1062,13 @@ body * { border-radius: 3px; } .btn:disabled { - opacity: 0.5; cursor: not-allowed; outline: none; + z-index: 1; + filter: brightness(0.5) grayscale(0.3); +} +.btn:disabled img { + display: none; } a.btn { @@ -1212,4 +1221,26 @@ a.link:hover { * { transition: none !important; } +} +.hr { + margin: 0.5rem 0; + border: none; + border-top: 0.2rem solid #E8E3E3; +} + +.hr-full { + margin-left: -0.5rem; + margin-right: -0.5rem; +} + +.hr-bad { + border-color: #B66467; +} + +.hr-warning { + border-color: #D8A657; +} + +.hr-good { + border-color: #8C977D; }/*# sourceMappingURL=main.css.map */ \ No newline at end of file diff --git a/css/main.scss b/css/main.scss index bd7f300..5c33a1e 100644 --- a/css/main.scss +++ b/css/main.scss @@ -115,9 +115,16 @@ body { } &:disabled { - opacity: 0.5; cursor: not-allowed; outline: none; + + z-index: 1; + + filter: brightness(0.5) grayscale(0.3); + + img { + display: none; + } } } @@ -296,4 +303,26 @@ a.link { * { transition: none !important; } +} + +.hr { + margin: 0.5rem 0; + + border: none; + border-top: $border-thickness solid $fg; +} + +.hr-full { + margin-left: -0.5rem; + margin-right: -0.5rem; +} + +.hr-bad { + border-color: $warning; +} +.hr-warning { + border-color: $alert; +} +.hr-good { + border-color: $page-accent; } \ No newline at end of file diff --git a/css/scss/_body.scss b/css/scss/_body.scss index 2726c49..4754958 100644 --- a/css/scss/_body.scss +++ b/css/scss/_body.scss @@ -823,6 +823,7 @@ background-color: $bg; position: sticky; top: 0; + z-index: 2; } .bans { @@ -885,6 +886,7 @@ background-color: $bg; position: sticky; top: 0; + z-index: 2; } .user-settings { @@ -951,6 +953,7 @@ background-color: $bg; position: sticky; top: 0; + z-index: 2; } .btn-code { diff --git a/css/scss/_mixin.scss b/css/scss/_mixin.scss index be2d555..7db48bf 100644 --- a/css/scss/_mixin.scss +++ b/css/scss/_mixin.scss @@ -12,7 +12,9 @@ margin-bottom: 1rem; padding: 0.5rem 0.5rem 0 0.5rem; - width: calc(100% - 1.4rem); + width: 100%; + + box-sizing: border-box; >* { margin-top: 0; diff --git a/css/scss/_navigation.scss b/css/scss/_navigation.scss index cbbb7af..87a6e90 100644 --- a/css/scss/_navigation.scss +++ b/css/scss/_navigation.scss @@ -10,12 +10,14 @@ nav { margin: 0 auto 1rem; padding: 0.5rem; - width: calc(100% - 1.4rem); + width: 100%; height: auto; background-color: $bg-alt; backdrop-filter: blur(69px) saturate(100%) brightness(100%); + box-sizing: border-box; + position: sticky; z-index: 99; top: 1rem; diff --git a/group.php b/group.php index ca1cf64..cd1f140 100644 --- a/group.php +++ b/group.php @@ -76,11 +76,11 @@ if (!empty($group['image_list'])) echo "

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

"; - $upload_time = new DateTime($group['created_on']); - echo "

Created at: ".$upload_time->format(format: 'd/m/Y H:i:s T')."

"; + + echo "

Created at: ".$group['created_at']->format('d/m/Y H:i:s T')."

"; ?> @@ -254,7 +254,7 @@ "; - } elseif (empty($image_list[0])) { + } elseif ($image_list == null) { echo "

Nothing here!

There are no images in the group, add some!

diff --git a/image.php b/image.php index 61bd287..1cdf79f 100644 --- a/image.php +++ b/image.php @@ -49,6 +49,15 @@ + + @@ -125,7 +134,7 @@ echo "

ID: ".$image['id']."

"; } - $upload_time = new DateTime($image['upload_date']); + $upload_time = new DateTime(); echo "

Uploaded at: ".$upload_time->format('d/m/Y H:i:s T')."

"; ?>