X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/44a0835487875777401342b16fee73da68589cf5..876d5614da5ddd30097bb39bf7191ece4448cc7f:/app/assets/stylesheets/common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index b7ba464c0..c5d0254b5 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -15,9 +15,15 @@ fieldset,img { border: 0; }
 
 legend { color: #000; }
 
-sup { vertical-align: text-top; }
+sup {
+  vertical-align: super;
+  font-size: smaller;
+}
 
-sub { vertical-align: text-bottom; }
+sub {
+  vertical-align: sub;
+  font-size: smaller;
+}
 
 table {
   border-collapse: collapse;
@@ -466,90 +472,6 @@ nav.secondary {
   margin-top: 50px;
 }
 
-/* Rules for bootstrap tooltips */
-
-.tooltip {
-  position: absolute;
-  display: none;
-  color: #333;
-  text-align: left;
-  font-size: 12px;
-  max-width: 250px;
-}
-
-.tooltip.in {
-  opacity: 0.8;
-  z-index: 1030;
-  height: auto;
-  display: block;
-}
-
-.tooltip.top {
-  margin-top: -10px;
-  text-align: center;
-}
-
-.tooltip.right {
-  margin-left: 10px;
-}
-
-.tooltip.bottom {
-  margin-top: 10px;
-  text-align: center;
-}
-
-.tooltip.left {
-  margin-left: -10px;
-  text-align: right;
-}
-
-.tooltip-inner {
-  display: inline-block;
-  padding: 10px;
-  font-weight: normal;
-  background-color: white;
-}
-
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.tooltip.top .tooltip-arrow {
-  bottom: -5px;
-  left: 50%;
-  margin-left: -5px;
-  border-top-color: white;
-  border-width: 5px 5px 0;
-}
-
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: -5px;
-  margin-top: -5px;
-  border-right-color: white;
-  border-width: 5px 5px 5px 0;
-}
-
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: -5px;
-  margin-top: -5px;
-  border-left-color: white;
-  border-width: 5px 0 5px 5px;
-}
-
-.tooltip.bottom .tooltip-arrow {
-  top: -5px;
-  left: 50%;
-  margin-left: -5px;
-  border-bottom-color: white;
-  border-width: 0 5px 5px;
-}
-
 /* Rules for Leaflet maps */
 
 .leaflet-control .control-button {
@@ -636,6 +558,12 @@ nav.secondary {
       float: right;
       cursor: pointer;
     }
+
+    p.error {
+      background-color: #ff7070;
+      padding: 10px;
+      font-weight: bold;
+    }
   }
 
   .welcome {
@@ -688,6 +616,10 @@ nav.secondary {
     &.query-disabled {
       cursor: not-allowed;
     }
+    
+    .leaflet-marker-draggable {
+      cursor: move;
+    }
   }
 
   #map-ui {
@@ -857,6 +789,10 @@ nav.secondary {
 
 #attribution {
   display: none;
+
+  table {
+    width: 100%
+  }
 }
 
 .attribution_license,
@@ -995,10 +931,23 @@ header .search_forms,
     float: right;
   }
 
+  div.header {
+    width: 100%;
+    height: 30px;
+  }
+
   div.line {
     width: 100%;
     margin: 0px 0px 5px 0px;
   }
+
+  div.loader_copy {
+    display: none;
+
+    img {
+      vertical-align: middle;
+    }
+  }
 }
 
 /* Rules for the map key which appears in the popout sidebar */
@@ -1035,6 +984,7 @@ header .search_forms,
 
 .search_results_error {
   color: #f00;
+  padding: 10px 20px;
 }
 
 /* Rules for routing */
@@ -1076,7 +1026,7 @@ tr.turn:hover {
     background: $list-highlight;
 }
 .routing_engines, #route_from, #route_to { margin-left: 25px; }
-.routing_marker { width: 15px; position: absolute; }
+.routing_marker { width: 15px; position: absolute; cursor: move; }
 
 /* Rules for entity history */
 
@@ -1681,11 +1631,11 @@ tr.turn:hover {
 
 /* Rules for the log in page */
 
-#login_openid_buttons {
+#login_auth_buttons {
   margin-bottom: 0;
 }
 
-#login_openid_buttons li {
+#login_auth_buttons li {
   float: left;
   padding: $lineheight/4 $lineheight/2;
 }
@@ -1844,19 +1794,26 @@ tr.turn:hover {
 
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
-.error {
+.flash {
   padding: $lineheight;
-  background-color: #ff7070;
-}
 
-.warning {
-  padding: $lineheight;
-  background-color: #ffe0cc;
-}
+  &.error {
+    background-color: #ff7070;
+  }
 
-.notice {
-  padding: $lineheight;
-  background-color: #CBEEA7;
+  &.warning {
+    background-color: #ffe0cc;
+  }
+
+  &.notice {
+    background-color: #CBEEA7;
+  }
+
+  div.message {
+    display: inline-block;
+    margin-left: $lineheight / 2;
+    vertical-align: middle;
+  }
 }
 
 /* Rules for highlighting fields with rails validation errors */
@@ -1973,6 +1930,7 @@ input[type="email"],
 input[type="url"],
 input[type="password"],
 textarea {
+  color: #222;
   background-color: #fff;
   border: 1px solid #ccc;
   padding: 2px 5px;
@@ -2708,6 +2666,43 @@ input.richtext_title[type="text"] {
     &.open         { background-position: 0px  -80px; }
     &.partners     { background-position: 0px -120px; }
     &.infringement { background-position: 0px -160px; }
+    &.legal        { background-position: -45px -160px; }
+  }
+}
+
+#sidebar #donate {
+  background-color: rgb(89, 89, 89);
+  padding: 10px 5px;
+  min-height: 120px;
+
+  .sprite {
+    background: transparent image-url('donate-sprite@2x.png') no-repeat scroll 0 0 / 120px 100px;
+  }
+
+  .sprite.logo {
+    float: left;
+    background-position: 0 0;
+    height: 100px;
+    width: 100px;
+  }
+
+  h2 {
+    margin-left: 100px;
+    padding: 7px 10px 6px 10px;
+  }
+
+  p {
+    margin-left: 100px;
+    padding: 2px 10px 3px 10px;
+  }
+
+  a {
+    color: $offwhite;
+  }
+
+  :hover {
+    text-decoration: none;
+    color: #b7b7bf;
   }
 }