Merge remote-tracking branch 'origin/master' into routing

[rails.git] / vendor / assets / iD / iD.css.erb

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 0f7ec70f17aa49c10c30ac38dc00b7b81ea730f6..1e63410fa42fcbe2b521b052afe7ddf0380f1abf 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -1585,7 +1585,7 @@ button {
     display: inline-block;
     height:40px;
     border-radius:4px;
-    /* Crashes Safari: https://github.com/systemed/iD/issues/1188 */
+    /* Crashes Safari: https://github.com/openstreetmap/iD/issues/1188 */
     /*-webkit-transition: all 100ms;*/
        -moz-transition: all 100ms;
          -o-transition: all 100ms;
@@ -2732,14 +2732,13 @@ input[type=number] {
 
 .form-field .addr-number {
     width: 33.3333%;
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 0;
+    border: 0;
     border-radius: 0;
 }
 
 .form-field .addr-street {
     width: 66.6666%;
+    border-top: 0;
     border-right: 0;
     border-bottom: 0;
     border-radius: 0;
@@ -3659,7 +3658,6 @@ img.wiki-image {
 }
 
 .mode-save .changeset-list {
-    overflow: auto;
     border:1px solid #ccc;
     border-radius: 4px;
     background:#fff;
@@ -3904,30 +3902,39 @@ img.wiki-image {
 
 /* make tooltips in panels dark */
 .map-overlay .tooltip.top .tooltip-arrow,
-.entity-editor-pane .tooltip.top .tooltip-arrow {
+.entity-editor-pane .tooltip.top .tooltip-arrow,
+.warning-section .tooltip.top .tooltip-arrow {
     border-top-color: #000;
 }
 
 .map-overlay .tooltip.bottom .tooltip-arrow,
-.entity-editor-pane .tooltip.bottom .tooltip-arrow {
+.entity-editor-pane .tooltip.bottom .tooltip-arrow,
+.warning-section .tooltip.bottom .tooltip-arrow {
     border-bottom-color: #000;
 }
 
 .map-overlay .tooltip.left .tooltip-arrow,
-.entity-editor-pane .tooltip.left .tooltip-arrow {
+.entity-editor-pane .tooltip.left .tooltip-arrow,
+.warning-section .tooltip.left .tooltip-arrow {
     border-left-color: #000;
 }
 
 .map-overlay .tooltip.right .tooltip-arrow,
-.entity-editor-pane .tooltip.right .tooltip-arrow {
+.entity-editor-pane .tooltip.right .tooltip-arrow,
+.warning-section .tooltip.right .tooltip-arrow {
     border-right-color: #000;
 }
 
 .map-overlay .tooltip-inner,
-.entity-editor-pane .tooltip-inner {
+.entity-editor-pane .tooltip-inner,
+.warning-section .tooltip-inner {
     background: #000;
     color: #ccc;
 }
+/* commit warning tooltips need to be closer */
+.warning-section .tooltip.top {
+    margin-top: -5px;
+}
 
 /* Uncramp map-control tooltips */
 .map-control .tooltip {