From 452000854fda2632652bd4552c51e46b2cd00db0 Mon Sep 17 00:00:00 2001
From: theomemin <memint.contact@gmail.com>
Date: Mon, 26 Nov 2018 11:40:45 +0100
Subject: [PATCH] new nav bar -> navbar_blog

---
 project/.idea/workspace.xml                   |  57 +++++++-------
 project/assets/css/style_index.css            |  71 ++++++++++++++++--
 .../assets/{polices => font}/Zona_Black.ttf   | Bin
 project/assets/{polices => font}/blod.otf     | Bin
 project/assets/{polices => font}/roman.otf    | Bin
 project/assets/img/facebook.svg               |   1 -
 project/assets/img/glass.png                  | Bin 0 -> 769 bytes
 project/index.php                             |   3 +-
 project/navbar.php                            |  32 ++++++++
 project/navbar_imie.php                       |  17 -----
 10 files changed, 130 insertions(+), 51 deletions(-)
 rename project/assets/{polices => font}/Zona_Black.ttf (100%)
 rename project/assets/{polices => font}/blod.otf (100%)
 rename project/assets/{polices => font}/roman.otf (100%)
 delete mode 100644 project/assets/img/facebook.svg
 create mode 100644 project/assets/img/glass.png
 create mode 100644 project/navbar.php
 delete mode 100644 project/navbar_imie.php

diff --git a/project/.idea/workspace.xml b/project/.idea/workspace.xml
index d82048e..2ea9a97 100644
--- a/project/.idea/workspace.xml
+++ b/project/.idea/workspace.xml
@@ -4,7 +4,9 @@
     <list default="true" id="fadbc7d1-5187-462c-8e18-595bb22b7d4e" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/assets/css/style_index.css" beforeDir="false" afterPath="$PROJECT_DIR$/assets/css/style_index.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/assets/img/facebook.svg" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/navbar_imie.php" beforeDir="false" afterPath="$PROJECT_DIR$/navbar.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -16,10 +18,11 @@
     <session id="-1522156829">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="1" />
+          <entry key="project.closed" value="2" />
           <entry key="project.open.time.1" value="1" />
           <entry key="project.open.time.5" value="1" />
-          <entry key="project.opened" value="2" />
+          <entry key="project.open.time.9" value="1" />
+          <entry key="project.opened" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
@@ -38,14 +41,14 @@
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="css" value="57" />
-          <entry key="php" value="22" />
+          <entry key="css" value="396" />
+          <entry key="php" value="163" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="CSS" value="57" />
-          <entry key="PHP" value="22" />
+          <entry key="CSS" value="396" />
+          <entry key="PHP" value="163" />
         </counts>
       </usages-collector>
     </session>
@@ -55,17 +58,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
+            <state relative-caret-position="255">
+              <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/navbar_imie.php">
+        <entry file="file://$PROJECT_DIR$/navbar.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
+            <state relative-caret-position="465">
+              <caret line="31" column="10" lean-forward="true" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -73,8 +76,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/assets/css/style_index.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
+            <state relative-caret-position="165">
+              <caret line="11" column="29" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -89,6 +92,7 @@
       <list>
         <option value="$PROJECT_DIR$/navbar_imie.php" />
         <option value="$PROJECT_DIR$/index.php" />
+        <option value="$PROJECT_DIR$/navbar.php" />
         <option value="$PROJECT_DIR$/assets/css/style_index.css" />
       </list>
     </option>
@@ -160,18 +164,19 @@
       <option name="presentableId" value="Default" />
       <updated>1543220472616</updated>
       <workItem from="1543220476187" duration="647000" />
-      <workItem from="1543222406237" duration="1095000" />
+      <workItem from="1543222406237" duration="1278000" />
+      <workItem from="1543224746578" duration="2764000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1742000" />
+    <option name="totallyTimeSpent" value="4689000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25767368" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -199,27 +204,25 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.htaccess">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/navbar_imie.php">
+    <entry file="file://$PROJECT_DIR$/.htaccess" />
+    <entry file="file://$PROJECT_DIR$/index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
+        <state relative-caret-position="255">
+          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/index.php">
+    <entry file="file://$PROJECT_DIR$/navbar.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
+        <state relative-caret-position="465">
+          <caret line="31" column="10" lean-forward="true" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/assets/css/style_index.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
+        <state relative-caret-position="165">
+          <caret line="11" column="29" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
         </state>
       </provider>
     </entry>
diff --git a/project/assets/css/style_index.css b/project/assets/css/style_index.css
index d374d3a..fda3490 100644
--- a/project/assets/css/style_index.css
+++ b/project/assets/css/style_index.css
@@ -7,6 +7,11 @@ body{
 	background-color: #1c1c1c;
 }
 
+.nav_blog{
+	height: 80px;
+	background-color: #EAE7E4;
+}
+
 .item_nav_imie{
 	display: inline-block;
 	padding-left: 20px;
@@ -14,12 +19,68 @@ body{
 	color: white;
 	float: right;
 	font-family: 'Open Sans', sans-serif;
-	font-size: 15px;
+	font-size: 16px;
 	font-weight: 600;
 }
 
-@media screen and (max-width: 640px) {
-  .nav_imie {
-    height: 0;
-  }
+.item_nav_blog_gauche{
+	padding-top:25px;
+	vertical-align: center;
+	display: inline-block;
+	color: black;
+	float: left;
 }
+
+.item_nav_blog_droite{
+	padding-top: 20px;
+	display: inline-block;
+	color: black;
+	float: right;
+}
+#twi{
+	height: 18px;
+	width: 18px;
+}
+
+#fb{
+	height: 18px;
+	width: 9px;
+}
+
+#search{
+	background-color: transparent;
+	border: none;
+	width: 120px;
+	border-bottom: #1c1c1c solid 2px;
+}
+
+#glass{
+	height: 20px;
+	width: 20px;
+	margin-left: 8px;
+}
+
+@media screen and (max-width: 640px) {
+    .nav_imie {
+    	height: 0;
+  }
+	.item_nav_imie{
+		font-size: 0;
+	}
+	#twi{
+		height: 0;
+		width: 0;
+	}
+	#fb{
+		height: 0;
+		width: 0;
+	}
+}
+@media screen and (max-width: 365px) {
+	#search{
+		background-color: transparent;
+		border: none;
+		width: 60px;
+		border-bottom: #1c1c1c solid 2px;
+	}
+}
\ No newline at end of file
diff --git a/project/assets/polices/Zona_Black.ttf b/project/assets/font/Zona_Black.ttf
similarity index 100%
rename from project/assets/polices/Zona_Black.ttf
rename to project/assets/font/Zona_Black.ttf
diff --git a/project/assets/polices/blod.otf b/project/assets/font/blod.otf
similarity index 100%
rename from project/assets/polices/blod.otf
rename to project/assets/font/blod.otf
diff --git a/project/assets/polices/roman.otf b/project/assets/font/roman.otf
similarity index 100%
rename from project/assets/polices/roman.otf
rename to project/assets/font/roman.otf
diff --git a/project/assets/img/facebook.svg b/project/assets/img/facebook.svg
deleted file mode 100644
index 64dc50a..0000000
--- a/project/assets/img/facebook.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" data-prefix="fab" data-icon="facebook-f" class="svg-inline--fa fa-facebook-f fa-w-9" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 264 512"><path fill="currentColor" d="M76.7 512V283H0v-91h76.7v-71.7C76.7 42.4 124.3 0 193.8 0c33.3 0 61.9 2.5 70.2 3.6V85h-48.2c-37.8 0-45.1 18-45.1 44.3V192H256l-11.7 91h-73.6v229"></path></svg>
\ No newline at end of file
diff --git a/project/assets/img/glass.png b/project/assets/img/glass.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3d9efa0cdf5f05cc74f491a1889352aba1d18a4
GIT binary patch
literal 769
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz
z5m^kh={g8AI%&+V01C2~c>21sKjN0+7GpU7@XS{R2FCNAE{-7{$Io81_XtgtIR5dx
zsF&uU6&^gjD&o_#3JW|Jx=y-NDkPPa!R^wKww<kAAgZW9d%^}WbyJUB&H>Syr3a&;
z-l?7udRHs8>yCZVp6_#(&D%WZ`}aNj-&f9mZu@+XW&7gGypz}MTHt=t+&V7mYwW5Q
zM$0u;U5|UaF2}RJ`gbYo!lcW}!E8_G7{6O6?saJ2&1>Iw^R?tI=G+;#+9~2%=@#1%
z9gE5*%xNO6qC1})m0vL<BRFaP`a?BAuelC6b*cGtBtF?-qn@)pq9)l!)NIyLKi8>8
zuBjf)+<howaY^tEpUiglvro%rxY#i(^hfs|l1|iOe$XSZ>$Q`k#2JQ!Xo*$RFFam8
z*QepTMLheIIR$3I50tpRKD17>Y2JG|f9WsoyAOrij2YHhylY;;9GA+%6TUm3yZDq>
zRq(CiYppNS3OyryId`Z(DK+W-`>l1R$hXtqrcCCVC))Mv)(z_%j_#8uQxms8E#r$2
z*J7J=IX0~2!;zIo{>a+5bZxl$L)PSbc^pUl9rLi+C1*^xujNebX3N>?WRSGDN+_h}
z%bn=`s~*>EExr3zpeORf&ax#__I$fha`@O%hd*=8Qm!mLGQYyhCHv3+=7`gOtsS?g
zKjJ@=zUtlKi_JQ~*j6oZjVMV;EJ?LWE=mPb3`Pcq7P^Lpx<+OphK5!~Mpgy}+6IO|
zGH4wyFeM>r$jwj5OsmALLHYAm6`%%5kPX54X(i=}MX3zs<>h*rdD+Fui3O>8`9<lo
T-`Pk36)||a`njxgN@xNArEE2b

literal 0
HcmV?d00001

diff --git a/project/index.php b/project/index.php
index f90a28b..265b452 100644
--- a/project/index.php
+++ b/project/index.php
@@ -6,11 +6,12 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 	<link rel="stylesheet" type="text/css" href="css/anim.css">
     <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
+    <link rel="stylesheet" href="path/to/font-awesome/css/font-awesome.min.css">
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
 	<title>hifive</title>
 </head>
 <body>
-	<?php include('navbar_imie.php'); ?>
+	<?php include('navbar.php'); ?>
 
 	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 </body>
diff --git a/project/navbar.php b/project/navbar.php
new file mode 100644
index 0000000..81c67d6
--- /dev/null
+++ b/project/navbar.php
@@ -0,0 +1,32 @@
+<section class="nav_imie">
+	<div class="container-fluid">
+		<div class="container">
+			<div class="row">
+				<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+					<ul>
+						<a><li class="item_nav_imie" >Accès Net-Yparéo</li></a>
+						<a><li class="item_nav_imie" >IMIE Drones & Data</li></a>
+						<a><li class="item_nav_imie" >IMIE Numérique</li></a>
+						<a><li class="item_nav_imie" ><img id="twi" src="assets/img/twitter.png"></li></a>
+						<a><li class="item_nav_imie" ><img id="fb" src="assets/img/facebook.png"></li></a>
+					</ul>
+				</div>			
+			</div>
+		</div>
+	</div>
+</section>
+<section class="nav_blog">
+    <div class="container-fluid">
+        <div class="container">
+            <div class="row">
+                <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+                    <ul>
+                        <a><li class="item_nav_blog_gauche" >Accès Net-Yparéo</li></a>
+                        <a><li class="item_nav_blog_droite"><img id="glass" src="assets/img/glass.png"></li></a>
+                        <a><li class="item_nav_blog_droite"><input id="search" type="text"></li></a>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/project/navbar_imie.php b/project/navbar_imie.php
deleted file mode 100644
index 9c6e587..0000000
--- a/project/navbar_imie.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<section class="nav_imie">
-	<div class="container-fluid">
-		<div class="container">
-			<div class="row">
-				<div class="col-xs-12 col-sm-12 col-md-10 col-lg-10">
-					<ul>
-						<a><li class="item_nav_imie" >Accès Net-Yparéo</li></a>
-						<a><li class="item_nav_imie" >IMIE Drones & Data</li></a>
-						<a><li class="item_nav_imie" >IMIE Numérique</li></a>
-						<a><li class="item_nav_imie" ><img src="assets/img/twitter.png" width="18" height="18"></li></a>
-						<a><li class="item_nav_imie" ><img src="assets/img/facebook.png" width="9" height="18"></li></a>
-					</ul>
-				</div>			
-			</div>
-		</div>
-	</div>
-</section>
\ No newline at end of file