Update iD, set locale

[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 168f28b42335b8f546bb6d7645268e85d2ec6c83..12773334b6f633ba28ee36615e44322e2f736bfa 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -361,6 +361,23 @@ path.fill.tag-natural-water {
     fill: #77d3de;
 }
 
+path.stroke.tag-amenity-school {
+    stroke: #ffff94;
+    stroke-width: 1;
+}
+path.fill.tag-amenity-school {
+    fill: #ffff94;
+    fill-opacity: 0.2;
+}
+
+path.stroke.tag-amenity-university {
+    stroke: #ffff94;
+}
+path.fill.tag-amenity-university {
+    fill: #ffff94;
+    fill-opacity: 0.1;
+}
+
 path.stroke.tag-building {
     stroke: #e06e5f;
     stroke-width: 1;
@@ -376,6 +393,7 @@ path.stroke.tag-landuse,
 path.stroke.tag-natural-wood,
 path.stroke.tag-natural-tree,
 path.stroke.tag-natural-grassland,
+path.stroke.tag-leisure-pitch,
 path.stroke.tag-leisure-park {
     stroke: #8cd05f;
     stroke-width: 1;
@@ -426,6 +444,7 @@ path.fill.tag-natural-wood,
 path.fill.tag-natural-tree,
 path.fill.tag-natural-grassland,
 path.fill.tag-natural-grass,
+path.fill.tag-leisure-pitch,
 path.fill.tag-leisure-park {
     fill: #8cd05f;
     fill-opacity: 0.2;
@@ -1905,13 +1924,13 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 .preset-grid  {
     width:100%;
-    padding: 20px 10px 10px 20px;
+    padding: 20px 20px 10px 20px;
     border-bottom: 1px solid #ccc;
 }
 
 .grid-button-wrap {
-    padding: 0 10px 10px 0;
-    height: 120px;
+    padding-bottom: 10px;
+    height: 70px;
 }
 
 .grid-entry {
@@ -1919,7 +1938,6 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     height: 100%;
     position: relative;
     border: 1px solid #ccc;
-    overflow: hidden;
     float: left;
 }
 
@@ -1933,16 +1951,14 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 .preset-icon {
     position: absolute;
-    top: 30px;
-    left: 0;
-    right: 0;
+    top: 17px;
+    left: 17px;
     margin: auto;
 }
 
 .preset-icon-line {
-    top: 15px;
-    left: -10px;
-    right: -10px;
+    top: 0;
+    left: 0;
 }
 
 .grid-entry .label {
@@ -1950,23 +1966,28 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     text-align: left;
     position: absolute;
     padding: 5px 10px;
-    height: 30px;
+    height: 100%;
     bottom: 0;
-    left: 0; right: 0;
+    left: 60px;
+    right: 0;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
-    border-top: 1px solid rgba(0, 0, 0, .1);
+    border-left: 1px solid rgba(0, 0, 0, .1);
+    line-height: 50px;
     }
 
+.grid-entry:hover .label {
+    background: none;
+}
+
 .grid-button-wrap button.tag-reference-button {
     float: right;
     position: static;
-    margin-top: -30px;
-    margin-right: 1px;
-    height: 29px;
-    border-left: 1px solid #CCC;
-    border-radius: 0 0 3px 0;
+    margin-top: -60px;
+    height: 100%;
+    border: 1px solid #CCC;
+    border-radius: 0 3px 3px 0;
 }
 
 .current .grid-entry,
@@ -1978,15 +1999,16 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 .category .grid-entry:before {
     content: "";
     position: absolute;
-    top: 7px;
-    left: 0; right: 0;
-    border-top: 1px solid #ccc;
-    border-radius: 6px;
+    top: -5px;
+    left: -1px; right: -1px;
+    border: 1px solid #ccc;
+    border-bottom: none;
+    border-radius: 6px 6px 0 0;
     height: 6px;
 }
 
 .category .grid-entry:before {
-    top: 3px;
+    top: -3px;
 }
 
 .preset-grid-search-wrap .icon {
@@ -2012,16 +2034,8 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     margin: 5px;
 }
 
-.subgrid {
-    width: 100%;
-    width: -webkit-calc(100% + 10px);
-    width: calc(100% + 10px);
-    margin-left: -10px;
-    overflow: hidden;
-}
-
 .subgrid .preset-grid {
-    padding: 10px 0 0 10px;
+    padding: 10px 10px 0 10px;
     border: 1px solid #CCC;
     margin-top: 0;
     border-radius: 8px;
@@ -2033,21 +2047,9 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     border-bottom-color: #CCC;
     width: 0;
     height: 0;
-    margin-left: 33.3333%;
-    margin-left: -webkit-calc(16.6666% - 10px);
-    margin-left: calc(16.6666% - 10px);
-    margin-top: -10px;
-}
-.subgrid.arrow-1 .arrow {
     margin-left: 50%;
     margin-left: -webkit-calc(50% - 10px);
-    margin-left: calc(50% - 10px);
-}
-
-.subgrid.arrow-2 .arrow {
-    margin-left: 280px;
-    margin-left: -webkit-calc(84.4444% - 10px);
-    margin-left: calc(84.4444% - 10px);
+    margin-top: -10px;
 }
 
 .show-more {
@@ -2073,7 +2075,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     width: 45px;
     margin: auto;
     position: absolute;
-    left: 0; right: 0; top: 19px;
+    left: 7px; top: 7px;
     background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -240px -80px;
 }
 
@@ -2120,10 +2122,8 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 }
 
 .tag-wrap .preset-icon-wrap > div {
-    height: 90px;
-    width: 33.3333%;
-    width: -webkit-calc(33.3333% - 10px);
-    width: calc(33.3333% - 10px);
+    height: 60px;
+    width: 60px;
     margin: auto;
     border-radius: 4px;
     border: 1px solid #CCC;
@@ -2711,6 +2711,7 @@ img.wiki-image {
     width: -webkit-calc(33.3333% - 10px);
     width: calc(33.3333% - 10px);
     margin-left: 20px;
+    margin-right: 10px;
     border-radius: 4px;
     max-height: 200px;
 }