From 98eea19278c5f27e9a0f4c56dc1bf285b5084e91 Mon Sep 17 00:00:00 2001 From: Alumne Date: Mon, 29 Apr 2019 14:08:26 +0200 Subject: [PATCH 1/3] Carlos Jordan Test --- m1/{ => css}/style.css | 82 ++++++++++++++++++++++++++++++++++ m1/{ => images}/fondo.gif | Bin m1/{ => images}/koala.jpg | Bin m1/index.html | 91 +++++++++++++++++++++++++++++++++----- 4 files changed, 162 insertions(+), 11 deletions(-) rename m1/{ => css}/style.css (59%) rename m1/{ => images}/fondo.gif (100%) rename m1/{ => images}/koala.jpg (100%) diff --git a/m1/style.css b/m1/css/style.css similarity index 59% rename from m1/style.css rename to m1/css/style.css index b3bc789..b67d228 100644 --- a/m1/style.css +++ b/m1/css/style.css @@ -1,3 +1,85 @@ +body { + margin: 0; + padding: 0; + border: 0; + font-family: Verdana, sans-serif; + font-size: 120%; + line-height: 160%; + background-color: #F2F5FE; + background-image: url("images/fondo.gif"); + background-repeat: repeat-x; + +} + +.Container { + width: 80%; + position: static; + background-color: white; + margin: auto; + +} + +.Header { +background-color:#233C9B; +Padding: 10px; +color:#FFF; +font-family: georgia, serif; +font-size: 260% ; +text-decoration: underline; +line-height: 35px; + +} + +.Menu { + text-align: center; +} + +li.Nav { + position: relative; + display: inline-block; + margin: 5px; + padding: 5px 15px 5px 15px; + color: #B5C4E3; + font-size: 0.75em; + background-color: #253575; + text-decoration: none; + cursor: pointer; +} + +.Imagen { + font-size: 0.75em; + display: grid; + margin: 0 auto; + text-align: center; +} + +img[alt="Koala"] { + width: 200px; height: 200px; + margin: 0 auto; +} + +.Main { + float:left; + width: 79%; + padding: 30px 10px 60px 10px; +} + +.Aside { + float: right; + width: 19%; + font-size: 0.75em; + +} + +.Footer { + clear:both; + font-size: 0.75em; + padding: 5px 5px; + text-align: center; + height: 40px; + color: white; + background-color: #233C9B; +} /* El bloque de reset tendrá las siguientes características: . márgenes, padding, fuente (verdana, sans-serif con tamaño 120% y altura 160%) y fondo con color (#F2F5FE) e imagen (fondo.gif) repetida diff --git a/m1/fondo.gif b/m1/images/fondo.gif similarity index 100% rename from m1/fondo.gif rename to m1/images/fondo.gif diff --git a/m1/koala.jpg b/m1/images/koala.jpg similarity index 100% rename from m1/koala.jpg rename to m1/images/koala.jpg diff --git a/m1/index.html b/m1/index.html index 3e954d7..b90827f 100644 --- a/m1/index.html +++ b/m1/index.html @@ -3,19 +3,87 @@ EXERCICI HTML-CSS - - - + + - - +
+
+ Mi sitio web +
+
+ +
+ +
+
+
+ Koala +

Figura:Koala

+
+ +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ornare sapien ac nibh vulputate feugiat. Morbi euismod velit sit amet libero volutpat ultrices in quis sem. Sed sit amet placerat sem. Curabitur vitae lectus nec purus accumsan faucibus. Donec vitae volutpat tortor. Suspendisse tempor rutrum urna, in consequat est tincidunt vitae. Cras et ligula at felis placerat tempor. Fusce elementum metus non justo luctus iaculis.

+

Donec ligula arcu, sagittis lacinia nibh et, consequat gravida turpis. Aenean nec scelerisque felis. Integer nec odio sed lorem mattis rhoncus quis quis nibh. Praesent non fringilla nisi. Duis porta placerat mattis. Aenean in mollis odio, at egestas massa. Quisque in lectus magna. Vestibulum vel faucibus massa, vel varius tortor. Maecenas et laoreet neque, ut semper neque. Suspendisse aliquet, nisl vel pharetra ultricies, elit felis molestie sem, ac scelerisque turpis tortor non lacus.

+ +
+
+ +
+ +
+ +
+
+ © 2019 José carlos Jordán Vergara +
+
+
+ + + - Mi sitio web + + -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ornare sapien ac nibh vulputate feugiat. Morbi euismod velit sit amet libero volutpat ultrices in quis sem. Sed sit amet placerat sem. Curabitur vitae lectus nec purus accumsan faucibus. Donec vitae volutpat tortor. Suspendisse tempor rutrum urna, in consequat est tincidunt vitae. Cras et ligula at felis placerat tempor. Fusce elementum metus non justo luctus iaculis.

+ - © 2019 Vuestro nombre y apellidos - - + + From ea2a48e1affc0ce4eef278053cd65920220f37f1 Mon Sep 17 00:00:00 2001 From: Alumne Date: Mon, 29 Apr 2019 14:16:03 +0200 Subject: [PATCH 2/3] Carlos Jordan Test II --- m1/css/style.css | 4 +++- m1/index.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/m1/css/style.css b/m1/css/style.css index b67d228..47f8004 100644 --- a/m1/css/style.css +++ b/m1/css/style.css @@ -25,9 +25,11 @@ Padding: 10px; color:#FFF; font-family: georgia, serif; font-size: 260% ; -text-decoration: underline; line-height: 35px; +} +.Header a { + color: #FFF; } .Menu { diff --git a/m1/index.html b/m1/index.html index b90827f..3ab9fbc 100644 --- a/m1/index.html +++ b/m1/index.html @@ -10,7 +10,7 @@
- Mi sitio web + Mi sitio web