Endrer styling, map som body-background resten kommentert ut
authorRoza Moustafa <roza.92m@hotmail.com>
Thu, 3 Dec 2015 08:41:58 +0000 (09:41 +0100)
committerRoza Moustafa <roza.92m@hotmail.com>
Thu, 3 Dec 2015 08:41:58 +0000 (09:41 +0100)
src/components/app.html
src/components/navbar/navbar.css
src/components/navbar/navbar.html
src/components/search/search.html
src/css/map.css

index 1be1056..23b1d5c 100644 (file)
@@ -1,14 +1,14 @@
-<div class="container">
+<!--<div class="container">-->
     <mou-navbar (outevent)="map.update($event)"></mou-navbar>
 
-    <div class="row">
-        <div class="col-md-8">
+   <!-- <div class="row">
+        <div class="col-md-8">-->
             <mou-map (newactive)="sidebar.update($event)" #map></mou-map>
-        </div>
+       <!-- </div>
         <div class="col-md-4">
             <mou-sidebar #sidebar></mou-sidebar>
         </div>
     </div>
-</div>
+</div-->
 
 
index d29dea0..28cfd7a 100644 (file)
@@ -1,4 +1,4 @@
-#navdiv{
+/*#navdiv{
     background-color: white;
     height: 85px;
     margin-bottom: 0;
@@ -7,7 +7,7 @@
     border-bottom: 1px solid darkgrey;
     box-shadow: 0 0 100px darkgrey;
     border-left: 0 none;
-}
+}*/
 /*
 
 .dropdown-menu{
index 620df8e..db13d70 100644 (file)
@@ -1,8 +1,8 @@
-<div id="navdiv" class="navbar navbar-default navbar-fixed-top">
+<!--<div id="navdiv" class="navbar navbar-default navbar-fixed-top">
 
     <mou-search (newsearch)="inevent($event)"></mou-search>
 
-</div>
+</div>-->
 
 
 
index 9fab940..56b6e1c 100644 (file)
@@ -1,8 +1,8 @@
-<div id="search">
-<form>
+<!--<div id="search">
+
     <label class="sr-only" for="livesearch">Search</label>
 
-        <input
+      <form> <input
                 mou-live-search
                (results)="orgunits = $event"
                (loading)="loading = $event"
@@ -14,9 +14,8 @@
                placeholder="Search"
                 value = "" />
 
-    <button class="emptysearch"(click)="hideDiv()">
-        &cross; </button>
-</form>
+ <button class="emptysearch"(click)="hideDiv()">
+        &cross; </button></form>
 
 <span [hidden]="hideDiv()">
 
 </span>
 
 
-</div>
+    <button type="button" class="knapp" (click)="toggle()" onclick="$('#ownershipSelector, #typeSelector, #locationSelector').prop('selectedIndex',0);" data-toggle="collapse" data-target="#dropdown-menu">
+        {{ visible ? '&xdtri;' : '&cross;' }}
+    </button>
+
+
 
+    <ul id="dropdown-menu" class="dropdown-menu">
+        <li>Facility</li>
+        <li class="dropdown-header">Ownerships</li>
+        <li><select class="form-control filtervalg" id="ownershipSelector" (click)="setFilter()">
+            <option value=""> All </option>
+            <option [value]="Mission">Mission</option>
+            <option value="NGO">NGO</option>
+            <option value="Private Clinic">Private Clinic</option>
+            <option value="Public facilities">Public facilities</option>
+        </select></li>
+        <li class="dropdown-header">Types</li>
+        <li><select class="form-control filtervalg" id="typeSelector" (click)="setFilter()">
+            <option value=""> All </option>
+            <option value="CHC">CHC</option>
+            <option value="CHP">CHP</option>
+            <option value="Clinic">Clinic</option>
+            <option value="Hospital">Hospital</option>
+            <option value="MCHP">MCHP</option>
+        </select></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Locations </li>
+        <li><select class="form-control filtervalg" id="locationSelector" (click)="setFilter()">
+            <option value=""> All </option>
+            <option value="Rural">Rural</option>
+            <option value="Urban">Urban</option>
+        </select></li>
 
-<button type="button" class="knapp" (click)="toggle()" onclick="$('#ownershipSelector, #typeSelector, #locationSelector').prop('selectedIndex',0);" data-toggle="collapse" data-target="#dropdown-menu">
-            {{ visible ? '&xdtri;' : '&cross;' }}
-</button>
-
-
-<div>
-<ul id="dropdown-menu" class="dropdown-menu">
-    <li>Facility</li>
-    <li class="dropdown-header">Ownerships</li>
-    <li><select class="form-control filtervalg" id="ownershipSelector" (click)="setFilter()">
-        <option value=""> All </option>
-        <option [value]="Mission">Mission</option>
-        <option value="NGO">NGO</option>
-        <option value="Private Clinic">Private Clinic</option>
-        <option value="Public facilities">Public facilities</option>
-    </select></li>
-    <li class="dropdown-header">Types</li>
-    <li><select class="form-control filtervalg" id="typeSelector" (click)="setFilter()">
-        <option value=""> All </option>
-        <option value="CHC">CHC</option>
-        <option value="CHP">CHP</option>
-        <option value="Clinic">Clinic</option>
-        <option value="Hospital">Hospital</option>
-        <option value="MCHP">MCHP</option>
-    </select></li>
-    <li role="separator" class="divider"></li>
-    <li class="dropdown-header">Locations </li>
-    <li><select class="form-control filtervalg" id="locationSelector" (click)="setFilter()">
-        <option value=""> All </option>
-        <option value="Rural">Rural</option>
-        <option value="Urban">Urban</option>
-    </select></li>
-
-</ul>
+    </ul>
 
 </div>
+-->
+
+
+
+
index 4219213..e0e5a48 100644 (file)
@@ -1,16 +1,17 @@
+* {
+    margin: 0;
+}
+
 html, body {
     height: 100%;
-    padding-top: 70px;
-    background-color: #e2e2e2;
-    margin: 0;
+
 }
 
 #map {
-    padding: 20px;
-    height: 750px;
-    margin: 0 auto;
-    width: 100%;
-
+    min-height: 100% !important;
+    height: auto !important;
+    height: 100%;
+    margin: 0 auto -20px;
 }
 
 
@@ -18,7 +19,7 @@ html, body {
 .search div{
     position: relative;
 }*/
-
+/*
 .results > li > a{
     margin-top: 10px;
     display: block;
@@ -56,9 +57,12 @@ html, body {
 }
 
 #search {
-    width: 357px;
+    width: 500px;
+    height: 120px;
     margin: 15px;
     margin-left: 150px;
+    background-color: red;
+    position: relative;
 }
 
 
@@ -121,15 +125,12 @@ html, body {
     border-left: 0 none;
     background: #BAB8B8;
     width: 60px;
-    position: fixed;
     padding: 0;
     margin: 0;
     text-align: center;
     height: 52px;
     cursor: pointer;
     float: left;
-    position: -webkit-sticky;
-    position: sticky;
 }
 
 .glyphicon-menu-down{
@@ -154,12 +155,9 @@ html, body {
     -webkit-background-clip: padding-box;
     background-clip: padding-box;
     border: 1px solid #ccc;
-    border: 1px solid rgba(0, 0, 0, .15);
     border-radius: 4px;
     -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
     box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-    border-radius: 0px;
-
 }
 
 .result li{
@@ -193,21 +191,23 @@ html, body {
     border-radius: 60px;
     background-color: lightgrey;
     border: black;
-    margin-left: 520px;
+    position: relative;
 }
 
 .emptysearch:hover{
     background-color: white;
+    position: relative;
 
 }
 
 .emptysearch:after {
     display: block;
-    position: absolute;
     margin: auto;
     padding: 2px;
     cursor: pointer;
 }
 .livesearch:not(:valid) ~ .close-icon {
      display: none;
- }
\ No newline at end of file
+ }
+
+*/