Seguiment des de la branca master dels fitxers modificats

mmontoy4 · Oct 19, 2020 · 7539476 · 7539476
2 parents 78e093b + f3a0972
commit 7539476
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/diariMarta/style.css → diariMarta/css/style.css b/diariMarta/style.css → diariMarta/css/style.css
@@ -13,13 +13,13 @@ display: block;
 aside {
 float: left; width: 470px;
 min-height: 480px;
-background: url(logo.png) center top no-repeat;
+background: url(/images/logo.png) center top no-repeat;
 margin: 0 0 20px 0;
 }
 section {
 float: right; width: 428px;
 padding-left: 20px; margin: 0 0 20px 0px;
-border-left: 1px dotted #000;
+//border-left: 1px dotted #000;
 }
 section h2 {
 font: 14pt Helvetica,"Helvetica neue", Arial, sans-serif;
@@ -35,7 +35,7 @@ width:940px;
 height: 100px;
 padding: 10px;
 color:#200f08 ;
-border-top: 1px dotted #000;
+//border-top: 1px dotted #000;
 background:#fff;
 }
 h1 {

diff --git a/diariMarta/logo.png → diariMarta/images/logo.png b/diariMarta/logo.png → diariMarta/images/logo.png
diff --git a/diariMarta/index.html b/diariMarta/index.html
@@ -2,8 +2,13 @@
 <html>
 	<head>
 		<meta charset="UTF-8" />
+<<<<<<< HEAD
 		<title>Diari de Marta Montoya</title>
 		<link rel="stylesheet" type="text/css" href="style.css" />
+=======
+		<title>Diari de Marta</title>
+		<link rel="stylesheet" type="text/css" href="/css/style.css" />
+>>>>>>> develop
 		<!--[if IE]>
 		<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 		<![endif]-->