Skip to content
This repository was archived by the owner on Feb 27, 2023. It is now read-only.

merge #60

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions week-1/5-css-selectors/message-backgrounds.css
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/* Add your CSS code below */

#first-message {
background-color: red;
}

.messages article {
background-color: cadetblue;
}

.message--latest {
background-color: yellow;
}
15 changes: 15 additions & 0 deletions week-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
/* Add your CSS code below */
.messages a {
color: red;
text-decoration: none;
font-weight: bold;
}
.message__time {
font-size: 0.9rem;
}

.message--unread {
border-left: blue solid 4px;
}
.message {
line-height: 300%;
}
7 changes: 7 additions & 0 deletions week-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@
border-radius: 4px;
background: #fff;
}
.countries .country {
color: white;
background-color: grey;
padding: 5px;
margin: 10px;
border: 1px solid red;
}
14 changes: 14 additions & 0 deletions week-1/8-advanced-selectors/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
/* Try different box model properties below */

.site-header p {
color: white;
}
.site-header {
margin-bottom: -5px;
}
.site-footer p {
font-size: 12px;
text-align: center;
}
.messages .message:last-child {
box-shadow: 4px 4px 0 #dba944;
}
2 changes: 1 addition & 1 deletion week-1/9-git-branch/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Add your own CSS code below */
.link {
color: #4491db;
color: green;
font-weight: 700;
text-decoration: none;
}
12 changes: 12 additions & 0 deletions week-2/10-media-queries/columns.css
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/* Add your own CSS code below */

@media screen and (min-width: 768px) {
.countries {
columns: 2;
}
}

@media screen and (min-width: 1200px) {
.countries {
columns: 3;
}
}
4 changes: 4 additions & 0 deletions week-2/10-media-queries/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
<title>10. Media Queries - HTML, CSS and Git Exercises</title>
<link rel="stylesheet" href="/css/normalize.css" />
<link rel="stylesheet" href="/css/week2-media-queries.css" />

<link rel="stylesheet" href="/week-2/10-media-queries/columns.css" />

<link rel="stylesheet" href="columns.css" />

</head>

<body>
Expand Down
8 changes: 8 additions & 0 deletions week-2/11-flexbox/flexbox.css
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
/* Add your own CSS code below */
.countries--first {
display: flex;
flex-direction: row-reverse;
}
.countries--third {
display: flex;
flex-direction: column-reverse;
}
21 changes: 21 additions & 0 deletions week-2/12-justify-content/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,24 @@
}

/* Add your own CSS code below */

.countries--first {
display: flex;
justify-content: flex-end;
}
.countries--second {
display: flex;
justify-content: space-around;
}

.countries--third {
display: flex;
flex-direction: column;
justify-content: flex-end;
}
.countries--fourth {
display: flex;
flex-direction: column-reverse;
justify-content: flex-end;
justify-content: space-around;
}
20 changes: 20 additions & 0 deletions week-2/13-align-items/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,23 @@
display: flex;
}
/* Add your own CSS code below */

.countries--first {
flex-direction: row;
align-items: center;
}

.countries--second {
flex-direction: row-reverse;
align-items: flex-end;
}

.countries--third {
flex-direction: column;
align-items: flex-end;
}

.countries--fourth {
flex-direction: column-reverse;
align-items: center;
}
16 changes: 16 additions & 0 deletions week-2/14-order/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,19 @@
}

/* Add your own CSS code below */
.country--brazil {
order: 1;
}

.countries--second .country--uganda {
order: 3;
}
.countries--third .country--brazil {
order: 4;
}
.countries--third .country--uganda {
order: -1;
}
.countries--third .country-croatia {
order: 1;
}
72 changes: 72 additions & 0 deletions week-2/15-align-self/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,75 @@
}

/* Add your own CSS code below */
.country--ethiopia {
align-items: center;
align-self: flex-end;
}

.countries--first .country--croatia {
align-items: center;
align-self: flex-start;
}
.countries--first .country--laos {
align-self: flex-start;
align-items: center;
}

.countries--second {
align-items: center;
flex-direction: row;
}
.countries--second .country--croatia {
align-self: center;
align-items: flex-start;
}

.countries--second .country--laos {
align-self: center;
align-items: flex-start;
}

.countries--third {
align-items: center;
}
.countries--third .country--brazil {
align-self: flex-start;
}
.countries--third .country--uganda {
align-self: flex-start;
}

.country--croatia {
align-self: flex-end;
}
.country--laos {
align-self: flex-end;
}
.countries--fourth {
flex-direction: column;
align-items: flex-start;
}
.countries--fourth .country--croatia {
align-self: flex-start;
}
.countries--fourth .country--ethiopia {
align-self: flex-start;
}
.countries--fourth .country--laos {
align-self: flex-start;
}
.countries--fourth .country--uganda {
align-self: center;
}

@media screen and (min-width: 768px) {
.countries {
columns: 2;
}
}

@media screen and (min-width: 1200px) {
.countries {
columns: 2;
}
}
42 changes: 42 additions & 0 deletions week-2/16-more-flexbox/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,45 @@
}

/* Add your own CSS code below */

.countries--first {
flex-direction: row;
align-items: flex-end;
justify-content: flex-end;
}
.countries--second {
flex-direction: row-reverse;
align-items: flex-end;
}
.countries--third {
align-items: flex-start;
}
.countries--third .country--brazil {
align-self: flex-end;
}

.countries--fourth {
flex-direction: column;
align-items: flex-end;
justify-content: center;
}

.countries--fourth .country--ethiopia {
align-self: center;
}
.countries--fourth .country--laos {
align-self: center;
}
.countries--fifth {
flex-direction: column-reverse;
align-items: flex-end;
justify-content: space-around;
}

.countries--fifth .country--laos {
align-items: flex-start;
order: 1;
}
.countries--fifth .country--uganda {
align-self: center;
}
23 changes: 23 additions & 0 deletions week-2/17-nav-menu/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,24 @@
/* Write your media queries and flexbox CSS below */

@media (min-width: 480px) {
.site-header__nav {
display: flex;
align-items: center;
}
}

@media (min-width: 700px) {
.site-header {
display: flex;
align-items: center;
align-items: center;
}
}

@media (min-width: 992px) {
.site-header {
display: flex;
align-items: center;
justify-content: space-between;
}
}
2 changes: 1 addition & 1 deletion week-2/18-git-merge/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Add your own CSS code below */
.link {
color: #4491db;
color: orange;
font-weight: 700;
text-decoration: none;
}
4 changes: 3 additions & 1 deletion week-3/19-search/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
<body>
<div class="site-wrapper">
<main>
<p>Delete this line and add your form.</p>
<form method="GET" action="https://www.google.com/search">
<input type="text" name="q" />
</form>
</main>
</div>
</body>
Expand Down
17 changes: 17 additions & 0 deletions week-3/22-checkout/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,25 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
<div class="checkout">
<h2 class="checkout__title">Checkout</h2>
<form method="GET" id="checkout-form" class="checkout__form">

<div>
<label for="na">Name</label>
<input type="text" name="customer-name" id="na" />
</div>

<div>
<label for="em"> Email</label>
<input type="email" name="customer-email" id="em" />
</div>
<div>
<label for="ph">Phone</label>

<input type="tel" name="customer-phone" id="ph" />
</div>

<!-- Add the form fields here -->


<button type="submit">Complete Purchase</button>
</form>
</div>
Expand Down
7 changes: 7 additions & 0 deletions week-3/23-comments/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,14 @@ <h1>Our t-shirts are amazing!</h1>
<div class="comments">
<p>Add your comments and let us know what you think!</p>

<form method="GET" action="">
<label for="co">about your Message</label>
<textarea name="comment"> </textarea>
<button>send Message</button>
</form>

<!-- Your comment form goes here -->

</div>
</main>
</div>
Expand Down
Loading