From 5a5e0176661390d6ed10b7e23661cdf79e1580c2 Mon Sep 17 00:00:00 2001 From: lizncq Date: Tue, 31 Oct 2017 01:43:56 -0500 Subject: [PATCH 1/9] subiendo estructura inicial --- css/main.css | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- index.html | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/css/main.css b/css/main.css index 839fb7d0..f4794774 100644 --- a/css/main.css +++ b/css/main.css @@ -1,3 +1,46 @@ -/* - * Estilos de tu proyecto - */ \ No newline at end of file +/*Estilos de tu proyecto + */ +body { + font-family: 'Montserrat', sans-serif; + margin: 0px; + } + /*alineando el gif con el contenedor principal de navegación*/ +.gif { + display: inline-block; + width: 100%; + height: 40%; + } + img { + width: 100%; + height: 40%;; + } + .image-principal { + } +.navigator { + display: inline-block; + width: 300px; + margin-left: 50px; + z-index: 1000; + +} +.container { + +} +li { + width: 80px; + float: left; + list-style: none; +} +a { + text-decoration: none; +} +h1 { + font-size: 30px; + width: 70px; +} +.text-1 { + margin-top: 10px; +} +input { + border-style: none; +} diff --git a/index.html b/index.html index 67324f35..ded18d74 100644 --- a/index.html +++ b/index.html @@ -1 +1,35 @@ + + + + + + + + lyft + + +
+ +
+ + + From 53579ebef0e553be1f01db6ffd249c809b9fe201 Mon Sep 17 00:00:00 2001 From: lizncq Date: Tue, 31 Oct 2017 03:01:47 -0500 Subject: [PATCH 2/9] actualizando css --- css/main.css | 18 +++++++++++------- index.html | 3 --- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/css/main.css b/css/main.css index f4794774..5d4e04ce 100644 --- a/css/main.css +++ b/css/main.css @@ -1,13 +1,15 @@ /*Estilos de tu proyecto */ + * { + margin: 0; + box-sizing: border-box; + } body { font-family: 'Montserrat', sans-serif; margin: 0px; } /*alineando el gif con el contenedor principal de navegación*/ .gif { - display: inline-block; - width: 100%; height: 40%; } img { @@ -17,11 +19,13 @@ body { .image-principal { } .navigator { - display: inline-block; - width: 300px; - margin-left: 50px; - z-index: 1000; - + outline:1px solid red ; + background-image: url(../assets/images/hero.gif); + /*display: inline-block;*/ + width: 100%; + height: 700px; + background-repeat: no-repeat; + background-size: cover; } .container { diff --git a/index.html b/index.html index ded18d74..e552b0fd 100644 --- a/index.html +++ b/index.html @@ -9,9 +9,6 @@ lyft -
- -
+
+
+

a ride in minutes

+

Request a ride and you´ll be on your way in minutes. Request. Ride. Repeat.

+
+

serious about safety

+

From knowing the color of your driver´s car our 24/7 Trust & Safety Team, we got you

+
+

happy drivers.

+

happy riders.

+

Ride with us and you´ll see why 9 out of 10 rides end with five stars.

+
+
+ +
+ + +
+ From e8846126d66f789cb4a19154a68b761ed91357ca Mon Sep 17 00:00:00 2001 From: Amandir01 Date: Tue, 31 Oct 2017 17:23:51 -0500 Subject: [PATCH 5/9] =?UTF-8?q?a=C3=B1adiendo=20margin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/main.css b/css/main.css index 85c3a474..85d0efe3 100644 --- a/css/main.css +++ b/css/main.css @@ -4,6 +4,7 @@ body { box-sizing: border-box; font-family: 'Montserrat', sans-serif; margin: 0px; + width: 100%; } /*alineando el gif con el contenedor principal de navegación*/ .gif { From e2df6403b798c3ea8d71eac6fe9f5c2c1af6d61c Mon Sep 17 00:00:00 2001 From: Amandir01 Date: Tue, 31 Oct 2017 23:27:29 -0500 Subject: [PATCH 6/9] verificando los cambios --- css/main.css | 180 ++++++++++++++++++++++----------------------------- index.html | 40 +++++------- 2 files changed, 93 insertions(+), 127 deletions(-) diff --git a/css/main.css b/css/main.css index 981ee53b..d7137f45 100644 --- a/css/main.css +++ b/css/main.css @@ -1,110 +1,86 @@ /*Estilos de tu proyecto */ -<<<<<<< HEAD * { - margin: 0; box-sizing: border-box; - border-style: none; - font-family: 'Montserrat', sans-serif; -======= -body { - box-sizing: border-box; - font-family: 'Montserrat', sans-serif; - margin: 0px; - width: 100%; ->>>>>>> e8846126d66f789cb4a19154a68b761ed91357ca + font-family: 'Montserrat', sans-serif; + margin: 0px; + width: 100%; } - /*alineando el gif con el contenedor principal de navegación*/ -.container { - outline:1px solid red ; - background-image: url(../assets/images/hero.gif); - /*display: inline-block;*/ - width: 100%; -<<<<<<< HEAD - height: 700px; - background-repeat: no-repeat; - background-size: cover; -======= - height: 40%;; - } - .image-principal { - } -.navigator { - display: inline-block; - width: 300px; - margin-left: 50px; - z-index: 1000; ->>>>>>> e8846126d66f789cb4a19154a68b761ed91357ca -} - .contenido { - outline: 1px solid red; - width: 100px; -} -li { - width: 80px; - float: left; - list-style: none; -} -a { - text-decoration: none; -} -h1 { - font-size: 30px; - width: 70px; -} -.text-1 { - margin-top: 10px; -} -<<<<<<< HEAD -======= -input { - border-style: none; -} -.uppercase { - text-transform: uppercase; -} -.firstcontainer { - outline: 1px solid green; - width: 55%; - height: 40%; - background-image: image(assets/images/hero.gif); -} + /*alineando el gif con el contenedor principal de navegación*/ + + .navigator { + display: inline-block; + width: 300px; + margin-left: 50px; + z-index: 1000; -.lyagif { - position: relative; - width: 926px; - height: 534px; -} -.lyapng { - float: - width: 67px; - height: 49px; -} -.firstsection { - color: white; - width: 100%; - background: linear-gradient(#76278F, #2B1E66); - column-count: 2; - height: 614px; - text-align: left; -} -.information { - margin-top: 12%; - margin-left: 21%; - width: 569px; -} -.tittle1 { - margin-bottom: 3%; -} -.information p { - margin-bottom: 7%; -} -.aplicationpic img { - width: 477px; - height: 484px; - margin-top: 9%; - margin-left: 14%; -} ->>>>>>> e8846126d66f789cb4a19154a68b761ed91357ca + } + .container { + + } + li { + width: 80px; + float: left; + list-style: none; + } + a { + text-decoration: none; + } + h1 { + font-size: 30px; + width: 70px; + } + .text-1 { + margin-top: 10px; + } + input { + border-style: none; + } + .uppercase { + text-transform: uppercase; + } + .firstcontainer { + outline: 1px solid green; + width: 55%; + height: 40%; + background-image: image(assets/images/hero.gif); + } + + .lyagif { + position: relative; + width: 926px; + height: 534px; + } + .lyapng { + float: + width: 67px; + height: 49px; + } + .firstsection { + color: white; + width: 100%; + background: linear-gradient(#76278F, #2B1E66); + column-count: 2; + height: 614px; + text-align: left; + } + .information { + margin-top: 12%; + margin-left: 15%; + width: 569px; + } + .tittle1 { + margin-bottom: 3%; + } + .information p { + margin-bottom: 7%; + } + + .aplicationpic img { + width: 477px; + height: 484px; + margin-top: 9%; + margin-left: 14%; + } diff --git a/index.html b/index.html index b0ee8eae..80abc650 100644 --- a/index.html +++ b/index.html @@ -7,35 +7,28 @@ - lyft + Lyft -
-
-
- -
+
+

TURN MILES INTO MONEY

SIGN UP TO DRIVE WITH LYFT.

-
-

Already applied? Check the status of your application here.

-

Earn money for inviting friends to drive. Learn more

+

Already applied? Check the status of your application here.

+

Earn money for inviting friends to drive. Learn more

-<<<<<<< HEAD - - -======= - +
+

a ride in minutes

@@ -47,14 +40,11 @@

serious about safety

happy drivers.

happy riders.

Ride with us and you´ll see why 9 out of 10 rides end with five stars.

-
- - +
->>>>>>> e8846126d66f789cb4a19154a68b761ed91357ca From 7c0f2ec6cdd9acf0542c3e4e76522be398fc9c8b Mon Sep 17 00:00:00 2001 From: Amandir01 Date: Wed, 1 Nov 2017 23:30:16 -0500 Subject: [PATCH 7/9] actualizando --- index.html | 91 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 32 deletions(-) diff --git a/index.html b/index.html index 80abc650..9a0ca930 100644 --- a/index.html +++ b/index.html @@ -7,43 +7,70 @@ - Lyft + lyft -
- -
-

TURN MILES INTO MONEY

-

SIGN UP TO DRIVE WITH LYFT.

- - -

Already applied? Check the status of your application here.

-

Earn money for inviting friends to drive. Learn more

-
-
+
-
-

a ride in minutes

-

Request a ride and you´ll be on your way in minutes. Request. Ride. Repeat.

-
-

serious about safety

-

From knowing the color of your driver´s car our 24/7 Trust & Safety Team, we got you

-
-

happy drivers.

-

happy riders.

-

Ride with us and you´ll see why 9 out of 10 rides end with five stars.

-
- -
+
+

a ride in minutes

+

Request a ride and you´ll be on your way in minutes. Request. Ride. Repeat.

+
+

serious about safety

+

From knowing the color of your driver´s car our 24/7 Trust & Safety Team, we got you

+
+

happy drivers.

+

happy riders.

+

Ride with us and you´ll see why 9 out of 10 rides end with five stars.

+
+ +
+
+
+
+
+
+ +
+
+
+ +
From b9c62948e8369de515d8c0a20eec08c8aad155bd Mon Sep 17 00:00:00 2001 From: Amandir01 Date: Wed, 1 Nov 2017 23:48:37 -0500 Subject: [PATCH 8/9] =?UTF-8?q?a=C3=B1adiendo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/main.css | 185 ++++++++++++++++++++++++++++++--------------------- index.html | 2 + 2 files changed, 111 insertions(+), 76 deletions(-) diff --git a/css/main.css b/css/main.css index d7137f45..ad3e59fd 100644 --- a/css/main.css +++ b/css/main.css @@ -1,86 +1,119 @@ /*Estilos de tu proyecto */ - * { - box-sizing: border-box; - font-family: 'Montserrat', sans-serif; - margin: 0px; - width: 100%; - } +* { + box-sizing: border-box; + font-family: 'Montserrat', sans-serif; + margin: 0px; + width: 100%; + text-decoration: none; + list-style: none; + } + .fontcolor { + color: #352384; + } +#menu { + /*outline: 1px solid orange ;*/ + /*position: relative;*/ + /*float: right;*/ - /*alineando el gif con el contenedor principal de navegación*/ +} - .navigator { - display: inline-block; - width: 300px; - margin-left: 50px; - z-index: 1000; +.container { + background-image: url("../assets/images/hero.gif"); + background-size: cover; + height: 610px; + /*margin-top: -100px;*/ + background-position: bottom; +} +.navigator { + /*margin-top: 70px;*/ + outline: 1px solid red ; + position: fixed; + width: 100%; + height: 115px; + font-size: 18px; + background-color: transparent; +} +.lyft-white { + /*outline: 1px solid green;*/ + width: 68px; + height: 46px; + margin-left: 7%; + margin-top: 3%; + position: absolute; +} +.navigator ul { + padding-right: 130px; + padding-top: 45px; +} +.navigator ul li{ + /*outline: 1px solid red ;*/ + float: right; + display: inline; + width:100px; + text-align: center; + margin: 7px; + padding: 10px; + } + .li-border { + border-radius: 13%; + border-bottom-style: groove; + border: 2px solid white; + } + .navigator ul li a { + color: white; } - .container { - } - li { - width: 80px; - float: left; - list-style: none; - } - a { - text-decoration: none; - } - h1 { - font-size: 30px; - width: 70px; - } - .text-1 { - margin-top: 10px; - } - input { - border-style: none; - } - .uppercase { - text-transform: uppercase; - } - .firstcontainer { - outline: 1px solid green; - width: 55%; - height: 40%; - background-image: image(assets/images/hero.gif); - } +.container2 { + /*outline: 1px solid black ;*/ + width: 525px; + height: 420px; + background-color: white; + float: right; + margin-top: 185px; + text-align:left; +} +.form1 { + width: 482px; + height: 283px; +} +.pinkbutton { + width: 186px; + height: 53px; - .lyagif { - position: relative; - width: 926px; - height: 534px; - } - .lyapng { - float: - width: 67px; - height: 49px; - } - .firstsection { - color: white; - width: 100%; - background: linear-gradient(#76278F, #2B1E66); - column-count: 2; - height: 614px; - text-align: left; - } - .information { - margin-top: 12%; - margin-left: 15%; - width: 569px; - } - .tittle1 { - margin-bottom: 3%; - } - .information p { - margin-bottom: 7%; - } +} +.uppercase { + text-transform: uppercase; +} - .aplicationpic img { - width: 477px; - height: 484px; - margin-top: 9%; - margin-left: 14%; - } +.firstsection { + color: white; + width: 100%; + background:linear-gradient(#76278F, #2B1E66); + column-count: 2; + height: 640px; + text-align: left; + +} +.information { + margin-top: 12%; + margin-left: 21%; + width: 569px; + height: 437px; +} +.tittle1 { + margin-bottom: 3%; + font-size: 25px; +} +.information p { + margin-bottom: 7%; +} + +.aplicationpic img { + width: 477px; + height: 484px; + margin-top: 9%; + margin-left: -5%; +} diff --git a/index.html b/index.html index 9a0ca930..7d730288 100644 --- a/index.html +++ b/index.html @@ -64,6 +64,8 @@

happy riders.

+

watch

+

From 6d977a04977b3a17081b7a8c09a55485af9af642 Mon Sep 17 00:00:00 2001 From: Amandir01 Date: Thu, 2 Nov 2017 03:07:57 -0500 Subject: [PATCH 9/9] second section --- css/main.css | 18 ++++++++++++++++++ index.html | 10 +++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/css/main.css b/css/main.css index ad3e59fd..dc998927 100644 --- a/css/main.css +++ b/css/main.css @@ -117,3 +117,21 @@ margin-top: 9%; margin-left: -5%; } +.section2 { + width: 100%; + height: 527px; + text-align: left; + display: inline; + +} +.about1 { + outline: 1px solid red; + width: 367px; + display: block; + margin: 9%; +} +.firstvideo iframe{ + float: none; + width: 935px; + height: 524px; +} diff --git a/index.html b/index.html index 7d730288..1487cf00 100644 --- a/index.html +++ b/index.html @@ -64,12 +64,12 @@

happy riders.

-

watch

-

- +

watch

+

amplify your ride

+

Lyft´s new emblem, Amp, is the secret to smooth pickups. Lighting up dashboards nationwide, the device makes it easy for passengers and drivers to find each other.

-
- +
+