Merge remote-tracking branch 'osmlab/id-editor-embed'

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

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index bab4c95606e7695b7f051166102e054ec7164f02..49a784704ea0d64b2fb5b493361b8b0beb4cf811 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -529,19 +529,21 @@ table {
 
 /* Rules for Leaflet maps */
 
-#permalink {
-  z-index: 10000;
-  position: absolute;
-  bottom: 0px;
-  right: 0px;
-  padding: 5px;
-  background:#fff;
-}
+.leaflet-control-attribution {
+  a.disabled {
+    color: #99c9dc;
+    cursor: default;
+    text-decoration: none;
+  }
 
-.leaflet-control-attribution a.disabled {
-  color: #99c9dc;
-  cursor: default;
-  text-decoration: none;
+  ul.secondary-actions {
+    float: left;
+    margin-right: 5px;
+
+    &:only-child {
+      margin-right: 0px;
+    }
+  }
 }
 
 .site-index .leaflet-top,
@@ -690,7 +692,12 @@ table {
 }
 
 .search_results_entry {
-  margin-bottom: 0 ;
+  margin-bottom: 0;
+
+  .search_details {
+    display: block;
+    text-align: right;
+  }
 }
 
 .search_results_entry .search_searching {
@@ -945,14 +952,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     margin: 0px;
     padding: 4px 6px;
   }
-  div {
-    clear: left;
-  }
   h4, p {
     margin-bottom: 5px;
   }
-  p, ul, .bbox {
-    margin-left: 33.3333%;
+  p, ul, .bbox, .geo {
+    display: inline-block;
+    vertical-align: top;
+    max-width: 65%;
   }
   ul p {
     margin-left: 0;
@@ -960,7 +966,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h4 {
     width: 33.3333%;
-    float: left;
+    display: inline-block;
+    vertical-align: top;
   }
 }
 
@@ -1724,6 +1731,10 @@ a.button.submit {
 
 /* Rules for the notes interface */
 
+.note {
+  padding-top: 10px;
+}
+
 .note {
   h2 {
     margin-bottom: 10px;
@@ -1734,7 +1745,21 @@ a.button.submit {
   }
 
   .permalink {
-    margin: -10px 0 10px -12px;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    min-width: 15px;
+    min-height: 15px;
+    background: image-url("sprite.png") 0 -45px no-repeat;
+  }
+
+  .permalink span {
+    display: none;
+    padding-left: 20px;
+  }
+
+  .permalink:hover span {
+    display: block;
   }
 
   .warning {
@@ -1756,6 +1781,7 @@ a.button.submit {
 
   .comment {
     width: 100%;
+    height: 100px;
   }
 
   .buttons {
@@ -1763,3 +1789,11 @@ a.button.submit {
     text-align: right;
   }
 }
+
+/*
+ * Rules for the iD editor
+ */
+.id-embed {
+  width: 100%;
+  height: 100%;
+}