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

diff --git a/app/assets/images/browse/node.svg b/app/assets/images/browse/node.svg
new file mode 100644 (file)
index 0000000..35e5927
--- /dev/null
+++ b/app/assets/images/browse/node.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 256 256">
+<rect width="240" height="240" stroke="#8888" fill="#fffc" stroke-width="16" ry="32" x="8" y="8"/>
+<circle cx="128" cy="128" r="024" fill="#bee6be" stroke="black" stroke-width="10"/>
+</svg>

diff --git a/app/assets/images/browse/relation.svg b/app/assets/images/browse/relation.svg
new file mode 100644 (file)
index 0000000..9cb52fc
--- /dev/null
+++ b/app/assets/images/browse/relation.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 256 256">
+<rect width="240" height="240" stroke="#8888" fill="#fffc" stroke-width="16" ry="32" x="8" y="8"/>
+<path d="M 068 068 L 196 062" stroke-width="16" stroke="#888"/>
+<path d="M 068 068 L 196 142" stroke-width="16" stroke="#888"/>
+<path d="M 068 068 L 062 196" stroke-width="16" stroke="#888"/>
+<path d="M 068 068 L 142 196" stroke-width="16" stroke="#888"/>
+<circle cx="196" cy="062" r="024" fill="black"/>
+<circle cx="196" cy="142" r="024" fill="black"/>
+<circle cx="062" cy="196" r="024" fill="black"/>
+<circle cx="142" cy="196" r="024" fill="black"/>
+<circle cx="072" cy="072" r="032" fill="#bee6be" stroke="black" stroke-width="8"/>
+</svg>

diff --git a/app/assets/images/browse/way.svg b/app/assets/images/browse/way.svg
new file mode 100644 (file)
index 0000000..98eae57
--- /dev/null
+++ b/app/assets/images/browse/way.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 256 256">
+<rect width="240" height="240" stroke="#8888" fill="#fffc" stroke-width="16" ry="32" x="8" y="8"/>
+<path stroke="#888" fill="none" stroke-width="16" d="M 169 058 L 057 145 L 195 199"/>
+<circle cx="169" cy="058" r="024" fill="black"/>
+<circle cx="057" cy="145" r="024" fill="black"/>
+<circle cx="195" cy="199" r="024" fill="black"/>
+</svg>

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 027e6e6a34f08724d9e9786d74dae511de477305..4bedf42b6ac2b6571a7b09d27f2bf11973c6d222 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -973,6 +973,10 @@ img.trace_image {
   .node, .way, .relation {
     margin-left: 25px;
   }
+
+  .node::before     { content: image-url('browse/node.svg'); }
+  .way::before      { content: image-url('browse/way.svg'); }
+  .relation::before { content: image-url('browse/relation.svg'); }
 }
 
 @each $class, $item in $map-sidebar-icons {