Skip to content

Commit

Permalink
Merge pull request #16 from aidan-yip/v2.0.0
Browse files Browse the repository at this point in the history
Fixed app style bugs
  • Loading branch information
aidan-yip committed May 21, 2024
2 parents 087e576 + 8732ed6 commit 2cbaf3a
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 58 deletions.
Binary file modified .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

.DS_Store
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,14 @@
<div id="background">
<div class="container">
<div id="inner">
<h1>TODAY</h1>
<h1 id="location">TODAY</h1>
<p id="date"></p>
<div id="icon">
<span class="material-symbols-outlined md">
partly_cloudy_day
</span>
</div>
<h2 id="location"></h2>

<p id="temperature"></p>
<p id="description">Enter a city in Search</p>

Expand Down
126 changes: 70 additions & 56 deletions styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
}

@supports (padding: max(0px)) {
body,
header,
footer {
padding-left: min(0vmin, env(safe-area-inset-left));
padding-right: min(0vmin, env(safe-area-inset-right));
}
body,
header,
footer {
padding-left: min(0vmin, env(safe-area-inset-left));
padding-right: min(0vmin, env(safe-area-inset-right));
}
}

@keyframes fadeInAnimation {
0% {
Expand All @@ -44,14 +44,15 @@
body {
background-color: #0052bc;
padding-top: 0px;
min-width: 375px;
}

#background {
background-image: url("https://raw.githubusercontent.com/aidan-yip/weather_64/main/public/cloud.jpg");
background-size: cover;
background-position: center;
background-repeat: repeat;
padding-bottom: 100px;
padding-bottom: 500px;
padding-top: 50px;
height: 100%;
}
Expand All @@ -63,9 +64,9 @@ body {
margin-left: auto;
margin-right: auto;
min-width: 80%;
height: 730px;
height: auto;
text-align: center;
padding: 20px;
padding: 25px;
background: linear-gradient(
328deg,
rgba(209, 209, 209, 0.4) 0%,
Expand All @@ -84,6 +85,7 @@ body {

#side_out {
width: 32%;
height: 100%;
}

.side_block {
Expand All @@ -105,29 +107,38 @@ body {
}

#block_two {
align-items: center;
margin-top: 10px;
height: 170px;
}

#block_three {
align-items: center;
margin-top: 10px;
height: 300px;
height: auto;
}

iframe {
margin: 0 auto;
margin-top: 10px;
margin-bottom: 10px;
width: 95%;
height: 280px;
height: 300px;
border-radius: 25px;
border: none;
}

@media only screen and (min-width: 1500px) {
iframe {
height: 400px;
}
}

#clock {
font-size: 60px;
text-align: left;
letter-spacing: 2px;
padding: 10px 30px;
padding: 5px 30px;
margin-left: auto;
margin-right: auto;
padding-bottom: 0px;
Expand Down Expand Up @@ -156,34 +167,35 @@ iframe {
z-index: 0;
}

h1, #location {
font-size: 80px;
font-weight: bolder;
text-align: left;
padding: 20px 30px;
padding-bottom: 0px;
color: #121212;
font-family: var(--fontthird);
}

#icon {
display: flex;
justify-content: center;
align-items: center;
width: 100px;
height: 100px;
margin-left: 30px;
background-color: #ffffff;
border-radius: 25px;
box-shadow: 0px 0px 10px #1919193b;
display: flex;
justify-content: center;
align-items: center;
width: 130px;
height: 130px;
margin-left: 30px;
background-color: #ffffff;
border-radius: 100px;
box-shadow: 0px 0px 10px #1919193b;
}

div span.md {
justify-content: flex-start;
padding: 0px 30px;
font-size: 500%;
font-size: 400%;
color: #1babff;
}

h1 {
font-size: 80px;
text-align: left;
padding: 20px 30px;
padding-bottom: 0px;
color: #121212;
font-family: var(--fontthird);
}

#date {
font-size: 30px;
font-weight: 500;
Expand All @@ -194,17 +206,8 @@ h1 {
font-family: var(--fontdefault);
}

#location {
font-size: 60px;
font-weight: 300;
text-align: left;
padding: 10px 30px;
color: #121212;
font-family: var(--fontthird);
}

#temperature {
font-size: 100px;
font-size: 60px;
text-align: left;
padding: 10px 30px;
color: #121212;
Expand Down Expand Up @@ -257,13 +260,13 @@ button {
}

svg {
display: flex;
justify-content: flex-end;
margin-left: auto;
margin-right: auto;
width: 100%;
border-bottom-left-radius: 35px;
border-bottom-right-radius: 35px;
display: flex;
justify-content: flex-end;
margin-left: auto;
margin-right: auto;
width: 100%;
border-bottom-left-radius: 35px;
border-bottom-right-radius: 35px;
}

a {
Expand All @@ -281,16 +284,22 @@ a:visited {
}

@media only screen and (max-width: 1000px) {
h1 {
font-size: 50px;

#location {
font-size: 30px;
}

#date {
font-size: 20px;
#icon {
width: 50px;
height: 50px;
}

#location {
font-size: 20px;
div span.md {
font-size: 200%;
}

#date {
font-size: 15px;
}

#temperature {
Expand All @@ -317,6 +326,7 @@ a:visited {
#inner {
height: auto;
width: 100%;
margin-top: 20px;
}

#side_out {
Expand All @@ -328,9 +338,13 @@ a:visited {
height: 80px;
}

#block_tree {
height: 300px;
}

div.container {
margin-top: 20px;
height: 1100px;
height: auto;
display: flex;
flex-direction: column;
}
Expand All @@ -340,4 +354,4 @@ a:visited {
padding-bottom: 10px;
margin-bottom: 20px;
}
}
}

0 comments on commit 2cbaf3a

Please sign in to comment.