From da5f86a12067e2498374a901529754c17cc00792 Mon Sep 17 00:00:00 2001 From: MiguelFormacion Date: Fri, 17 May 2019 11:12:49 +0200 Subject: [PATCH 1/6] examen --- m1/examen-m1/index.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/m1/examen-m1/index.html b/m1/examen-m1/index.html index e69de29..1989878 100644 --- a/m1/examen-m1/index.html +++ b/m1/examen-m1/index.html @@ -0,0 +1,12 @@ + + + + + + + Document + + + + + \ No newline at end of file From 2bca1ee60865e3395788b8a66a227eee0d3beff5 Mon Sep 17 00:00:00 2001 From: MiguelFormacion Date: Fri, 17 May 2019 11:24:11 +0200 Subject: [PATCH 2/6] examen --- m1/examen-m1/index.html | 9 +++++++++ m1/examen-m1/style.css | 7 +++++++ m1/examen-m1/style.css.map | 1 + m1/examen-m1/style.scss | 6 ++++++ 4 files changed, 23 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 1989878..7151aee 100644 --- a/m1/examen-m1/index.html +++ b/m1/examen-m1/index.html @@ -7,6 +7,15 @@ Document +
+

klñsdfgs gasdflñgk sdfgñ sdflñ

+
+
+ + fsdf sdf sdaf + + +
\ 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..e1ec058 --- /dev/null +++ b/m1/examen-m1/style.css @@ -0,0 +1,7 @@ +html { + box-sizing: border-box; + margin: 0; + padding: 0; +} + +/*# 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..c2b9803 --- /dev/null +++ b/m1/examen-m1/style.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AACA;EACI;EACA;EACA","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..9c8e24c 100644 --- a/m1/examen-m1/style.scss +++ b/m1/examen-m1/style.scss @@ -0,0 +1,6 @@ +// RESET +html{ + box-sizing: border-box; + margin: 0; + padding: 0; +} \ No newline at end of file From 90724ad8254f306eee767878b3ebb4fc1e216bde Mon Sep 17 00:00:00 2001 From: MiguelFormacion Date: Fri, 17 May 2019 13:20:41 +0200 Subject: [PATCH 3/6] examen --- m1/examen-m1/index.html | 25 +++++++--- m1/examen-m1/style.css | 70 ++++++++++++++++++++++++++++ m1/examen-m1/style.css.map | 2 +- m1/examen-m1/style.scss | 95 +++++++++++++++++++++++++++++++++++++- 4 files changed, 183 insertions(+), 9 deletions(-) diff --git a/m1/examen-m1/index.html b/m1/examen-m1/index.html index 7151aee..ef19c56 100644 --- a/m1/examen-m1/index.html +++ b/m1/examen-m1/index.html @@ -4,18 +4,31 @@ - Document + Curs Mean-stack 2019 +
-

klñsdfgs gasdflñgk sdfgñ sdflñ

+

Curs Mean-stack 2019

+
-
- - fsdf sdf sdaf - +
+

alumnes

+

recursos

+ +
+

Copyright 2019 mean-stack - html|css|javascript

+
\ No newline at end of file diff --git a/m1/examen-m1/style.css b/m1/examen-m1/style.css index e1ec058..9e7ba85 100644 --- a/m1/examen-m1/style.css +++ b/m1/examen-m1/style.css @@ -2,6 +2,76 @@ html { box-sizing: border-box; margin: 0; padding: 0; + font-family: Helvetica, Arial, sans-serif; +} + +header { + background: url(https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg); + filter: grayscale(100%); + background-repeat: no-repeat; + width: 100%; + height: 125px; +} +header h1 { + margin: 0; + text-align: center; + color: whitesmoke; + font-size: 40px; + padding: 15px; +} +header nav ul { + text-align: center; +} +header nav li { + list-style: none; + display: inline-block; + font-size: 15px; +} +header nav li a { + color: whitesmoke; + text-decoration: none; + padding: 5px 5px; + margin: 0 5px; +} +header nav li a:hover { + background-color: #333; + opacity: 0.2; + filter: drop-shadow(16px 16px 20px #333); +} + +main p { + position: relative; + display: inline-block; + padding: 60px 60px; + margin: 10px 10px; + border: 1px solid whitesmoke; + font-size: 40px; + border-radius: 10px; +} +main p a { + text-decoration: none; + color: whitesmoke; +} +main p a:hover { + background-color: black; + opacity: 0.1; + filter: drop-shadow(16px 16px 20px #333); +} +main p .alumnes { + float: left; +} +main p .recursos { + float: right; +} + +footer { + display: flex; + justify-content: center; + align-content: end; + height: 100px; + background-color: #333; + color: whitesmoke; + font-size: 10px; } /*# sourceMappingURL=style.css.map */ diff --git a/m1/examen-m1/style.css.map b/m1/examen-m1/style.css.map index c2b9803..6689900 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":"AACA;EACI;EACA;EACA","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AACA;EACI;EACA;EACA;EACA;;;AAOJ;EACI;EACA;EACA;EACA;EACA;;AAEI;EACI;EACA;EACA;EACA;EACA;;AAIA;EACI;;AAGA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;;;AASpB;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAEJ;EACI;;AAEJ;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EAEA","file":"style.css"} \ No newline at end of file diff --git a/m1/examen-m1/style.scss b/m1/examen-m1/style.scss index 9c8e24c..10af3a9 100644 --- a/m1/examen-m1/style.scss +++ b/m1/examen-m1/style.scss @@ -1,6 +1,97 @@ -// RESET +// RESET y PROPIEDADES GLOBALES html{ box-sizing: border-box; margin: 0; padding: 0; -} \ No newline at end of file + font-family: Helvetica, Arial, sans-serif; + + +} + +// LAYOUT DEL DOCUMENTO + +header{ + background: url(https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg); + filter: grayscale(100%); + background-repeat: no-repeat; + width: 100%; + height: 125px; + + h1{ + margin:0; + text-align: center; + color: whitesmoke; + font-size: 40px; + padding:15px; + } + nav{ + + ul{ + text-align: center; + + } + li{ + list-style: none; + display: inline-block; + font-size: 15px; + + a{ + color: whitesmoke; + text-decoration:none; + padding: 5px 5px; + margin:0 5px; + } + a:hover{ + background-color: #333; + opacity: 0.2; + filter: drop-shadow(16px 16px 20px #333); + + } + } + } +} + +main{ + + p{ + position: relative; + display: inline-block; + padding: 60px 60px; + margin:10px 10px; + border: 1px solid whitesmoke; + font-size: 40px; + border-radius: 10px; + + a{ + text-decoration:none; + color: whitesmoke; + } + + a:hover{ + background-color:black; + opacity:0.1; + filter: drop-shadow(16px 16px 20px #333); + } + .alumnes{ + float:left; + } + .recursos{ + float:right; + } + } +} + +footer{ + display: flex; + justify-content: center; + align-content: end; + height: 100px; + background-color: #333; + color: whitesmoke; + + font-size:10px; + + +} + +// DETALLES \ No newline at end of file From f91476d648d0bda67f79a1f9d01bdb193061d184 Mon Sep 17 00:00:00 2001 From: MiguelFormacion Date: Fri, 17 May 2019 13:54:03 +0200 Subject: [PATCH 4/6] examen --- m1/examen-m1/style.css | 6 +++++- m1/examen-m1/style.css.map | 2 +- m1/examen-m1/style.scss | 11 +++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/m1/examen-m1/style.css b/m1/examen-m1/style.css index 9e7ba85..9431401 100644 --- a/m1/examen-m1/style.css +++ b/m1/examen-m1/style.css @@ -9,7 +9,6 @@ header { background: url(https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg); filter: grayscale(100%); background-repeat: no-repeat; - width: 100%; height: 125px; } header h1 { @@ -59,8 +58,10 @@ main p a:hover { } main p .alumnes { float: left; + width: 300px; } main p .recursos { + width: 300px; float: right; } @@ -73,5 +74,8 @@ footer { color: whitesmoke; font-size: 10px; } +footer p { + padding: 70px 0 0 0; +} /*# sourceMappingURL=style.css.map */ diff --git a/m1/examen-m1/style.css.map b/m1/examen-m1/style.css.map index 6689900..af5eb4a 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":"AACA;EACI;EACA;EACA;EACA;;;AAOJ;EACI;EACA;EACA;EACA;EACA;;AAEI;EACI;EACA;EACA;EACA;EACA;;AAIA;EACI;;AAGA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;;;AASpB;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAEJ;EACI;;AAEJ;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EAEA","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AACA;EACI;EACA;EACA;EACA;;;AAOJ;EAEI;EACA;EACA;EAEA;;AAEI;EACI;EACA;EACA;EACA;EACA;;AAIA;EACI;;AAGA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;;;AASpB;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAEJ;EACI;EACA;;AAEJ;EACI;EACA;;;AAKZ;EACI;EACA;EACA;EAEA;EACA;EACA;EAGA;;AACA;EACI","file":"style.css"} \ No newline at end of file diff --git a/m1/examen-m1/style.scss b/m1/examen-m1/style.scss index 10af3a9..d4274e9 100644 --- a/m1/examen-m1/style.scss +++ b/m1/examen-m1/style.scss @@ -11,10 +11,11 @@ html{ // LAYOUT DEL DOCUMENTO header{ + background: url(https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg); filter: grayscale(100%); background-repeat: no-repeat; - width: 100%; + height: 125px; h1{ @@ -74,8 +75,10 @@ main{ } .alumnes{ float:left; + width: 300px; } .recursos{ + width: 300px; float:right; } } @@ -85,12 +88,16 @@ footer{ display: flex; justify-content: center; align-content: end; + height: 100px; background-color: #333; color: whitesmoke; + font-size:10px; - + p{ + padding:70px 0 0 0; + } } From aeba7834225baca1fba3c4048b1eaa5f0ea534d3 Mon Sep 17 00:00:00 2001 From: MiguelFormacion Date: Fri, 17 May 2019 14:14:36 +0200 Subject: [PATCH 5/6] examen --- m1/examen-m1/style.css | 15 ++++++--------- m1/examen-m1/style.css.map | 2 +- m1/examen-m1/style.scss | 30 +++++++++++++++--------------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/m1/examen-m1/style.css b/m1/examen-m1/style.css index 9431401..9d3252a 100644 --- a/m1/examen-m1/style.css +++ b/m1/examen-m1/style.css @@ -38,6 +38,10 @@ header nav li a:hover { filter: drop-shadow(16px 16px 20px #333); } +main { + position: relative; + height: 80%; +} main p { position: relative; display: inline-block; @@ -51,18 +55,11 @@ main p a { text-decoration: none; color: whitesmoke; } -main p a:hover { +main p:hover { background-color: black; opacity: 0.1; filter: drop-shadow(16px 16px 20px #333); -} -main p .alumnes { - float: left; - width: 300px; -} -main p .recursos { - width: 300px; - float: right; + text-shadow: 15px 15px 15px #000; } footer { diff --git a/m1/examen-m1/style.css.map b/m1/examen-m1/style.css.map index af5eb4a..ba54098 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":"AACA;EACI;EACA;EACA;EACA;;;AAOJ;EAEI;EACA;EACA;EAEA;;AAEI;EACI;EACA;EACA;EACA;EACA;;AAIA;EACI;;AAGA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;;;AASpB;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAEJ;EACI;EACA;;AAEJ;EACI;EACA;;;AAKZ;EACI;EACA;EACA;EAEA;EACA;EACA;EAGA;;AACA;EACI","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AACA;EACI;EACA;EACA;EACA;;;AAKJ;EAEI;EACA;EACA;EAEA;;AAEI;EACI;EACA;EACA;EACA;EACA;;AAIA;EACI;;AAGA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;;;AAOxB;EACI;EAEA;;AAEA;EACI;EACA;EAGA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAMR;EACI;EACA;EACA;EAEI;;;AAKZ;EACI;EACA;EACA;EAEA;EACA;EACA;EAGA;;AACA;EACI","file":"style.css"} \ No newline at end of file diff --git a/m1/examen-m1/style.scss b/m1/examen-m1/style.scss index d4274e9..165e570 100644 --- a/m1/examen-m1/style.scss +++ b/m1/examen-m1/style.scss @@ -4,8 +4,6 @@ html{ margin: 0; padding: 0; font-family: Helvetica, Arial, sans-serif; - - } // LAYOUT DEL DOCUMENTO @@ -53,10 +51,15 @@ header{ } main{ + position: relative; + + height: 80%; p{ position: relative; display: inline-block; + + padding: 60px 60px; margin:10px 10px; border: 1px solid whitesmoke; @@ -68,19 +71,16 @@ main{ color: whitesmoke; } - a:hover{ - background-color:black; - opacity:0.1; - filter: drop-shadow(16px 16px 20px #333); - } - .alumnes{ - float:left; - width: 300px; - } - .recursos{ - width: 300px; - float:right; - } + + + } + p:hover{ + background-color:black; + opacity:0.1; + filter: drop-shadow(16px 16px 20px #333); + // a{ + text-shadow: 15px 15px 15px #000 + // } } } From 986d8ff9cb4ebcced0f11b31987a8ab0ad41ed53 Mon Sep 17 00:00:00 2001 From: MiguelFormacion Date: Fri, 17 May 2019 14:25:04 +0200 Subject: [PATCH 6/6] examen --- m1/examen-m1/style.css | 1 + m1/examen-m1/style.css.map | 2 +- m1/examen-m1/style.scss | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/m1/examen-m1/style.css b/m1/examen-m1/style.css index 9d3252a..b3e5bcd 100644 --- a/m1/examen-m1/style.css +++ b/m1/examen-m1/style.css @@ -9,6 +9,7 @@ header { background: url(https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg); filter: grayscale(100%); background-repeat: no-repeat; + width: 100%; height: 125px; } header h1 { diff --git a/m1/examen-m1/style.css.map b/m1/examen-m1/style.css.map index ba54098..fa98e38 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":"AACA;EACI;EACA;EACA;EACA;;;AAKJ;EAEI;EACA;EACA;EAEA;;AAEI;EACI;EACA;EACA;EACA;EACA;;AAIA;EACI;;AAGA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;;;AAOxB;EACI;EAEA;;AAEA;EACI;EACA;EAGA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAMR;EACI;EACA;EACA;EAEI;;;AAKZ;EACI;EACA;EACA;EAEA;EACA;EACA;EAGA;;AACA;EACI","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AACA;EACI;EACA;EACA;EACA;;;AAKJ;EACI;EACA;EACA;EACA;EACA;;AAEI;EACI;EACA;EACA;EACA;EACA;;AAIA;EACI;;AAGA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;;;AAOxB;EACI;EAEA;;AAEA;EACI;EACA;EAGA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAKR;EACI;EACA;EACA;EAEI;;;AAKZ;EACI;EACA;EACA;EAEA;EACA;EACA;EAGA;;AACA;EACI","file":"style.css"} \ No newline at end of file diff --git a/m1/examen-m1/style.scss b/m1/examen-m1/style.scss index 165e570..c44782a 100644 --- a/m1/examen-m1/style.scss +++ b/m1/examen-m1/style.scss @@ -9,11 +9,10 @@ html{ // LAYOUT DEL DOCUMENTO header{ - background: url(https://concepto.de/wp-content/uploads/2019/02/paisaje-natural-item-5.jpg); filter: grayscale(100%); background-repeat: no-repeat; - + width: 100%; height: 125px; h1{ @@ -72,7 +71,6 @@ main{ } - } p:hover{ background-color:black;