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

[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 5bf91da9dc49439f8344662680d4d4b373a31f37..4dd59ebf309172f3a2b359f5c70cda382c8ba847 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -4965,7 +4965,11 @@
         border-color: #f1f1f1;
     }
 }
-.ideditor .form-field-button.colour-selector {
+.ideditor input.colour-selector {
+    visibility: hidden;
+    position: absolute;
+}
+.ideditor input.date-selector {
     visibility: hidden;
     position: absolute;
 }
@@ -4980,10 +4984,10 @@
 }
 
 
-/* Field - Access, Cycleway
+/* Field - Access, DirectionalCombo
 ------------------------------------------------------- */
 .ideditor .form-field-input-access,
-.ideditor .form-field-input-cycleway {
+.ideditor .form-field-input-directionalcombo {
     -webkit-box-flex: 1;
         -ms-flex: 1 1 auto;
             flex: 1 1 auto;
@@ -5175,7 +5179,7 @@
 
 .ideditor .form-field-input-multicombo .input-wrap {
     border: 1px solid #ddd;
-    width: 100px;
+    width: 180px;
 }
 .ideditor .form-field-input-multicombo input {
     border: none;
@@ -5212,19 +5216,19 @@
     padding-right: 11px;
 }
 .ideditor .tag-value-icon .icon {
-    width: 11px;
-    height: 17px;
+    width: 21px;
+    height: 21px;
     margin: auto;
 }
 .ideditor[dir='ltr'] .form-field-input-combo .tag-value-icon + input {
-    padding-left: 30px;
+    padding-left: 40px;
 }
 .ideditor[dir='rtl'] .form-field-input-combo .tag-value-icon + input {
-    padding-right: 30px;
+    padding-right: 40px;
 }
 .ideditor .combobox-option .tag-value-icon {
     display: inline-block;
-    width: 18px;
+    width: 28px;
 }
 
 
@@ -5858,6 +5862,42 @@
     color: #333;
 }
 
+.ideditor .form-field-input-wrap {
+    position: relative;
+}
+
+.ideditor .form-field-input-wrap span.length-indicator-wrap {
+    visibility: hidden;
+    position: absolute;
+    top: -5px;
+    left: 0;
+    right: 0;
+}
+
+.ideditor .form-field-input-wrap input:focus + span.length-indicator-wrap,
+.ideditor .form-field-input-wrap textarea:focus + span.length-indicator-wrap,
+.ideditor .form-field-input-wrap input:focus + div.combobox-caret + span.length-indicator-wrap,
+.ideditor .form-field-input-wrap textarea:focus + div.combobox-caret + span.length-indicator-wrap {
+    visibility: visible;
+}
+
+.ideditor .form-field-input-wrap span.length-indicator {
+    display: block;
+    left: 0;
+    right: 0;
+    height: 4px;
+    background-color: #7092ff;
+    border-right-style: solid;
+    border-right-color: lightgray;
+}
+
+.ideditor .form-field-input-wrap span.length-indicator.limit-reached {
+    border-right-color: red;
+}
+
+.ideditor .tooltip.max-length-warning {
+    z-index: 10;
+}
 
 /* Field Help
 ------------------------------------------------------- */
@@ -9025,13 +9065,16 @@
     display: none;
 }
 
-.ideditor .field-warning,
 .ideditor .changeset-info,
 .ideditor .request-review,
 .ideditor .commit-info {
     margin-bottom: 10px;
 }
 
+.ideditor .field-warning {
+    margin-top: 10px;
+}
+
 .ideditor .request-review label {
     cursor: pointer;
 }