Merge remote-tracking branch 'upstream/pull/4717'

tomhughes · Apr 24, 2024 · 02c60f7 · 02c60f7
2 parents e30385e + 7171dcd
commit 02c60f7
Show file tree

Hide file tree

Showing 66 changed files with 603 additions and 621 deletions.
diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
@@ -2861,8 +2861,12 @@
     align-items: center;
 }
 
+.ideditor .mapillary-attribution-image-container {
+  height: auto;
+}
+
 .ideditor .mly-wrapper .mapillary-attribution-container .mapillary-attribution-username {
-    display: none;
+    padding: 0px 8px 0 6px;
 }
 
 .ideditor .mly-wrapper .mapillary-attribution-container .mapillary-attribution-date {
@@ -3895,6 +3899,12 @@
     vertical-align: baseline;
 }
 
+.ideditor button.loading .icon {
+    background-image: url(<%= asset_path("iD/img/mini-loader.gif") %>);
+    background-position: 0 0;
+    background-size: auto;
+}
+
 
 /* Toolbar / Persistent UI Elements
 ------------------------------------------------------- */
@@ -5445,6 +5455,7 @@
 .ideditor .form-field-input-roadheight input.roadheight-secondary-number,
 .ideditor .form-field-input-roadspeed input.roadspeed-number {
     flex-basis: 0;
+    width: 0;
 }
 .ideditor .form-field-input-roadheight input.roadheight-unit,
 .ideditor .form-field-input-roadheight input.roadheight-secondary-unit {