Update to iD v1.9.3

openstreetmap · Apr 25, 2016 · d83954a · d83954a
1 parent f207664
commit d83954a
Show file tree

Hide file tree

Showing 54 changed files with 2,569 additions and 838 deletions.
diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
@@ -2174,7 +2174,7 @@ button:hover {
 button[disabled],
 button.disabled {
     background-color: rgba(255,255,255,.25);
-    color: rgba(0,0,0,.5);
+    color: rgba(0,0,0,.4);
     cursor: auto;
 }
 
@@ -3562,7 +3562,6 @@ div.full-screen > button:hover {
 
 /* Background / Map Data Settings */
 
-
 .map-data-control button {
     border-radius: 0;
 }
@@ -3576,16 +3575,8 @@ div.full-screen > button:hover {
     position: relative;
 }
 
-.nudge-container {
-    border: 1px solid #CCC;
-}
-
 .imagery-faq {
-  margin-bottom: 10px;
-}
-
-.background-control .adjustments button:last-child {
-    border: 0;
+    margin-bottom: 10px;
 }
 
 .map-data-control .hide-toggle,
@@ -3701,15 +3692,41 @@ div.full-screen > button:hover {
     border-left:  4px solid transparent;
 }
 
-.background-control .nudge-container button {
-    float: left;
-    display: block;
-    width:20%;
-    border-right: 1px solid #CCC;
-    position: relative;
+/* Adjust Alignment controls */
+
+.background-control .nudge-container {
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    padding: 10px;
 }
 
-.background-control .nudge::after {
+.nudge-container .nudge-instructions {
+    padding-bottom: 15px;
+}
+
+.nudge-container .nudge-outer-rect {
+    background-color: #eee;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    padding: 20px 0;
+    width: 70%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 0 auto;
+    margin-top: 20px;
+    cursor: move;
+}
+
+.nudge-container .nudge-inner-rect {
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    width: 65%;
+    min-height: 20px;
+}
+
+.nudge-container .nudge::after {
     content: '';
     display: block;
     position: absolute;
@@ -3719,13 +3736,61 @@ div.full-screen > button:hover {
     width: 0;
 }
 
-.background-control .nudge.left::after {
+.nudge-container input {
+    width: 100%;
+    height: 20px;
+    text-align: center;
+    border: 0;
+}
+
+.nudge-container input.error {
+    border: 1px solid #FF7878;
+    border-radius: 2px;
+    background: #ffb;
+}
+
+.nudge-container input:focus {
+    background-color: transparent;
+}
+
+.nudge-container button {
+    float: left;
+    display: block;
+    width: 20%;
+    position: relative;
+    background-color: transparent;
+}
+
+.nudge-container button.right {
+    top: -50px;
+    right: -85%;
+}
+
+.nudge-container button.left {
+    top: -50px;
+    right: 45%;
+}
+
+.nudge-container button.top {
+    left: 20%;
+    top: -104px;
+}
+
+.nudge-container button.bottom {
+    left: -20%;
+}
+
+.nudge-container button.nudge-reset {
+    right: -10px;
+}
+
+.background-control .nudge.right::after {
     border-top:  5px solid transparent;
     border-bottom:  5px solid transparent;
     border-left:  5px solid #222;
 }
 
-.background-control .nudge.right::after {
+.background-control .nudge.left::after {
     border-top:  5px solid transparent;
     border-bottom:  5px solid transparent;
     border-right:  5px solid #222;
@@ -3994,6 +4059,7 @@ div.full-screen > button:hover {
     z-index: 10;
 }
 
+.bbox,
 .map-in-map-bbox {
     fill: none;
     stroke: rgba(255, 255, 0, 0.75);
@@ -4238,7 +4304,8 @@ div.full-screen > button:hover {
     vertical-align: middle;
 }
 
-.save-section .buttons .action {
+.save-section .buttons .action,
+.save-section .buttons .secondary-action {
     display: inline-block;
     margin: 0 20px 0 0;
     text-align: center;