Correction de font-size et décalage du logo

blog/static/blog/css/base.css

@@ -2,7 +2,7 @@
 * @Author: klmp200
 * @Date:   2016-07-06 15:42:59
 * @Last Modified by:   klmp200
-* @Last Modified time: 2016-10-02 20:51:56
+* @Last Modified time: 2016-10-02 22:39:03
 */
 
 @import 'https://fonts.googleapis.com/css?family=Raleway';
@@ -101,6 +101,8 @@ hr {
 }
 
 #logo-mini {
+	margin-left: 20px;
+	margin-top: 20px;
 }
 
 #logo-mobile {

blog/static/blog/css/nav.css

@@ -2,11 +2,7 @@
 * @Author: klmp200
 * @Date:   2016-07-10 16:06:30
 * @Last Modified by:   klmp200
-<<<<<<< HEAD
-* @Last Modified time: 2016-10-02 21:26:21
-=======
-* @Last Modified time: 2016-10-02 18:22:12
->>>>>>> 341e7a94e5a4e2db16db4201f1603b9c9425c705
+* @Last Modified time: 2016-10-02 22:38:01
 */
 
 #navbar {
@@ -14,7 +10,7 @@
   font-size: 20px;
 }
 #navbar li {
-	font-size: 1.25vw;
+	font-size: 1.6rem;
 }
 .navbar-nav li a {
  line-height: 35px;
@@ -74,6 +70,18 @@
   color: #0a0c12;
 }
 
+// @media ((min-width: 567px) and (max-width: 767px)){
+// 	#navbar li {
+// 		font-size: 1vw;
+// 	}
+// }
+
+// @media (max-width: 567px){
+// 	#navbar li {
+// 		font-size: 3880px;
+// 	}
+// }
+
 @media (max-width: 767px) {
   .navbar-default .navbar-nav .open .dropdown-menu > li > a {
     color: #ffffff;
@@ -88,11 +96,9 @@
     color: #0a0c12;
     background-color: #ffffff;
   }
-	#navbar li {
-		font-size: 1vw;
-	}
 }
 
+
 .navbar-default {
 	padding-top: 10px;
 	padding-bottom: 10px;