From 7fba496e2d61913041d4736c5af5fd029e6fc382 Mon Sep 17 00:00:00 2001 From: VaneQiuta777 Date: Mon, 27 Nov 2017 18:20:02 -0500 Subject: [PATCH 01/53] =?UTF-8?q?a=C3=B1adiendo=20estructura=20html=20del?= =?UTF-8?q?=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/main.css | 20 ++++++++++++++++++++ index.html | 16 +++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 6355c827..16474bcc 100644 --- a/css/main.css +++ b/css/main.css @@ -1,3 +1,23 @@ /* * Estilos de tu proyecto */ + *, body { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +.containerHeader { + background-color: yellow; + border: 1px solid red; + width: 100%; + height: 100%; +} +#laboratoriaNav { + padding: 30px; + background-color: rebeccapurple; +} +#menuNav { + padding: 45px; + background-color: orange; +} diff --git a/index.html b/index.html index 8930fa03..aab9f7ca 100644 --- a/index.html +++ b/index.html @@ -2,10 +2,24 @@ + + Data Dashboard - +
+
+ + +
From 97cd10e4096b7dc58b5aa39a6e5439cf49a10d64 Mon Sep 17 00:00:00 2001 From: VaneQiuta777 Date: Tue, 28 Nov 2017 08:46:56 -0500 Subject: [PATCH 02/53] =?UTF-8?q?a=C3=B1adiendo=20header=20html=20y=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/main.css | 56 ++++++++++++++++++++++++++++++++++++++++++++-------- index.html | 29 +++++++++++++++++++-------- 2 files changed, 69 insertions(+), 16 deletions(-) diff --git a/css/main.css b/css/main.css index 16474bcc..da25aa68 100644 --- a/css/main.css +++ b/css/main.css @@ -1,23 +1,63 @@ /* * Estilos de tu proyecto */ - *, body { + * { margin: 0; padding: 0; box-sizing: border-box; } - +body { + margin: 0; + padding: 0; + background: pink; + font-size: 22px; + font-family: 'Source Sans Pro', sans-serif; +} .containerHeader { - background-color: yellow; border: 1px solid red; - width: 100%; - height: 100%; + height: 250px; } #laboratoriaNav { + height: 40%; + width: 100%; + background-color: lightcyan; +} +.logoLaboratoria { + float: left; + margin-left: 50%; + transform: translateX(-50%); + padding: 25px; +} +.iconoMenu { + float: right; + margin-right: 70px; padding: 30px; - background-color: rebeccapurple; } #menuNav { - padding: 45px; - background-color: orange; + height: 60%; + width: 100%; + background-color: #e1e1e1; +} +h1 { + padding: 15px; + margin: 0 0 10px 80px; + letter-spacing: 1px; + font-size: 30px; +} +.subMenuPrincipal { + float: left; + margin-left: 85px; + padding: 10px; + letter-spacing: 1px; + font-weight: bolder; +} +.subMenu { + float: left; + margin-left: 15px; + padding: 10px; + font-weight: bolder; } +.containerMain { + height: 800px; + border: 2px solid green; +} \ No newline at end of file diff --git a/index.html b/index.html index aab9f7ca..e90a9b39 100644 --- a/index.html +++ b/index.html @@ -3,23 +3,36 @@ + Data Dashboard
-
+
-
+ + +
+
+ +
+
+ + From 1b324b132a28c9184c4886a7c1072583daca18a2 Mon Sep 17 00:00:00 2001 From: VaneQiuta777 Date: Tue, 28 Nov 2017 11:01:12 -0500 Subject: [PATCH 03/53] =?UTF-8?q?a=C3=B1adiendo=20html=20y=20css=20la=20pr?= =?UTF-8?q?imera=20hoja(p=C3=A1gina=20de=20datos=20estad=C3=ADsticos)=20de?= =?UTF-8?q?l=20proyecto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/main.css | 77 +++++++++++++++++++++++++++++++++++++++++++++++++--- index.html | 74 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 5 deletions(-) diff --git a/css/main.css b/css/main.css index da25aa68..4b00988f 100644 --- a/css/main.css +++ b/css/main.css @@ -9,7 +9,7 @@ body { margin: 0; padding: 0; - background: pink; + background: #f7f7f7; font-size: 22px; font-family: 'Source Sans Pro', sans-serif; } @@ -20,7 +20,8 @@ body { #laboratoriaNav { height: 40%; width: 100%; - background-color: lightcyan; + background-color: #ffffff; + border: lawngreen } .logoLaboratoria { float: left; @@ -38,7 +39,7 @@ body { width: 100%; background-color: #e1e1e1; } -h1 { +.menuSede{ padding: 15px; margin: 0 0 10px 80px; letter-spacing: 1px; @@ -58,6 +59,74 @@ h1 { font-weight: bolder; } .containerMain { - height: 800px; + height: 2200px; border: 2px solid green; +} +.titleDatesStadistic { + font-size: 21px; + padding: 5px; + margin: 15px 0 15px 20px; +} +.datesStadisticFirst { + height: 300px; + width: 27%; + background-color: #ffffff; + outline: 1px solid yellow; + float: left; + margin: 70px 0 0 40px; + transform: translateX(15%) +} +.datesNumber { + background-color: grey; + width: 150px; + height: 60px; + float: left; + margin-left: 25px; +} +.datesPorcent { + background-color: lightskyblue; + width: 150px; + height: 60px; + float: left; + margin-left: 15px; +} +.imageDatesStadistic img { + transform: translateX(20%); + margin: 15px 0 5px 0; +} +.numDates { + font-size: 25px; + text-align: center; +} +.descriptionNumDates { + font-size: 10px; + text-align: center; + letter-spacing: 1px; +} +.datesStadisticSecond { + height: 600px; + width: 87%; + background-color: #ffffff; + outline: 1px solid yellow; + float: left; + margin: 70px 0 0 40px; + transform: translateX(5%) +} +.datesStadisticThird { + height: 600px; + width: 87%; + background-color: #ffffff; + outline: 1px solid yellow; + float: left; + margin: 70px 0 0 40px; + transform: translateX(5%) +} +.datesStadisticFourth { + height: 300px; + width: 27%; + background-color: #ffffff; + outline: 1px solid yellow; + float: left; + margin: 70px 0 0 40px; + transform: translateX(15%) } \ No newline at end of file diff --git a/index.html b/index.html index e90a9b39..25317b2e 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ + Data Dashboard @@ -18,7 +19,7 @@ -