Add Logo base + Changes to footer

union-square · Nov 9, 2017 · 81d8607 · 81d8607
1 parent e5f7520
commit 81d8607
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 27 deletions.
diff --git a/css/stylesheet.css b/css/stylesheet.css
@@ -30,13 +30,23 @@ header{
 	height: 200px;
 }
 
+#mainLogo{
+	float: left;
+	margin-top: 40px;
+	margin-left: 100px;
+	height: 40px;
+	width: 80px;
+	background-image:url('../img/logo.png');
+	background-repeat: no-repeat;
+}
+
 nav#mainMenu{
-	display: flex;
 	float: right;
 	font-family: RobotoMedium;
 	font-size: 18px;
 	color: #28BC83;
 	letter-spacing: 0;
+	margin-top: 40px;
 	margin-right: 40px;
 }
 
@@ -136,3 +146,27 @@ h2{
 	float: right;
 	margin-left: 100px;
 }
+
+footer{
+	width: 100%;
+	border-top: 3px solid #979797;
+	display: inline-flex;
+}
+
+.logoBot{
+	margin-top: 22px;
+	margin-left: 60px;
+	float: left;
+	height: 40px;
+	width: 80px;
+	background-image:url('../img/logo.png');
+	background-repeat: no-repeat;
+}
+
+#menuBot{
+	float: left;
+}
+
+#sign{
+	float: right;
+}
diff --git a/footer.inc.php b/footer.inc.php
@@ -1,12 +1,15 @@
 
-<footer>
-	<div class="logoBot"></div>
-  <nav id="menuBot">
-		<ul>
-    	<li><a href="#">Cookies</a></li>
-  		<li><a href="#">Mention légales</a></li>
-  		<li><a href="#">Contact</a></li>
-		</ul>
-  </nav>
-  <div id="sign"></div>
-</footer>
+    <footer>
+    	<div class="logoBot"></div>
+      <nav id="menuBot">
+    		<ul>
+        	<li><a href="#">Cookies</a></li>
+      		<li><a href="#">Mention légales</a></li>
+      		<li><a href="#">Contact</a></li>
+    		</ul>
+      </nav>
+      <div id="sign"></div>
+    </footer>
+    <script type="text/javascript" src="js/script.js"></script>
+  </body>
+</html>
diff --git a/header.inc.php b/header.inc.php
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+	<title>Union Square</title>
+	<meta charset="UTF-8">
+    <link type="text/css" rel="stylesheet" href="css/stylesheet.css"/>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  </head>
+  <body>
+  	<header>
+  		<div id="mainLogo"></div>
+  		<nav id="mainMenu">
+  			<ul>
+  				<li><a href="#">Acceuil</a></li>
+  				<li><a href="#">Equipe</a></li>
+  				<li><a href="#">Contact & devis</a></li>
+  			</ul>
+  		</nav>
+  	</header>
+  	<svg id="svgTop" height="43" width="100%">
+        <polygon points="0,43 137,43 137,0" style="fill:rgba(216,216,216,0.15)" />
+    </svg>
diff --git a/index.php b/index.php
@@ -1,3 +1,5 @@
+
+<!-- <?php require'header.inc.php' ?> -->
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -18,6 +20,9 @@
   			</ul>
   		</nav>
   	</header>
+  	<svg id="svgTop" height="43" width="100%">
+        <polygon points="0,43 137,43 137,0" style="fill:rgba(216,216,216,0.15)" />
+    </svg>
   	<main>
   		<div id="intro">
         <div id="introBlock">
@@ -28,6 +33,9 @@
           </p>
           </div>
   		</div>
+  		<svg id="svgBl" height="90" width="300">
+        <polygon points="0,90 300,0 0,0" style="fill:rgba(216,216,216,0.15);stroke:rgba(216,216,216,0.15);stroke-width:1" />
+      </svg>
   		<div id="content">
   			<div class="exp">
           <div class="expTxtBox">
@@ -37,20 +45,22 @@
               Dum apud Persas, ut supra narravimus, perfidia regis motus agitat insperatos, et in eois tractibus bella rediviva consurgunt, anno sexto decimo et eo diutius post Nepotiani exitium, saeviens per urbem aeternam urebat cuncta Bellona, ex primordiis minimis ad clades excita luctuosas, quas obliterasset utinam iuge silentium! ne forte paria quandoque temptentur, plus exemplis generalibus nocitura quam delictis.
             </p>
           </div>
-
-  				<div class="ilu" id="iluTop"></div>		
-  			</div>
-  			<div class="exp" id="expMid">
-  				<div class="ilu" id="iluMid"></div>
-          <div class="expTxtBox">
-            <h2>Web design (ui / ux)</h2>
-            <span class="sep"></span>
-            <p class="expTxt">
-              Dum apud Persas, ut supra narravimus, perfidia regis motus agitat insperatos, et in eois tractibus bella rediviva consurgunt, anno sexto decimo et eo diutius post Nepotiani exitium, saeviens per urbem aeternam urebat cuncta Bellona, ex primordiis minimis ad clades excita luctuosas, quas obliterasset utinam iuge silentium! ne forte paria quandoque temptentur, plus exemplis generalibus nocitura quam delictis.
-            </p>
-        </div>
+  			<div class="ilu" id="iluTop"></div>		
   		</div>
-  			<div class="exp">
+  		<svg height="90" width="300">
+          <polygon points="0,90 300,0 0,0" style="fill:white" />
+        </svg>
+  		<div class="exp" id="expMid">
+  			<div class="ilu" id="iluMid"></div>
+          	<div class="expTxtBox">
+            	<h2>Web design (ui / ux)</h2>
+            	<span class="sep"></span>
+	            <p class="expTxt">
+	              Dum apud Persas, ut supra narravimus, perfidia regis motus agitat insperatos, et in eois tractibus bella rediviva consurgunt, anno sexto decimo et eo diutius post Nepotiani exitium, saeviens per urbem aeternam urebat cuncta Bellona, ex primordiis minimis ad clades excita luctuosas, quas obliterasset utinam iuge silentium! ne forte paria quandoque temptentur, plus exemplis generalibus nocitura quam delictis.
+	            </p>
+        	</div>
+  		</div>
+  		<div class="exp">
           <div class="expTxtBox">
             <h2>SEO & webmarketing</h2>
             <span class="sep"></span>
@@ -62,7 +72,34 @@
   			</div>
   		</div>
   	</main>
-  	<?php require 'footer.inc.php';?>
+	<footer>
+		<div class="logoBot"></div>
+		  <nav id="menuBot">
+			<ul>
+		    	<li><a href="#">Cookies</a></li>
+		  		<li><a href="#">Mention légales</a></li>
+		  		<li><a href="#">Contact</a></li>
+			</ul>
+		  </nav>
+	  <div id="sign">
+	  	<p>
+	  		Site biologique réalisé en bois recyclé<br>
+	  		(On sait faire des blagues aussi...)  
+	  	</p>
+	  	<p>
+	  		&copy; 
+	  		<?php
+				$copyYear = 2017; // Set your website start date
+				$curYear = date('Y'); // Keeps the second year updated
+
+				echo $copyYear . (($copyYear != $curYear) ? '-' . $curYear : '');
+			?>
+			Union Square
+		</p>
+	  </div>
+	</footer>
+
   	<script type="text/javascript" src="js/script.js"></script>
   </body>
-</html>
+</html>
+<!-- <?php require 'footer.inc.php';?> -->