From 1544a9e832b4915566051f0b61307b126e140f07 Mon Sep 17 00:00:00 2001 From: adaau Date: Wed, 23 Sep 2015 22:24:20 +0800 Subject: [PATCH 1/2] done --- starter-code/css/main.css | 65 +++++++++++++++++++++++++++++++++++++++ starter-code/index.html | 62 +++++++++++++++++++++++++++---------- starter-code/test.html | 26 ++++++++++++++++ 3 files changed, 136 insertions(+), 17 deletions(-) create mode 100644 starter-code/test.html diff --git a/starter-code/css/main.css b/starter-code/css/main.css index c4865cc..165a9a3 100644 --- a/starter-code/css/main.css +++ b/starter-code/css/main.css @@ -8,3 +8,68 @@ body { font: 200 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 0; } + +header { + height: 300px; + background-color: #06365F; + z-index: -1; +} + +.logo { + position: relative; + top: 100px; + left: 450px; +} + +h1 { + color: #06365F; +} + +p { + color: #1C5380; +} + +.container { + height: 400px; +} + +.left { + display: inline; + float: left; + position: relative; + top: -250px; + left: auto; + height: 400px; + width: 350px; + margin: 0 50px; +} + +.right { + /* background image not working */ + background-image: url(images/frame.png); + display: inline; + background-color: #000000; + position: relative; + top: -50px; + z-index: 1; +} + +.download { + display: inline; +} + +nav { + text-transform: uppercase; + text-align: center; +} + +a { + margin: 0 10px; + font-size: 14px; + color: #1c5380; +} + +span { + margin: 0 10px; + font-size: 14px; +} diff --git a/starter-code/index.html b/starter-code/index.html index 155dbb5..8717006 100644 --- a/starter-code/index.html +++ b/starter-code/index.html @@ -1,31 +1,59 @@ + Instagram + - Instagram +
+ +
- Capture and Share the World's Moments +
+
+
+ Phones +
+ +
+
+

+ Capture and Share
+ the World's Moments +

+ +

Instagram is a fast, beautiful and fun way to share your life with friends and family.

- Instagram is a fast, beautiful and fun way to share your life with friends and family. +

Take a picture or video, choose a filter to transform its look and feel, then post to Instagram — it's that easy. You can even share to Facebook, Twitter, Tumblr and more. It's a new way to see the world.

- Take a picture or video, choose a filter to transform its look and feel, then post to Instagram — it's that easy. You can even share to Facebook, Twitter, Tumblr and more. It's a new way to see the world. +

Oh yeah, did we mention it's free?

+
- Oh yeah, did we mention it's free? +
+
Download on the App Store
+
Get it on Google Play
+
+
- Download on the App Store - Get it on Google Play +
+ +
- About Us - Support - Blog - Press - API - Jobs - Privacy - Terms - - © 2014 Instagram + diff --git a/starter-code/test.html b/starter-code/test.html new file mode 100644 index 0000000..a1998ba --- /dev/null +++ b/starter-code/test.html @@ -0,0 +1,26 @@ + + + + + Document + + + +
+
hello
+
goodbye
+
+ + + From 66e6c09c2c8add4a75d7e933abe5edee93016e4e Mon Sep 17 00:00:00 2001 From: adaau Date: Wed, 23 Sep 2015 22:25:31 +0800 Subject: [PATCH 2/2] done2 --- starter-code/test.html | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 starter-code/test.html diff --git a/starter-code/test.html b/starter-code/test.html deleted file mode 100644 index a1998ba..0000000 --- a/starter-code/test.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Document - - - -
-
hello
-
goodbye
-
- - -