Skip to content

Commit 7aa71d7

Browse files
Added Flexboxes and fonts
1 parent 8521aef commit 7aa71d7

13 files changed

+93
-55
lines changed

customers/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<meta http-equiv="X-UA-Compatible" content="ie=edge">
99
<title>uHost Customers</title>
1010
<link rel="shortcut icon" href="../favicon.png">
11-
<link href="https://fonts.googleapis.com/css?family=Anton|Montserrat:400,700" rel="stylesheet">
11+
<!-- <link href="https://fonts.googleapis.com/css?family=Anton|Montserrat:400,700" rel="stylesheet"> -->
1212
<link rel="stylesheet" href="../shared.css">
1313
<link rel="stylesheet" href="customers.css">
1414
</head>

index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0">
88
<title>uHost</title>
99
<link rel="shortcut icon" href="favicon.png">
10-
<link href="https://fonts.googleapis.com/css?family=Anton" rel="stylesheet">
11-
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet">
10+
1211
<link rel="stylesheet" href="shared.css">
1312
<link rel="stylesheet" href="main.css">
1413
</head>

main.css

+18-12
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@
3030
font-size: 3rem;
3131
}
3232
}
33-
/*
34-
.plan__list {
35-
width: 100%;
36-
margin: auto;
37-
text-align: center;
38-
} */
33+
3934

4035
.plan {
4136
background: #d5ffdc;
@@ -44,6 +39,8 @@
4439
margin: 0.5rem 0;
4540
width: 100%;
4641
vertical-align: middle;
42+
display: flex;
43+
flex-direction: column;
4744
}
4845

4946
.plan--highlighted {
@@ -88,17 +85,23 @@
8885

8986
@media (min-width: 40rem) {
9087
.plan__list {
91-
text-align: center;
88+
display: flex;
9289
width: 100%;
90+
justify-content: center;
91+
align-items: center;
92+
flex-direction: row;
9393
}
9494
.plan {
95-
display: inline-block;
96-
width: 30%;
97-
vertical-align: middle;
9895
min-width: 13rem;
9996
max-width: 25rem;
97+
display: flex;
98+
flex-direction: column;
99+
justify-content: space-between;
100+
height: 28rem;
100101
}
101102
.plan--highlighted {
103+
z-index: 50;
104+
height: 30rem;
102105
box-shadow: 2px 2px 2px 2px rgba(0, 0, 0, 0.5);
103106
}
104107
}
@@ -145,11 +148,14 @@
145148

146149
@media (min-width: 40rem) {
147150
.key-feature {
148-
display: inline-block;
149151
width: 30%;
150-
vertical-align: top;
151152
max-width: 25rem;
152153
}
154+
155+
.key-feature__list {
156+
display: flex;
157+
justify-content: center;
158+
}
153159
}
154160

155161

packages/AnonymousPro-BoldItalic.ttf

93.8 KB
Binary file not shown.

packages/AnonymousPro-Italic.ttf

96.3 KB
Binary file not shown.

packages/anonymousPro-Bold.ttf

105 KB
Binary file not shown.

packages/anonymousPro-Regular.ttf

110 KB
Binary file not shown.

packages/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0">
88
<title>uHost</title>
99
<link rel="shortcut icon" href="../favicon.png">
10-
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet">
10+
<!-- <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet"> -->
1111
<link rel="stylesheet" href="../shared.css">
1212
<link rel="stylesheet" href="packages.css">
1313
</head>

packages/packages.css

+15-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
padding-top: 2rem;
33
} */
44

5+
@font-face {
6+
font-family: "AnonymousPro";
7+
src: url("./anonymousPro-Regular.ttf") format("truetype");
8+
}
9+
10+
@font-face {
11+
font-family: "AnonymousPro";
12+
src: url("./anonymousPro-Bold.ttf") format("truetype");
13+
font-weight: 700;
14+
}
15+
516
.background {
617
background: url("../images/plans-background.jpg") center / cover;
718
position: fixed;
@@ -53,9 +64,12 @@
5364
.package__info {
5465
padding: 1rem;
5566
border: 1px solid #0e4f1f;
56-
font-size: 1.25rem;
67+
/* font-size: 1.25rem; */
5768
color: #0e4f1f;
5869
background: white;
70+
/* font-family: "AnonymousPro", sans-serif;
71+
font-weight: 700; */
72+
font: 700 1.25rem "AnonymousPro", sans-serif;
5973
}
6074

6175
.clearfix {

shared.css

+45-31
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@import url("https://fonts.googleapis.com/css?family=Anton");
2+
@import url("https://fonts.googleapis.com/css?family=Roboto:100,400,900");
3+
@import url("https://fonts.googleapis.com/css?family=Montserrat:400,700");
14

25
/* Global Styles */
36

@@ -37,13 +40,13 @@ main {
3740
position: fixed;
3841
top: 0;
3942
left: 0;
40-
z-index: 1;
43+
z-index: 60;
44+
display: flex;
45+
align-items: center;
46+
justify-content: space-between;
4147
}
4248

43-
.main-header > div {
44-
display: inline-block;
45-
vertical-align: middle;
46-
}
49+
4750

4851
/* Toggle Mobile Nav button */
4952

@@ -73,41 +76,27 @@ main {
7376
color: #0e4f1f;
7477
font-weight: bold;
7578
text-decoration: none;
76-
/* font-size: 1.375rem; */
77-
height: 2.5rem;
78-
display: inline-block;
79-
/* height: 1.375rem; */
80-
vertical-align: middle;
8179
}
8280

8381
.main-header__brand img {
84-
height: 100%;
82+
height: 2.5rem;
83+
vertical-align: middle;
8584
}
8685

8786
.main-nav {
8887
display: none;
89-
text-align: right;
90-
width: calc(100% - 44px);
91-
vertical-align: middle;
9288
}
9389

94-
@media (min-width: 40rem) {
95-
.main-nav {
96-
display: inline-block;
97-
}
98-
.toggle-button {
99-
display: none;
100-
}
101-
}
90+
10291

10392
.main-nav__items {
10493
margin: 0;
10594
padding: 0;
10695
list-style: none;
96+
display: flex;
10797
}
10898

10999
.main-nav__item {
110-
display: inline-block;
111100
margin: 0 0.625rem;
112101
}
113102

@@ -149,19 +138,21 @@ main {
149138
z-index: 101;
150139
position: fixed;
151140
height: 100vh;
152-
width: 50%;
141+
width: 80%;
153142
background: white;
154143
top: 0;
155144
left: 0;
156145
}
157146

158147
.mobile-nav__items {
159148
list-style: none;
160-
margin: 14rem auto;
161149
padding: 0;
162-
text-align: center;
163-
width: 90%;
150+
width: 100%;
164151
height: 100%;
152+
display: flex;
153+
flex-direction: column;
154+
justify-content: center;
155+
align-items: center;
165156
}
166157

167158
.mobile-nav__item {
@@ -213,7 +204,12 @@ main {
213204
font-weight: bolder;
214205
}
215206

216-
207+
.button[disabled] {
208+
cursor: not-allowed;
209+
border: #a1a1a1;
210+
background: #ccc;
211+
color: #a1a1a1;
212+
}
217213

218214

219215
/* Footer */
@@ -228,16 +224,17 @@ main {
228224
list-style: none;
229225
margin: 0;
230226
padding: 0;
231-
text-align: center;
227+
display: flex;
228+
flex-direction: column;
229+
align-items: center;
232230
}
233231

234232
.main-footer__link {
235-
display: inline-block;
233+
margin: 0.5rem 0;
236234
}
237235

238236
.main-footer__link a {
239237
text-decoration: none;
240-
margin: 0 1.25rem;
241238
color: white;
242239
font-weight: bold;
243240
}
@@ -269,3 +266,20 @@ main {
269266
/* .open {
270267
display: block !important;
271268
} */
269+
270+
271+
@media (min-width: 40rem) {
272+
.main-nav {
273+
display: flex;
274+
}
275+
.toggle-button {
276+
display: none;
277+
}
278+
.main-footer__links {
279+
flex-direction: row;
280+
justify-content: center;
281+
}
282+
.main-footer__link {
283+
margin: 0 1rem;
284+
}
285+
}

shared.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@ toggleButton.addEventListener("click", () => {
5757
// closeModal();
5858
// mobileNav.style.display = "none";
5959
// crossButton.style.display = "none"
60-
// })
60+
// })
61+

start-hosting/index.html

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
88
<title>uHost Signup</title>
99
<link rel="shortcut icon" href="../favicon.png">
10-
<link href="https://fonts.googleapis.com/css?family=Anton|Montserrat:400,700" rel="stylesheet">
1110
<link rel="stylesheet" href="../shared.css">
1211
<link rel="stylesheet" href="start-hosting.css">
1312
</head>
@@ -62,14 +61,14 @@ <h1 class="signup-title">Awesome! Let's dive right in!</h1>
6261
<option value="ms">Ms.</option>
6362
</select>
6463
<label for="first-name">First name</label>
65-
<input type="text" id="first-name">
64+
<input type="text" id="first-name" required>
6665
<label for="last-name">Last name</label>
67-
<input type="text" id="last-name">
66+
<input type="text" id="last-name" required>
6867
<label for="email">E-Mail</label>
69-
<input type="email" id="email">
68+
<input type="email" id="email" required>
7069
<label for="password">Password</label>
71-
<input type="password" id="password">
72-
<input type="checkbox" id="agree-terms">
70+
<input type="password" id="password" required>
71+
<input type="checkbox" id="agree-terms" required>
7372
<label for="agree-terms">Agree to
7473
<a href="#">Terms &amp; Conditions</a>
7574
</label>

start-hosting/start-hosting.css

+5
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ main {
6161
border: #0e4f1f;
6262
}
6363

64+
.signup-form :invalid {
65+
background: #ff5454;
66+
border-color: red !important;
67+
}
68+
6469
.signup-form button[type="submit"] {
6570
display: block;
6671
margin-top: 2rem;

0 commit comments

Comments
 (0)