@@ -57,11 +59,13 @@
Solution
diff --git a/part-2/11-flexbox/readme.md b/week-2/11-flexbox/readme.md
similarity index 100%
rename from part-2/11-flexbox/readme.md
rename to week-2/11-flexbox/readme.md
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
new file mode 100644
index 0000000..71835d4
--- /dev/null
+++ b/week-2/12-justify-content/flexbox.css
@@ -0,0 +1,26 @@
+.countries {
+ display: flex;
+}
+
+.countries--second .country {
+ padding: 0.5em;
+}
+
+/* Add your own CSS code below */
+.countries--first {
+ justify-content: end;
+}
+
+.countries--second {
+ justify-content: space-around;
+}
+
+.countries--third {
+ flex-direction: column;
+ justify-content: end;
+}
+
+.countries--fourth {
+ flex-direction: column-reverse;
+ justify-content: space-around;
+}
diff --git a/part-2/12-justify-content/index.html b/week-2/12-justify-content/index.html
similarity index 100%
rename from part-2/12-justify-content/index.html
rename to week-2/12-justify-content/index.html
diff --git a/part-2/12-justify-content/readme.md b/week-2/12-justify-content/readme.md
similarity index 100%
rename from part-2/12-justify-content/readme.md
rename to week-2/12-justify-content/readme.md
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
new file mode 100644
index 0000000..1d95db2
--- /dev/null
+++ b/week-2/13-align-items/flexbox.css
@@ -0,0 +1,22 @@
+.countries {
+ display: flex;
+}
+/* Add your own CSS code below */
+.countries--first {
+ align-items: center;
+}
+
+.countries--second {
+ align-items: flex-end;
+ flex-direction: row-reverse;
+}
+
+.countries--third {
+ align-items: flex-end;
+ flex-direction: column;
+}
+
+.countries--fourth {
+ align-items: center;
+ flex-direction: column-reverse;
+}
diff --git a/part-2/13-align-items/index.html b/week-2/13-align-items/index.html
similarity index 100%
rename from part-2/13-align-items/index.html
rename to week-2/13-align-items/index.html
diff --git a/part-2/13-align-items/readme.md b/week-2/13-align-items/readme.md
similarity index 100%
rename from part-2/13-align-items/readme.md
rename to week-2/13-align-items/readme.md
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
new file mode 100644
index 0000000..d117399
--- /dev/null
+++ b/week-2/14-order/flexbox.css
@@ -0,0 +1,36 @@
+.countries {
+ display: flex;
+}
+
+/* Add your own CSS code below */
+.countries--first .country--brazil {
+ order: 5;
+}
+
+.countries--second .country--brazil {
+ order: 3;
+}
+
+.countries--second .country--uganda {
+ order: 5;
+}
+
+.countries--third .country--brazil {
+ order: 5;
+}
+
+.countries--third .country--croatia {
+ order: 4;
+}
+
+.countries--third .country--ethiopia {
+ order: 3;
+}
+
+.countries--third .country--laos {
+ order: 2;
+}
+
+.countries--third .country--uganda {
+ order: 1;
+}
diff --git a/part-2/14-order/index.html b/week-2/14-order/index.html
similarity index 100%
rename from part-2/14-order/index.html
rename to week-2/14-order/index.html
diff --git a/part-2/14-order/readme.md b/week-2/14-order/readme.md
similarity index 100%
rename from part-2/14-order/readme.md
rename to week-2/14-order/readme.md
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
new file mode 100644
index 0000000..02dffe0
--- /dev/null
+++ b/week-2/15-align-self/flexbox.css
@@ -0,0 +1,54 @@
+.countries {
+ display: flex;
+}
+
+/* Add your own CSS code below */
+.countries--first .country--ethiopia {
+ align-self: flex-end;
+}
+
+.countries--second {
+ align-items: center;
+}
+
+.countries--second .country--ethiopia {
+ align-self: flex-end;
+}
+
+.countries--third .country--brazil {
+ align-self: flex-start;
+}
+
+.countries--third .country--uganda {
+ align-self: flex-start;
+}
+
+.countries--third .country--croatia {
+ align-self: flex-end;
+}
+.countries--third .country--ethiopia {
+ align-self: flex-end;
+}
+.countries--third .country--laos {
+ align-self: flex-end;
+}
+
+.countries--fourth {
+ flex-direction: column;
+ align-items: center;
+}
+
+.countries--fourth .country--brazil {
+ align-self: 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;
+}
diff --git a/part-2/15-align-self/index.html b/week-2/15-align-self/index.html
similarity index 100%
rename from part-2/15-align-self/index.html
rename to week-2/15-align-self/index.html
diff --git a/part-2/15-align-self/readme.md b/week-2/15-align-self/readme.md
similarity index 100%
rename from part-2/15-align-self/readme.md
rename to week-2/15-align-self/readme.md
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
new file mode 100644
index 0000000..a096122
--- /dev/null
+++ b/week-2/16-more-flexbox/flexbox.css
@@ -0,0 +1,53 @@
+.countries {
+ display: flex;
+}
+
+/* Add your own CSS code below */
+.countries--first {
+ align-items: flex-end;
+ justify-content: end;
+}
+
+.countries--second {
+ flex-direction: row-reverse;
+ align-items: flex-end;
+ justify-content: center;
+}
+
+.countries--third {
+ align-items: flex-start;
+ justify-content: center;
+}
+
+.countries--third .country--brazil {
+ align-self: flex-end;
+}
+
+.countries--fourth {
+ flex-direction: column;
+ justify-content: center;
+ align-items: flex-end;
+}
+
+.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-between;
+}
+
+.countries--fifth .country--uganda {
+ order: 4;
+ align-self: center;
+}
+
+.countries--fifth .country--laos {
+ order: 5;
+}
diff --git a/part-2/16-more-flexbox/index.html b/week-2/16-more-flexbox/index.html
similarity index 100%
rename from part-2/16-more-flexbox/index.html
rename to week-2/16-more-flexbox/index.html
diff --git a/part-2/16-more-flexbox/readme.md b/week-2/16-more-flexbox/readme.md
similarity index 100%
rename from part-2/16-more-flexbox/readme.md
rename to week-2/16-more-flexbox/readme.md
diff --git a/part-2/17-nav-menu/index.html b/week-2/17-nav-menu/index.html
similarity index 100%
rename from part-2/17-nav-menu/index.html
rename to week-2/17-nav-menu/index.html
diff --git a/part-2/17-nav-menu/readme.md b/week-2/17-nav-menu/readme.md
similarity index 100%
rename from part-2/17-nav-menu/readme.md
rename to week-2/17-nav-menu/readme.md
diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css
new file mode 100644
index 0000000..8344280
--- /dev/null
+++ b/week-2/17-nav-menu/styles.css
@@ -0,0 +1,18 @@
+/* Write your media queries and flexbox CSS below */
+@media only screen and (min-width: 480px) {
+ nav {
+ display: flex;
+ }
+}
+
+@media only screen and (min-width: 700px) {
+ .site-header {
+ display: flex;
+ }
+}
+
+@media only screen and (min-width: 992px) {
+ .site-header {
+ justify-content: space-between;
+ }
+}
diff --git a/part-2/18-git-merge/index.html b/week-2/18-git-merge/index.html
similarity index 100%
rename from part-2/18-git-merge/index.html
rename to week-2/18-git-merge/index.html
diff --git a/part-2/18-git-merge/readme.md b/week-2/18-git-merge/readme.md
similarity index 100%
rename from part-2/18-git-merge/readme.md
rename to week-2/18-git-merge/readme.md
diff --git a/part-3/28-git-conflict/styles.css b/week-2/18-git-merge/styles.css
similarity index 100%
rename from part-3/28-git-conflict/styles.css
rename to week-2/18-git-merge/styles.css
diff --git a/part-3/19-search/index.html b/week-3/19-search/index.html
similarity index 100%
rename from part-3/19-search/index.html
rename to week-3/19-search/index.html
diff --git a/part-3/19-search/readme.md b/week-3/19-search/readme.md
similarity index 100%
rename from part-3/19-search/readme.md
rename to week-3/19-search/readme.md
diff --git a/part-3/20-labels/index.html b/week-3/20-labels/index.html
similarity index 100%
rename from part-3/20-labels/index.html
rename to week-3/20-labels/index.html
diff --git a/part-3/20-labels/readme.md b/week-3/20-labels/readme.md
similarity index 100%
rename from part-3/20-labels/readme.md
rename to week-3/20-labels/readme.md
diff --git a/part-3/21-buttons/index.html b/week-3/21-buttons/index.html
similarity index 100%
rename from part-3/21-buttons/index.html
rename to week-3/21-buttons/index.html
diff --git a/part-3/21-buttons/readme.md b/week-3/21-buttons/readme.md
similarity index 100%
rename from part-3/21-buttons/readme.md
rename to week-3/21-buttons/readme.md
diff --git a/part-3/22-checkout/index.html b/week-3/22-checkout/index.html
similarity index 100%
rename from part-3/22-checkout/index.html
rename to week-3/22-checkout/index.html
diff --git a/part-3/22-checkout/readme.md b/week-3/22-checkout/readme.md
similarity index 100%
rename from part-3/22-checkout/readme.md
rename to week-3/22-checkout/readme.md
diff --git a/part-3/23-comments/index.html b/week-3/23-comments/index.html
similarity index 100%
rename from part-3/23-comments/index.html
rename to week-3/23-comments/index.html
diff --git a/part-3/23-comments/readme.md b/week-3/23-comments/readme.md
similarity index 100%
rename from part-3/23-comments/readme.md
rename to week-3/23-comments/readme.md
diff --git a/part-3/24-dietary/index.html b/week-3/24-dietary/index.html
similarity index 100%
rename from part-3/24-dietary/index.html
rename to week-3/24-dietary/index.html
diff --git a/part-3/24-dietary/readme.md b/week-3/24-dietary/readme.md
similarity index 100%
rename from part-3/24-dietary/readme.md
rename to week-3/24-dietary/readme.md
diff --git a/part-3/25-shirt-size/index.html b/week-3/25-shirt-size/index.html
similarity index 100%
rename from part-3/25-shirt-size/index.html
rename to week-3/25-shirt-size/index.html
diff --git a/part-3/25-shirt-size/readme.md b/week-3/25-shirt-size/readme.md
similarity index 100%
rename from part-3/25-shirt-size/readme.md
rename to week-3/25-shirt-size/readme.md
diff --git a/part-3/25-shirt-size/styles.css b/week-3/25-shirt-size/styles.css
similarity index 100%
rename from part-3/25-shirt-size/styles.css
rename to week-3/25-shirt-size/styles.css
diff --git a/part-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html
similarity index 100%
rename from part-3/26-checkout-groups/index.html
rename to week-3/26-checkout-groups/index.html
diff --git a/part-3/26-checkout-groups/readme.md b/week-3/26-checkout-groups/readme.md
similarity index 100%
rename from part-3/26-checkout-groups/readme.md
rename to week-3/26-checkout-groups/readme.md
diff --git a/part-3/27-attributes/index.html b/week-3/27-attributes/index.html
similarity index 100%
rename from part-3/27-attributes/index.html
rename to week-3/27-attributes/index.html
diff --git a/part-3/27-attributes/readme.md b/week-3/27-attributes/readme.md
similarity index 100%
rename from part-3/27-attributes/readme.md
rename to week-3/27-attributes/readme.md
diff --git a/part-3/28-git-conflict/index.html b/week-3/28-git-conflict/index.html
similarity index 100%
rename from part-3/28-git-conflict/index.html
rename to week-3/28-git-conflict/index.html
diff --git a/part-3/28-git-conflict/readme.md b/week-3/28-git-conflict/readme.md
similarity index 100%
rename from part-3/28-git-conflict/readme.md
rename to week-3/28-git-conflict/readme.md
diff --git a/part-2/18-git-merge/styles.css b/week-3/28-git-conflict/styles.css
similarity index 81%
rename from part-2/18-git-merge/styles.css
rename to week-3/28-git-conflict/styles.css
index 0051cdb..af46a4f 100644
--- a/part-2/18-git-merge/styles.css
+++ b/week-3/28-git-conflict/styles.css
@@ -1,6 +1,6 @@
/* Add your own CSS code below */
.link {
- color: #4491db;
+ color: orangered;
font-weight: 700;
text-decoration: none;
}
diff --git a/part-3/29-combined-skills/about.html b/week-3/29-combined-skills/about.html
similarity index 100%
rename from part-3/29-combined-skills/about.html
rename to week-3/29-combined-skills/about.html
diff --git a/part-3/29-combined-skills/contact.html b/week-3/29-combined-skills/contact.html
similarity index 100%
rename from part-3/29-combined-skills/contact.html
rename to week-3/29-combined-skills/contact.html
diff --git a/part-3/29-combined-skills/index.html b/week-3/29-combined-skills/index.html
similarity index 100%
rename from part-3/29-combined-skills/index.html
rename to week-3/29-combined-skills/index.html
diff --git a/part-3/29-combined-skills/readme.md b/week-3/29-combined-skills/readme.md
similarity index 100%
rename from part-3/29-combined-skills/readme.md
rename to week-3/29-combined-skills/readme.md
diff --git a/part-3/29-combined-skills/styles.css b/week-3/29-combined-skills/styles.css
similarity index 100%
rename from part-3/29-combined-skills/styles.css
rename to week-3/29-combined-skills/styles.css
