diff --git a/client/Show.jsx b/client/Show.jsx
index fe2fafe..890a1d4 100644
--- a/client/Show.jsx
+++ b/client/Show.jsx
@@ -98,7 +98,7 @@ export default function Weather() {
{ (mainLoading) ? (
-
+
) : (
<>
@@ -137,7 +137,7 @@ export default function Weather() {
{ (forecastLoading) ? (
-
+
) : (
<>
@@ -150,10 +150,10 @@ export default function Weather() {
{ forecastData.list.map((day) => {
const localDate = DateTime.fromSeconds(day.dt)
- const date = DateTime.fromSeconds(day.dt).setZone(localTime.zone);
+ const date = localDate.setZone(localTime.zone);
const dateDayOrNight = (date.hour > 6 && date.hour < 20) ? "d" : "n";
- const now = new Date();
- const dateString = (now.month < localDate.month|| now.day < localDate.day) ? localDate.toFormat("HH:mm") : "";
+ const now = DateTime.now();
+ const dateString = (now.month < localDate.month || now.day < localDate.day) ? localDate.toFormat("dd/MM") : "";
return (
diff --git a/client/styles/show.module.scss b/client/styles/show.module.scss
index 2258594..4abb027 100644
--- a/client/styles/show.module.scss
+++ b/client/styles/show.module.scss
@@ -10,11 +10,11 @@
.weather {
display: grid;
grid-template-rows: min-content auto;
- padding: 16px;
}
.locationBar {
position: relative;
+ margin: 16px;
padding: 16px;
display: flex;
align-items: center;
@@ -53,7 +53,8 @@
}
.mainTemp {
- margin-top: 16px;
+ margin: 16px;
+ margin-top: 0px;
display: grid;
grid-template-rows: 1fr 1fr;
background-color: #1e1e1e;