From fccdfb2eea310f595ad615290a7f10a9aa348ebe Mon Sep 17 00:00:00 2001 From: pruebas Date: Fri, 17 May 2019 13:32:19 +0200 Subject: [PATCH 1/3] examen modificadom de victor --- m1/examen-m1/index.html | 42 +++++++++++++++++++ m1/examen-m1/style.css | 80 +++++++++++++++++++++++++++++++++++++ m1/examen-m1/style.css.map | 1 + m1/examen-m1/style.scss | 82 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 205 insertions(+) create mode 100644 m1/examen-m1/style.css create mode 100644 m1/examen-m1/style.css.map diff --git a/m1/examen-m1/index.html b/m1/examen-m1/index.html index e69de29..6c78593 100644 --- a/m1/examen-m1/index.html +++ b/m1/examen-m1/index.html @@ -0,0 +1,42 @@ + + + + + + + Document + + + + +
+

Curs Mean-stack 2019

+ +
+
+
+

alumnes

+
+
+ +
+
+

recursos

+
+
+ + + + \ No newline at end of file diff --git a/m1/examen-m1/style.css b/m1/examen-m1/style.css new file mode 100644 index 0000000..44a82ee --- /dev/null +++ b/m1/examen-m1/style.css @@ -0,0 +1,80 @@ +/*reset*/ +.reset { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +/*globales*/ +.globales { + font-family: Helvetica Arial sans-serif; +} + +.container { + width: 80%; + margin: 0 auto; +} + +/*layout y detalles*/ +.cabecera { + filter: grayscale(100%); + background-color: black; + text-align: center; + background-image: url("https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg"); +} + +.cabecera h1 { + color: whitesmoke; +} + +.menu_navegacion li { + text-decoration: none; + text-align: center; + display: inline-block; +} + +main { + background-color: white; +} + +section h2 a { + display: inline-block; + text-decoration: none; + color: whitesmoke; +} + +section:hover { + filter: drop-shadow(16px 16px 20px #333); +} + +.izquierda { + float: left; + margin-left: 20px; + width: 33%; + height: 50px; +} + +.centro { + visibility: hidden; + width: 33%; + height: 50px; +} + +.derecha { + float: right; + width: 33%; + height: 50px; +} + +.pie { + height: 60px; + background-color: #333; + clear: both; +} + +.pie p { + color: whitesmoke; + text-align: center; +} + +/*# sourceMappingURL=style.css.map */ diff --git a/m1/examen-m1/style.css.map b/m1/examen-m1/style.css.map new file mode 100644 index 0000000..677cca7 --- /dev/null +++ b/m1/examen-m1/style.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAKA;AACA;EACA;EACA;EACA;;;AAGA;AACA;EACA;;;AAGA;EACI;EACA;;;AAGJ;AACA;EACI;EACA;EACA;EACA;;;AAEJ;EACI,OA5BI;;;AA8BR;EACI;EACA;EACA;;;AAGJ;EACI,kBAtCI;;;AAyCR;EACI;EACA;EACA,OA3CI;;;AA8CR;EAEI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EAEA;EACA;;;AAEJ;EACI;EAEA;EACA;;;AAEJ;EACI;EACA,kBA1EK;EA2EL;;;AAEJ;EACI,OA5EI;EA6EJ","file":"style.css"} \ No newline at end of file diff --git a/m1/examen-m1/style.scss b/m1/examen-m1/style.scss index e69de29..996602a 100644 --- a/m1/examen-m1/style.scss +++ b/m1/examen-m1/style.scss @@ -0,0 +1,82 @@ +$color1: #333; +$color2:white; +$color3:whitesmoke; +$imagenfondo: "https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg"; + +/*reset*/ +.reset{ +margin:0; +padding:0; +box-sizing: border-box; + +} +/*globales*/ +.globales{ +font-family: Helvetica Arial sans-serif; + +} +.container{ + width: 80%; + margin:0 auto; + +} +/*layout y detalles*/ +.cabecera{ + filter: grayscale(100%); + background-color: black; + text-align: center; + background-image: url($imagenfondo); +} +.cabecera h1{ + color:$color3; +} +.menu_navegacion li{ + text-decoration:none; + text-align: center; + display:inline-block; + +} +main{ + background-color: $color2; +} + +section h2 a{ + display:inline-block; + text-decoration:none; + color:$color3; + +} +section:hover{ + //background-color: grey; + filter: drop-shadow(16px 16px 20px #333); + +} +.izquierda{ + float:left; + margin-left:20px; + width:33%; + height: 50px; +} + +.centro{ + visibility: hidden; + //float:center; + width:33%; + height: 50px; +} +.derecha{ + float:right; + //margin-left:20px; + width: 33%; + height: 50px; +} +.pie{ + height: 60px; + background-color: $color1; + clear:both; +} +.pie p{ + color:$color3; + text-align: center; + +} \ No newline at end of file From b2504c04cb1a5c0415e311a58489115037515f5b Mon Sep 17 00:00:00 2001 From: pruebas Date: Fri, 17 May 2019 14:04:01 +0200 Subject: [PATCH 2/3] examen modificadom de victor v0.1 --- m1/examen-m1/style.css | 21 +++++++++++++++------ m1/examen-m1/style.css.map | 2 +- m1/examen-m1/style.scss | 27 +++++++++++++++++---------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/m1/examen-m1/style.css b/m1/examen-m1/style.css index 44a82ee..6bcb6e1 100644 --- a/m1/examen-m1/style.css +++ b/m1/examen-m1/style.css @@ -10,17 +10,12 @@ font-family: Helvetica Arial sans-serif; } -.container { - width: 80%; - margin: 0 auto; -} - /*layout y detalles*/ .cabecera { - filter: grayscale(100%); background-color: black; text-align: center; background-image: url("https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg"); + filter: grayscale(100%); } .cabecera h1 { @@ -33,10 +28,22 @@ display: inline-block; } +.menu_navegacion ul li a { + text-decoration: none; +} + +.menu_navegacion ul li a:hover { + background-color: whitesmoke; +} + main { background-color: white; } +section { + padding: 20px; +} + section h2 a { display: inline-block; text-decoration: none; @@ -44,6 +51,7 @@ section h2 a { } section:hover { + background-color: rgba(0, 0, 0, 0.1); filter: drop-shadow(16px 16px 20px #333); } @@ -62,6 +70,7 @@ section:hover { .derecha { float: right; + margin-right: 20px; width: 33%; height: 50px; } diff --git a/m1/examen-m1/style.css.map b/m1/examen-m1/style.css.map index 677cca7..0e77cee 100644 --- a/m1/examen-m1/style.css.map +++ b/m1/examen-m1/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAKA;AACA;EACA;EACA;EACA;;;AAGA;AACA;EACA;;;AAGA;EACI;EACA;;;AAGJ;AACA;EACI;EACA;EACA;EACA;;;AAEJ;EACI,OA5BI;;;AA8BR;EACI;EACA;EACA;;;AAGJ;EACI,kBAtCI;;;AAyCR;EACI;EACA;EACA,OA3CI;;;AA8CR;EAEI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EAEA;EACA;;;AAEJ;EACI;EAEA;EACA;;;AAEJ;EACI;EACA,kBA1EK;EA2EL;;;AAEJ;EACI,OA5EI;EA6EJ","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAKA;AACA;EACA;EACA;EACA;;;AAGA;AACA;EACA;;;AAQA;AACA;EACI;EACA;EACA;EACA;;;AAEJ;EACI,OA5BI;;;AA8BR;EACI;EACA;EACA;;;AAEJ;EACI;;;AAEJ;EACI,kBAvCI;;;AAyCR;EACI,kBA3CI;;;AA6CR;EACI;;;AAEJ;EACI;EACA;EACA,OAlDI;;;AAoDR;EACI;EACA;;;AAIJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EAEA;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACI;EACA,kBAjFK;EAkFL;;;AAEJ;EACI,OAnFI;EAoFJ","file":"style.css"} \ No newline at end of file diff --git a/m1/examen-m1/style.scss b/m1/examen-m1/style.scss index 996602a..9d6ebf2 100644 --- a/m1/examen-m1/style.scss +++ b/m1/examen-m1/style.scss @@ -15,17 +15,17 @@ box-sizing: border-box; font-family: Helvetica Arial sans-serif; } -.container{ - width: 80%; - margin:0 auto; +//.container{ +// width: 80%; + // margin:0 auto; +//} -} /*layout y detalles*/ .cabecera{ - filter: grayscale(100%); background-color: black; text-align: center; background-image: url($imagenfondo); + filter: grayscale(100%); } .cabecera h1{ color:$color3; @@ -34,23 +34,30 @@ font-family: Helvetica Arial sans-serif; text-decoration:none; text-align: center; display:inline-block; - +} +.menu_navegacion ul li a{ + text-decoration: none; +} +.menu_navegacion ul li a:hover{ + background-color: $color3; } main{ background-color: $color2; } - +section{ + padding: 20px; +} section h2 a{ display:inline-block; text-decoration:none; color:$color3; - } section:hover{ - //background-color: grey; + background-color: rgba(0,0,0,0.1); filter: drop-shadow(16px 16px 20px #333); } + .izquierda{ float:left; margin-left:20px; @@ -66,7 +73,7 @@ section:hover{ } .derecha{ float:right; - //margin-left:20px; + margin-right: 20px; width: 33%; height: 50px; } From e42cb13315985d96f2259d5a05002d097503637d Mon Sep 17 00:00:00 2001 From: pruebas Date: Fri, 17 May 2019 14:25:56 +0200 Subject: [PATCH 3/3] examen modificadom de victor v0.2 --- m1/examen-m1/index.html | 4 +++- m1/examen-m1/style.css | 2 +- m1/examen-m1/style.css.map | 2 +- m1/examen-m1/style.scss | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/m1/examen-m1/index.html b/m1/examen-m1/index.html index 6c78593..507c5da 100644 --- a/m1/examen-m1/index.html +++ b/m1/examen-m1/index.html @@ -30,11 +30,13 @@

alumnes

recursos

+
+

-

copyrigth.2019 Victor Montanya

+

© 2019 Victor Montanya


diff --git a/m1/examen-m1/style.css b/m1/examen-m1/style.css index 6bcb6e1..a9c68c0 100644 --- a/m1/examen-m1/style.css +++ b/m1/examen-m1/style.css @@ -12,7 +12,7 @@ /*layout y detalles*/ .cabecera { - background-color: black; + background-color: #333; text-align: center; background-image: url("https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg"); filter: grayscale(100%); diff --git a/m1/examen-m1/style.css.map b/m1/examen-m1/style.css.map index 0e77cee..5585113 100644 --- a/m1/examen-m1/style.css.map +++ b/m1/examen-m1/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAKA;AACA;EACA;EACA;EACA;;;AAGA;AACA;EACA;;;AAQA;AACA;EACI;EACA;EACA;EACA;;;AAEJ;EACI,OA5BI;;;AA8BR;EACI;EACA;EACA;;;AAEJ;EACI;;;AAEJ;EACI,kBAvCI;;;AAyCR;EACI,kBA3CI;;;AA6CR;EACI;;;AAEJ;EACI;EACA;EACA,OAlDI;;;AAoDR;EACI;EACA;;;AAIJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EAEA;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACI;EACA,kBAjFK;EAkFL;;;AAEJ;EACI,OAnFI;EAoFJ","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAKA;AACA;EACA;EACA;EACA;;;AAGA;AACA;EACA;;;AAQA;AACA;EACI,kBAxBK;EAyBL;EACA;EACA;;;AAEJ;EACI,OA5BI;;;AA8BR;EACI;EACA;EACA;;;AAEJ;EACI;;;AAEJ;EACI,kBAvCI;;;AAyCR;EACI,kBA3CI;;;AA6CR;EACI;;;AAEJ;EACI;EACA;EACA,OAlDI;;;AAoDR;EACI;EACA;;;AAIJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EAEA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAEJ;EACI;EACA,kBAlFK;EAmFL;;;AAEJ;EACI,OApFI;EAqFJ","file":"style.css"} \ No newline at end of file diff --git a/m1/examen-m1/style.scss b/m1/examen-m1/style.scss index 9d6ebf2..0c660b3 100644 --- a/m1/examen-m1/style.scss +++ b/m1/examen-m1/style.scss @@ -17,12 +17,12 @@ font-family: Helvetica Arial sans-serif; } //.container{ // width: 80%; - // margin:0 auto; +// margin:0 auto; //} /*layout y detalles*/ .cabecera{ - background-color: black; + background-color: $color1; text-align: center; background-image: url($imagenfondo); filter: grayscale(100%); @@ -71,6 +71,7 @@ section:hover{ width:33%; height: 50px; } +//div{clear:both;} .derecha{ float:right; margin-right: 20px; @@ -85,5 +86,4 @@ section:hover{ .pie p{ color:$color3; text-align: center; - } \ No newline at end of file