Merge pull request #3907 from Dimitar5555/patch-1

[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 2afb4d3ef5e84d4e1429c3c669751e0b472b2865..4dd59ebf309172f3a2b359f5c70cda382c8ba847 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -670,12 +670,14 @@
 .ideditor path.stroke.tag-amenity-fountain,
 .ideditor path.stroke.tag-leisure-swimming_pool,
 .ideditor path.stroke.tag-natural-bay,
 .ideditor path.stroke.tag-amenity-fountain,
 .ideditor path.stroke.tag-leisure-swimming_pool,
 .ideditor path.stroke.tag-natural-bay,

+.ideditor path.stroke.tag-natural-strait,

 .ideditor path.stroke.tag-natural-water {
     stroke: rgb(119, 211, 222);
 }
 .ideditor path.fill.tag-amenity-fountain,
 .ideditor path.fill.tag-leisure-swimming_pool,
 .ideditor path.fill.tag-natural-bay,
 .ideditor path.stroke.tag-natural-water {
     stroke: rgb(119, 211, 222);
 }
 .ideditor path.fill.tag-amenity-fountain,
 .ideditor path.fill.tag-leisure-swimming_pool,
 .ideditor path.fill.tag-natural-bay,

+.ideditor path.fill.tag-natural-strait,

 .ideditor path.fill.tag-natural-water {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 .ideditor path.fill.tag-natural-water {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);


@@ -3458,13 +3460,13 @@
 .ideditor input[type="radio"] {
     width: 14px;
     height: 14px;
 .ideditor input[type="radio"] {
     width: 14px;
     height: 14px;

-    margin-right: 5px;
+    margin-right: 6px;

     cursor: pointer;
     vertical-align: middle;
 }
 .ideditor[dir='rtl'] input[type="checkbox"],
 .ideditor[dir='rtl'] input[type="radio"] {
     cursor: pointer;
     vertical-align: middle;
 }
 .ideditor[dir='rtl'] input[type="checkbox"],
 .ideditor[dir='rtl'] input[type="radio"] {

-    margin-left: 5px;
+    margin-left: 6px;

     margin-right: 0;
 }
 
     margin-right: 0;
 }
 


@@ -4963,7 +4965,11 @@
         border-color: #f1f1f1;
     }
 }
         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;
 }
     visibility: hidden;
     position: absolute;
 }


@@ -4978,10 +4984,10 @@
 }
 
 
 }
 
 

-/* Field - Access, Cycleway
+/* Field - Access, DirectionalCombo

 ------------------------------------------------------- */
 .ideditor .form-field-input-access,
 ------------------------------------------------------- */
 .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;
     -webkit-box-flex: 1;
         -ms-flex: 1 1 auto;
             flex: 1 1 auto;


@@ -5173,7 +5179,7 @@
 
 .ideditor .form-field-input-multicombo .input-wrap {
     border: 1px solid #ddd;
 
 .ideditor .form-field-input-multicombo .input-wrap {
     border: 1px solid #ddd;

-    width: 100px;
+    width: 180px;

 }
 .ideditor .form-field-input-multicombo input {
     border: none;
 }
 .ideditor .form-field-input-multicombo input {
     border: none;


@@ -5191,6 +5197,40 @@
     width: auto;
 }
 
     width: auto;
 }
 

+.ideditor .form-field-input-combo .tag-value-icon {
+    display: inline-block;
+    position: relative;
+    height: 24px;
+    width: 30px;
+    margin-right: -30px;
+    -ms-flex-item-align: center;
+        align-self: center;
+    vertical-align: middle;
+    z-index: 1;
+    padding-left: 11px;
+}
+.ideditor[dir='rtl'] .form-field-input-combo .tag-value-icon {
+    margin-right: 0;
+    margin-left: -30px;
+    padding-left: 0;
+    padding-right: 11px;
+}
+.ideditor .tag-value-icon .icon {
+    width: 21px;
+    height: 21px;
+    margin: auto;
+}
+.ideditor[dir='ltr'] .form-field-input-combo .tag-value-icon + input {
+    padding-left: 40px;
+}
+.ideditor[dir='rtl'] .form-field-input-combo .tag-value-icon + input {
+    padding-right: 40px;
+}
+.ideditor .combobox-option .tag-value-icon {
+    display: inline-block;
+    width: 28px;
+}
+

 
 /* Field - Text / Numeric
 ------------------------------------------------------- */
 
 /* Field - Text / Numeric
 ------------------------------------------------------- */


@@ -5269,7 +5309,6 @@
     -webkit-box-flex: 0;
         -ms-flex: 0 1 auto;
             flex: 0 1 auto;
     -webkit-box-flex: 0;
         -ms-flex: 0 1 auto;
             flex: 0 1 auto;

-    width: 20px;

     margin-top: 0;
 }
 .ideditor .form-field-input-check > span {
     margin-top: 0;
 }
 .ideditor .form-field-input-check > span {


@@ -5384,7 +5423,6 @@
     -webkit-box-flex: 0;
         -ms-flex: 0 1 auto;
             flex: 0 1 auto;
     -webkit-box-flex: 0;
         -ms-flex: 0 1 auto;
             flex: 0 1 auto;

-    width: 20px;

 }
 .ideditor .form-field-input-radio > label > span {
     -webkit-box-flex: 1;
 }
 .ideditor .form-field-input-radio > label > span {
     -webkit-box-flex: 1;


@@ -5824,6 +5862,42 @@
     color: #333;
 }
 
     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
 ------------------------------------------------------- */
 
 /* Field Help
 ------------------------------------------------------- */


@@ -8991,13 +9065,16 @@
     display: none;
 }
 
     display: none;
 }
 

-.ideditor .field-warning,

 .ideditor .changeset-info,
 .ideditor .request-review,
 .ideditor .commit-info {
     margin-bottom: 10px;
 }
 
 .ideditor .changeset-info,
 .ideditor .request-review,
 .ideditor .commit-info {
     margin-bottom: 10px;
 }
 

+.ideditor .field-warning {
+    margin-top: 10px;
+}
+

 .ideditor .request-review label {
     cursor: pointer;
 }
 .ideditor .request-review label {
     cursor: pointer;
 }