Merge remote-tracking branch 'openstreetmap/pull/1445'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index e8c480f56b6e6cf416a4f9118cb7ec5d82a675e8..bb0e6f0d44d728b64d5d67cc4d9414d55e3d90aa 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -491,7 +491,8 @@ body.compact {
     background-color: black;
   }
 
-  &.disabled {
+  &.disabled,
+  &.leaflet-disabled {
     background-color: #333;
     background-color: rgba(0,0,0,.5);
     cursor: default;
@@ -582,6 +583,7 @@ body.compact {
 
     .icon.close {
       float: right;
+      cursor: pointer;
     }
 
     p.error {
@@ -724,7 +726,7 @@ body.compact {
         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);
-        z-index: 2; // For IE9
+        z-index: 1000;
         input[type="radio"] {
           display: none;
         }
@@ -1180,6 +1182,7 @@ tr.turn:hover {
       width: 50%;
       padding: 6px 10px;
       word-wrap: break-word;
+      white-space: pre-wrap;
     }
 
     .browse-tag-k {
@@ -1679,6 +1682,13 @@ tr.turn:hover {
   float: left;
 }
 
+
+.diary-subscribe-buttons {
+  position:relative;
+  top: -30px;
+  left: 130px;
+}
+
 /* Rules for the log in page */
 
 #login_auth_buttons {