Make search input a direct child of input group

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 26ec9cb97f1a5d0a4c8346f3b9c82e92465240a3..1d40564519e453cbd29af6d00b1384b4b645d478 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -23,7 +23,7 @@ small, aside {
 
 .small_icon {
   vertical-align: middle;
 
 .small_icon {
   vertical-align: middle;

-  margin-right: $lineheight/4;
+  margin-right: $lineheight * 0.25;

 }
 
 [dir=rtl] { /* no-r2 */ text-align: right; }
 }
 
 [dir=rtl] { /* no-r2 */ text-align: right; }


@@ -102,7 +102,7 @@ header {
 
   > * {
     height: 100%;
 
   > * {
     height: 100%;

-    padding: $lineheight/2;
+    padding: $lineheight * 0.5;

   }
 
   h1, nav.primary {
   }
 
   h1, nav.primary {


@@ -804,15 +804,6 @@ tr.turn:hover {
     }
   }
 
     }
   }
 

-  .note-comments li, .changeset-comments li {
-    margin: $lineheight/2 0;
-
-    p {
-      margin: 10px 6px 0 6px;
-      line-height: 1.5;
-    }
-  }
-

   .subscribe-buttons input {
     font-size: 90%;
     line-height: 15px;
   .subscribe-buttons input {
     font-size: 90%;
     line-height: 15px;


@@ -886,10 +877,6 @@ tr.turn:hover {
     }
     #minlat { margin-bottom: -1px; }
   }
     }
     #minlat { margin-bottom: -1px; }
   }

-
-  .export_bound {
-    margin: $lineheight/4;
-  }

 }
 
 /* Rules for edit pages */
 }
 
 /* Rules for edit pages */


@@ -1068,11 +1055,12 @@ tr.turn:hover {
 .search_form {
   background-color: $lightgrey;
 
 .search_form {
   background-color: $lightgrey;
 

+  #query {
+    z-index: 0;
+  }
+

   .describe_location {
   .describe_location {

-    top: 6px;
-    right: 6px;

     font-size: 10px;
     font-size: 10px;

-    color: $blue;

   }
 }
 
   }
 }