Merge branch 'master' of git.uio.no:u/erikhf/frm

[u/erikhf/frm.git] / src / css / map.css

diff --git a/src/css/map.css b/src/css/map.css
index d011d85eb6b04afc0d1c5521ed6b3ff4b9fac8d4..9d1f0deec16e8515762310a6de3ac4b15f0824d2 100644 (file)
--- a/src/css/map.css
+++ b/src/css/map.css
@@ -28,7 +28,7 @@ html, body {
     max-width: 100%;
 }
 
-/* search input*/
+/* search bar and filter button */
 
 #livesearch{
     box-shadow: 8px 8px 8px rgba(0, 0, 0, 0.3);
@@ -63,7 +63,7 @@ html, body {
     background: white;
 }
 
-.knapp
+.filterbutton
 {
     border-radius: 0px 2px 2px 0px; /* top left, top right, bottom right, bottom left */
     box-shadow: 8px 8px 8px rgba(0, 0, 0, 0.3);
@@ -81,12 +81,16 @@ html, body {
     float: left;
 }
 
-.knapp:focus {
+.filterbutton:focus {
     outline:0;
 }
 
 /* search results */
 
+.nomatch{
+    margin-left: 20px;
+    font-size: 16px;
+}
 
 .divresult{
     padding:0;
@@ -151,6 +155,10 @@ html, body {
     background-color: #f5f5f5
 }
 
+.result > li:last-child {
+    border: none;
+}
+
 .emptyresult{
     float: right;
     border: 0;
@@ -168,7 +176,7 @@ html, body {
     margin: 0;
 
 }
-.meny{
+.filtermenu{
     border: none;
     border-top: 2px solid darkgrey;
     box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.3);
@@ -182,13 +190,13 @@ html, body {
     margin-left: 2px;
 }
 
-.meny li{
+.filtermenu li{
     background-color: white;
     padding-left: 20px;
     padding-right: 20px;
 }
 
-.filtervalg{
+.filteroption{
     box-shadow: 0 0 1px darkgrey;
     margin-top: 5px;
     margin-bottom: 5px;
@@ -204,7 +212,7 @@ html, body {
     transition: all 0.15s;
 }
 
-.filtervalg:focus{
+.filteroption:focus{
     outline: 0;
 }
 .bootstrap-select .btn:focus {
@@ -219,10 +227,6 @@ html, body {
     color: white;
 }
 
-.nomatch{
-    margin-left: 20px;
-}
-
 /* sidebar */
 
 .ng-valid.ng-dirty {
@@ -332,3 +336,18 @@ label{
     margin: 0 !important;
 }
 
+.glyphicon{
+    font-size: 16px;
+    color: darkgrey;
+}
+.glyinfo{
+    font-size: 18px;
+    color: #DFC2C8;
+}
+
+.glyresult{
+    font-size: 14px;
+}
+
+
+