diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..8bafbbd3 Binary files /dev/null and b/.DS_Store differ diff --git a/week1/.DS_Store b/week1/.DS_Store new file mode 100644 index 00000000..edb7d03c Binary files /dev/null and b/week1/.DS_Store differ diff --git a/week1/2-reading/my-first-webpage.html b/week1/2-reading/my-first-webpage.html new file mode 100644 index 00000000..8f0c5ad9 --- /dev/null +++ b/week1/2-reading/my-first-webpage.html @@ -0,0 +1 @@ +

This is my firstwebpage!

\ No newline at end of file diff --git a/week1/3-website/.DS_Store b/week1/3-website/.DS_Store new file mode 100644 index 00000000..783f7da0 Binary files /dev/null and b/week1/3-website/.DS_Store differ diff --git a/week1/3-website/1209195-firefly-serenity-wallpaper-1920x1080-for-tablet.jpg b/week1/3-website/1209195-firefly-serenity-wallpaper-1920x1080-for-tablet.jpg new file mode 100644 index 00000000..c23c80ba Binary files /dev/null and b/week1/3-website/1209195-firefly-serenity-wallpaper-1920x1080-for-tablet.jpg differ diff --git a/week1/3-website/Firefly-Serenity-Ship.jpg b/week1/3-website/Firefly-Serenity-Ship.jpg new file mode 100644 index 00000000..be91af3f Binary files /dev/null and b/week1/3-website/Firefly-Serenity-Ship.jpg differ diff --git a/week1/3-website/cant-stop-the-signal-mr-universe-serenity-firefly.gif b/week1/3-website/cant-stop-the-signal-mr-universe-serenity-firefly.gif new file mode 100644 index 00000000..3105935e Binary files /dev/null and b/week1/3-website/cant-stop-the-signal-mr-universe-serenity-firefly.gif differ diff --git a/week1/3-website/css/index.html b/week1/3-website/css/index.html new file mode 100644 index 00000000..de10e031 --- /dev/null +++ b/week1/3-website/css/index.html @@ -0,0 +1,66 @@ + + + + + + Firefly and Serenity fan page + + + + + +
+ +

Firefly and Serenity

+

(For the fans)

+
+
+ Can't stop the signal Mal +
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec gravida dolor nec congue porttitor. + In justo arcu, gravida blandit congue sit amet, elementum nec arcu. In scelerisque a felis eu consequat. + Donec blandit, libero sit amet lacinia congue, mi justo congue odio, eget ullamcorper eros erat et neque. +

+
+
+
+

Firefly

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec gravida dolor nec congue porttitor. + In justo arcu, gravida blandit congue sit amet, elementum nec arcu. In scelerisque a felis eu consequat. + Donec blandit, libero sit amet lacinia congue, mi justo congue odio, eget ullamcorper eros erat et neque. + Integer lacinia arcu urna, eu laoreet tortor placerat vitae. +

+
+
+

Serenity

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec gravida dolor nec congue porttitor. + In justo arcu, gravida blandit congue sit amet, elementum nec arcu. In scelerisque a felis eu consequat. + Donec blandit, libero sit amet lacinia congue, mi justo congue odio, eget ullamcorper eros erat et neque. + Integer lacinia arcu urna, eu laoreet tortor placerat vitae. +

+
+
+

Books

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec gravida dolor nec congue porttitor. + In justo arcu, gravida blandit congue sit amet, elementum nec arcu. In scelerisque a felis eu consequat. + Donec blandit, libero sit amet lacinia congue, mi justo congue odio, eget ullamcorper eros erat et neque. + Integer lacinia arcu urna, eu laoreet tortor placerat vitae. +

+
+
+ + + + diff --git a/week1/3-website/css/style.css b/week1/3-website/css/style.css index 75e9841e..b4081196 100644 --- a/week1/3-website/css/style.css +++ b/week1/3-website/css/style.css @@ -6,3 +6,152 @@ * for example: General styles, Navigation styles, Hero styles, Footer etc. * */ + + body, html { + height: 125vh; + margin: 0; + font-size: 20px; + font-family: Arial Verdana, sans-serif; + margin-left: 40px; + margin-right: 40px; + margin-bottom: 40px; + } +.nav-links { + display:flex; + justify-content: flex-end; + padding: 10px; + background-color: #DC143C; + color: white; + text-decoration: none; + + +} +ul { + list-style-type: none; + margin: 0; + padding: 0; + + +} + +li { + display: inline; + +} + +nav a { + color: white; + text-decoration: none; +} + + + +.title { + text-align: center; + display: block; + color: white; + font-weight: bold; + text-transform: uppercase; + background-color: rgb(13, 123, 192); + padding: 20px; + font-size: 50px; +} + +.image-section { + height: 200px; + background-image: url('http://getwallpapers.com/wallpaper/full/0/7/0/1209195-firefly-serenity-wallpaper-1920x1080-for-tablet.jpg'); + background-repeat: no-repeat; + background-size: cover; + background-position: center; + padding: 100px 5%; + +} + +.kicker { + max-width: 500px; +} +.wrapper { + display:grid; + grid-template-columns: 1fr 1fr 1fr; + +} + +.one { + grid-column: 0/3; + grid-row: 1; + } + +.two { + grid-column: 2/3; + grid-row: 1; + } + +.three { + grid-column: 3/3; + grid-row: 1 +} + +footer { + text-align: center; + padding-bottom: 50px; +} + +.more-events { + text-align: center; + background: orange; + padding: 0.6em 1em; + display: inline-block; + color: white; + font-weight: bold; + text-transform: uppercase; +} + +.newsletter { + text-align: center; + background: red; + padding: 0.6em 1em; + display: inline-block; + color: white; + font-weight: bold; + text-transform: uppercase; + +} + +.firefly { + text-align: center; + background: darkcyan; + padding: 0.6em 1em; + display: inline-block; + color: white; + font-weight: bold; + text-transform: uppercase; + +} + + + +.serenity { + text-align: center; + background: rgb(185, 74, 74); + padding: 0.6em 1em; + display: inline-block; + color: white; + font-weight: bold; + text-transform: uppercase; + +} + +.books { + text-align: center; + background: darkkhaki; + padding: 0.6em 1em; + display: inline-block; + color: white; + font-weight: bold; + text-transform: uppercase; + +} + +article:first-child { + font-style: italic; +} \ No newline at end of file diff --git a/week1/3-website/index.html b/week1/3-website/index.html index 67dfc7f5..54ff3b65 100644 --- a/week1/3-website/index.html +++ b/week1/3-website/index.html @@ -6,7 +6,7 @@ name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" /> - My Blog + Firefly and Serenity fan page - - +
+ +

Can't Stop the Signal

+
+
+ +
+
+

A fansite for all things related to Firefly and Serenity. + +

+
+
+
+

Firefly

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec gravida dolor nec congue porttitor. + In justo arcu, gravida blandit congue sit amet, elementum nec arcu. In scelerisque a felis eu consequat. + Donec blandit, libero sit amet lacinia congue, mi justo congue odio, eget ullamcorper eros erat et neque. + Link to Firefly IMDB +

+
+
+

Serenity

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec gravida dolor nec congue porttitor. + In justo arcu, gravida blandit congue sit amet, elementum nec arcu. In scelerisque a felis eu consequat. + Donec blandit, libero sit amet lacinia congue, mi justo congue odio, eget ullamcorper eros erat et neque. + Link to Serenity IMDB +

+
+
+

Books

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec gravida dolor nec congue porttitor. + In justo arcu, gravida blandit congue sit amet, elementum nec arcu. In scelerisque a felis eu consequat. + Donec blandit, libero sit amet lacinia congue, mi justo congue odio, eget ullamcorper eros erat et neque. + Check out these Goodreads. +

+
+
+ + diff --git a/week3/.DS_Store b/week3/.DS_Store index 3deb418d..5008ddfc 100644 Binary files a/week3/.DS_Store and b/week3/.DS_Store differ