diff --git a/m1/examen-m1/index.html b/m1/examen-m1/index.html index e69de29..466e941 100644 --- a/m1/examen-m1/index.html +++ b/m1/examen-m1/index.html @@ -0,0 +1,40 @@ + + + + + + + + + Document + + + +
+

Curs Mean-stack 2019

+ +
+
+
+
+

alumnes

 +
+
+

recursos

 +
+
+
+ + + + \ No newline at end of file diff --git a/m1/examen-m1/layout.scss b/m1/examen-m1/layout.scss new file mode 100644 index 0000000..1bc0bbc --- /dev/null +++ b/m1/examen-m1/layout.scss @@ -0,0 +1,56 @@ +*{ + font-family: Helvetica, Arial, sans-serif; + color:whitesmoke; +} +header{ + text-align: center; + line-height: 2em; + display: flex; + flex-direction: column; + justify-content: space-evenly; +<<<<<<< HEAD + height: 30%; +======= + height: 15em; +>>>>>>> master + filter: grayscale(100%); +} +nav{ + ul{ + li{ + display: inline; + a{ + text-decoration: none; + color: whitesmoke; + } + } + } +} +main{ +<<<<<<< HEAD + height: 50%; +======= + height: 30rem; +>>>>>>> master + + section{ + display: flex; + flex-direction: row; + justify-content: space-between; + } +} +footer{ + text-align: center; +<<<<<<< HEAD + height: 20%; +======= + height: 14em; +>>>>>>> master + background-color: #333; + display: flex; + + justify-content: flex-end; + h6 { + margin: auto auto 1em auto; + } +} diff --git a/m1/examen-m1/paisaje-natural-item-5.jpg b/m1/examen-m1/paisaje-natural-item-5.jpg new file mode 100644 index 0000000..9222e46 Binary files /dev/null and b/m1/examen-m1/paisaje-natural-item-5.jpg differ diff --git a/m1/examen-m1/reset.scss b/m1/examen-m1/reset.scss new file mode 100644 index 0000000..834db82 --- /dev/null +++ b/m1/examen-m1/reset.scss @@ -0,0 +1,2 @@ +html,body{margin: 0;padding: 0;height: 100%;} +h1{margin:0;} diff --git a/m1/examen-m1/style.css b/m1/examen-m1/style.css new file mode 100644 index 0000000..bb8a170 --- /dev/null +++ b/m1/examen-m1/style.css @@ -0,0 +1,141 @@ +html, body { + margin: 0; + padding: 0; + height: 100%; +} + +h1 { + margin: 0; +} + +* { + font-family: Helvetica, Arial, sans-serif; + color: whitesmoke; +} + +header { + text-align: center; + line-height: 2em; + display: flex; + flex-direction: column; + justify-content: space-evenly; +<<<<<<< HEAD + height: 30%; +======= + height: 15em; +>>>>>>> master + filter: grayscale(100%); +} + +nav ul li { + display: inline; +} +nav ul li a { + text-decoration: none; + color: whitesmoke; +} + +main { +<<<<<<< HEAD + height: 50%; +======= + height: 30rem; +>>>>>>> master +} +main section { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +footer { + text-align: center; +<<<<<<< HEAD + height: 20%; +======= + height: 14em; +>>>>>>> master + background-color: #333; + display: flex; + justify-content: flex-end; +} +footer h6 { + margin: auto auto 1em auto; +} + +header { + background-image: url(./paisaje-natural-item-5.jpg); + background-repeat: no-repeat; + background-size: cover; +} + +#navlist li { + padding: 5px; +} +#navlist li a { + font-size: 0.8em; +} +#navlist li:hover a { + color: #cecece; +} + +section { + padding: 0.5em; +} +section div { + padding: 1em; +} + +<<<<<<< HEAD +#recursos, #alumnes { +======= +#alumnes { + text-decoration: none; + border: 1px solid whitesmoke; + border-radius: 5%; + text-align: center; +} +#alumnes a { + padding: 10em; + text-decoration: none; +} +#alumnes a h2 { + font-size: 2.2em; + padding: 1.5em 1em; +} +#alumnes:hover { + background-color: #0000001a; +} +#alumnes:hover a { + text-shadow: 5px 4px 8px black; + filter: drop-shadow(16px 16px 20px #333); +} + +#recursos { +>>>>>>> master + text-decoration: none; + border: 1px solid whitesmoke; + border-radius: 5%; + text-align: center; +} +<<<<<<< HEAD +#recursos a, #alumnes a { +======= +#recursos a { +>>>>>>> master + padding: 10em; + text-decoration: none; +} +#recursos a h2, #alumnes a h2 { + font-size: 2.2em; + padding: 1.5em 1em; +} +#recursos:hover, #alumnes:hover { + background-color: #0000001a; +} +#recursos:hover a, #alumnes:hover a { + text-shadow: 5px 4px 8px black; + filter: drop-shadow(16px 16px 20px #333); +} + +/*# 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..252c0f4 --- /dev/null +++ b/m1/examen-m1/style.css.map @@ -0,0 +1,5 @@ +<<<<<<< HEAD +{"version":3,"sourceRoot":"","sources":["reset.scss","layout.scss","style.scss"],"names":[],"mappings":"AAAA;EAAU;EAAU;EAAW;;;AAC/B;EAAG;;;ACDH;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAII;EACI;;AACA;EACI;EACA;;;AAKhB;EACI;;AAEA;EACI;EACA;EACA;;;AAGR;EACI;EACA;EACA;EACA;EAEA;;AACA;EACI;;;ACtCR;EACI;EACA;EACA;;;AAGA;EACI;;AACA;EACI;;AAGA;EAAE;;;AAId;EACI;;AACA;EACI;;;AAIR;EACI;EACA;EACA;EACA;;AACA;EAAE;EAAa;;AACX;EACI;EACA;;AAGR;EACI;;AACA;EACI;EACA","file":"style.css"} +======= +{"version":3,"sourceRoot":"","sources":["reset.scss","layout.scss","style.scss"],"names":[],"mappings":"AAAA;EAAK;EAAU;;;AACf;EAAG;;;ACDH;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAII;EACI;;AACA;EACI;EACA;;;AAKhB;EACI;;AAEA;EACI;EACA;EACA;;;AAGR;EACI;EACA;EACA;EACA;EAEA;;AACA;EACI;;;ACtCR;EACI;EACA;EACA;;;AAGA;EACI;;AACA;EACI;;AAGA;EAAE;;;AAId;EACI;;AACA;EACI;;;AAIR;EACI;EACA;EACA;EACA;;AACA;EAAE;EAAa;;AACX;EACI;EACA;;AAGR;EACI;;AACA;EACI;EACA;;;AAKZ;EACI;EACA;EACA;EACA;;AACA;EACI;EAAa;;AACb;EACI;EACA;;AAGR;EACI;;AACA;EACI;EACA","file":"style.css"} +>>>>>>> master diff --git a/m1/examen-m1/style.scss b/m1/examen-m1/style.scss index e69de29..4f52e4f 100644 --- a/m1/examen-m1/style.scss +++ b/m1/examen-m1/style.scss @@ -0,0 +1,73 @@ +@import "reset.scss"; +@import "layout.scss"; + +header{ + background-image: url(./paisaje-natural-item-5.jpg); + background-repeat: no-repeat; + background-size: cover; +} +#navlist{ + li{ + padding: 5px; + a{ + font-size: 0.8em;; + } + &:hover{ + a{color:#cecece} + } + } +} +section{ + padding: 0.5em; + div{ + padding:1em; + } + +} +#recursos,#alumnes { + text-decoration: none; + border: 1px solid whitesmoke; + border-radius: 5%; + text-align: center; + a{padding:10em;text-decoration: none; + h2{ + font-size: 2.2em; + padding: 1.5em 1em; + } + } + &:hover { + background-color: #0000001a; + a{ + text-shadow: 5px 4px 8px black; + filter: drop-shadow(16px 16px 20px #333); + } + } +} +<<<<<<< HEAD +======= + +#recursos { + text-decoration: none; + border: 1px solid whitesmoke; + border-radius: 5%; + text-align: center; + a{ + padding:10em;text-decoration: none; + h2{ + font-size: 2.2em; + padding: 1.5em 1em; + } + } + &:hover { + background-color: #0000001a; + a{ + text-shadow: 5px 4px 8px black; + filter: drop-shadow(16px 16px 20px #333); + + } + } + +} + + +>>>>>>> master