From c4e753e27db10cc541af26788010f88f738e82b3 Mon Sep 17 00:00:00 2001
From: terehm <terehm@usi.ch>
Date: Wed, 7 Nov 2018 14:27:31 +0000
Subject: [PATCH] css-team: move search bar to the left of the nav menu

git-svn-id: svn+ssh://atelier.inf.usi.ch/home/bevilj/group-1@51 a672b425-5310-4d7a-af5c-997e18724b81
---
 site/_includes/header.html | 3 +--
 site/_sass/_header.scss    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/site/_includes/header.html b/site/_includes/header.html
index dcd27db..e5eb70f 100644
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -3,6 +3,7 @@
     <a href="/index.html"><img src="/assets/style/logo_white.png" height="50"></a>
   </div>
   <div class="fill-space"></div>
+  <div class="search-box"><input type="text" id="search-bar"><label for="search-bar"><img src="/assets/style/search_icon.png"></label></div>
   <nav class="nav-menu">
     <div>Learn
       <ul>
@@ -22,7 +23,5 @@
       </ul>
     </div>
   </nav>
-  <!-- TODO: talk about positioning of menu and search box -->
-  <div class="search-box"><label for="search-bar"><img src="/assets/style/search_icon.png"></label><input type="text" id="search-bar"></div>
 </div>
 
diff --git a/site/_sass/_header.scss b/site/_sass/_header.scss
index fb13c40..ea592ec 100644
--- a/site/_sass/_header.scss
+++ b/site/_sass/_header.scss
@@ -16,7 +16,7 @@
 }
 
 .nav-menu {
-  margin-right: 10px;
+  margin-right: 100px;
   margin-left: 10px;
   display: inline-table;