Tester maater aa presentere filtererng paa i dropdwon-menyen

diff --git a/src/components/navbar/navbar.html b/src/components/navbar/navbar.html
index ab8f70f99bb6fc8cb1e2442c6a7cb39b23455c75..38663503d91067b08f64fa53910a96d71ba48d04 100644 (file)
--- a/src/components/navbar/navbar.html
+++ b/src/components/navbar/navbar.html
@@ -1,6 +1,6 @@
 <div id="navdiv" class="navbar navbar-default navbar-fixed-top">
 
-    <mou-search></mou-search>
+    <mou-search (newsearch)="map.update($event)"></mou-search>
 
 </div>
 

diff --git a/src/components/search/search.html b/src/components/search/search.html
index 835c7891fdcd3bf7535da241aa7acbed596284e6..0c67195e8f1a7a06791d655ef362844011c794ff 100644 (file)
--- a/src/components/search/search.html
+++ b/src/components/search/search.html
@@ -10,13 +10,14 @@
                class="livesearch"
                name="livesearch"
                id="livesearch"
-
-               placeholder="Search"/>
+                value="lol"
+               placeholder="Search"
+                />
     <img class="loadingpic" [hidden]="!loading"
          src="https://www.brown.edu/sites/default/themes/pawtuxet/img/loader-larger.gif">
 
 
-    <div  class="divresult" [hidden]="!orgunits.length">
+    <div  class="divresult" id="divresult" [hidden]="!orgunits.length">
         <ul class="dropdown-menu result"  >
             <li *ng-for="#orgunit of orgunits" (click)="getMoreInfo(orgunit)">
                 <a href="#">{{orgunit.name}}<br/><span>{{orgunit.lastUpdated}}</span></a>
@@ -25,6 +26,7 @@
     </div>
 
 
+
 </div>
 
 <button type="button" class="knapp" data-toggle="collapse" data-target="#dropdown-menu">
@@ -49,6 +51,24 @@
     <li><a href="#">Something else here</a></li>
     <li role="separator" class="divider"></li>
     <li><a href="#">Separated link</a></li>
+    <li><div class="checkbox">
+        <label><input type="checkbox" value="">Option 1</label>
+    </div>
+        <div class="checkbox">
+            <label><input type="checkbox" value="">Option 2</label>
+        </div>
+        <div class="checkbox disabled">
+            <label><input type="checkbox" value="" disabled>Option 3</label>
+        </div></li>
+    <select>
+        <option value="volvo">Volvo</option>
+        <option value="saab">Saab</option>
+        <option value="opel">Opel</option>
+        <option value="audi">Audi</option>
+    </select>
+
+
 </ul>
 
 </div>
+

diff --git a/src/css/map.css b/src/css/map.css
index 5df79e757ee64b3706173220a02456fc8cf75397..abb45efbcef8986b37c1a24a4700b94bd0c22012 100644 (file)
--- a/src/css/map.css
+++ b/src/css/map.css
@@ -12,16 +12,17 @@ html, body {
     width: 100%;
 
 }
+
+
 /*
 .search div{
     position: relative;
 }*/
 
 .results > li > a{
-    margin-top: 20px;
-
+    margin-top: 10px;
     display: block;
-    padding: 3px 20px;
+    padding: 3px 5px;
     clear: both;
     font-weight: 400;
     line-height: 1.42857143;
@@ -39,7 +40,7 @@ html, body {
 
 .dropdown-menu{
     margin-top: -17px;
-    margin-left: 648px;
+    margin-left: 649px;
     background-color: white;
     border-radius: 0px;
 
@@ -60,9 +61,8 @@ html, body {
 
 #livesearch{
     box-shadow: 0 0 1px darkgrey;
-
     width: 500px;
-    padding: 15px 0 15px 20px;
+    padding: 5px 0 5px 20px;
     font-size: 16px;
     font-family: Montserrat, sans-serif;
     border-left: 1px solid darkgrey;
@@ -134,7 +134,7 @@ html, body {
 }
 
 .result{
-    width: 357px;
+    width: 500px;
     margin-left: 150px;
     display: block;
     position: absolute;
@@ -143,7 +143,7 @@ html, body {
     z-index: 1000;
     float: left;
     min-width: 160px;
-    padding: 5px 0;
+    padding: 1px 0;
     font-size: 14px;
     text-align: left;
     list-style: none;
@@ -166,7 +166,7 @@ html, body {
     float: none;
 }
 
-.img{
+.loadingpic{
     width: 50px;
     height: 50px;
 }
\ No newline at end of file