Merge pull request #19 from CodeYourFuture/syllabus_alignment

Align the exercises with updates for scotland's HTML/CSS syllabus

Author: NateWr

css/week1-conflicting-styles.css

@@ -0,0 +1,4 @@
+/** Conflicting styles that require advanced CSS selectors to override */
+p {
+	color: #000;
+}

css/week1-pagination.css

@@ -0,0 +1,27 @@
+.countries {
+	margin: 0;
+	padding: 1rem;
+	list-style: none;
+	border-bottom: 1px solid #bbb;
+}
+
+.country {
+	margin: 1px 0;
+	padding: 0.5rem;
+	background: #fff;
+	border: 1px solid rgba(0,0,0,0.2);
+}
+
+.pages {
+	margin-left: 0.5rem;
+}
+
+.pages__page {
+	text-decoration: none;
+}
+
+.pages__showing {
+	display: inline-block;
+	padding: 1rem;
+	float: right;
+}

css/week1.css

@@ -31,18 +31,15 @@ html {
 
 /* Site title and top navigation */
 .site-header {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
 	padding: 0.5rem 1rem;
-	color: rgba(255,255,255,0.9);
 	background: #4491db;
 	border-top-left-radius: 3px;
 	border-top-right-radius: 3px;
 }
 
 .site-header__title {
 	margin: 0;
+	color: rgba(255,255,255,0.9);
 	font-size: 18px;
 	font-weight: 700;
 }
@@ -75,3 +72,8 @@ html {
 	box-shadow: 0 2px 2px rgba(0,0,0,0.1);
 	background: #fff;
 }
+
+/* Site footer area */
+.site-footer {
+	padding: 0.5rem 1rem;
+}

css/week2-nav-menu.css

@@ -0,0 +1,78 @@
+body,
+html {
+	background: #25262f;
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif;
+	font-size: 16px;
+	line-height: 1.5em;
+}
+
+.site-wrapper {
+	max-width: 1200px;
+	width: 90%;
+	margin-top: 2vh;
+	margin-left: auto;
+	margin-right: auto;
+	background: #fff;
+	border-radius: 3px;
+	box-shadow: 0 2px 2px rgba(0,0,0,0.1);
+}
+
+.site-header {
+	position: relative;
+	top: -1px;
+	padding-top: 1px;
+}
+
+.site-header__logo {
+	display: block;
+	margin: 1rem;
+	width: 50px;
+	height: auto;
+}
+
+.site-header__nav {
+	margin: 1rem 0.5rem;
+}
+
+.site-header__navItem {
+	display: block;
+	padding: 0.25em 0.5em;
+	font-weight: bold;
+	text-decoration: none;
+	text-transform: uppercase;
+	color: #007ab2;
+	border: 1px solid transparent;
+	border-radius: 3px;
+}
+
+.site-header__navItem:focus,
+.site-header__navItem:hover {
+	border: 1px solid #007ab2;
+	outline: 0;
+}
+
+.site-header__navItem--highlighted {
+	color: #d00a6c;
+}
+
+.site-header__navItem--highlighted:hover,
+.site-header__navItem--highlighted:focus {
+	border-color: #d00a6c;
+}
+
+.site-header__checkout {
+	display: inline-block;
+	margin: 0.5rem;
+	padding: 0.5em 1em;
+	border: 1px solid #007ab2;
+	border-radius: 3px;
+	background: #007ab2;
+	color: #fff;
+	text-decoration: none;
+}
+
+.site-header__checkout:focus,
+.site-header__checkout:hover {
+	background: #009cd4;
+	outline: 0;
+}