diff --git a/css/app.css b/css/app.css index 96803f055..3d5e21323 100644 --- a/css/app.css +++ b/css/app.css @@ -543,6 +543,7 @@ button.save.has-count .count::before { .icon.help.light { background-position: -460px -20px;} .icon.avatar.light { background-position: -320px -20px;} .icon.nearby.light { background-position: -340px -20px;} +.icon.bug.light { background-position: -400px -20px;} .icon.back.blue { background-position: -420px -20px;} .icon.forward.blue { background-position: -440px -20px;} @@ -587,12 +588,14 @@ a:hover .icon.out-link { background-position: -500px -14px;} ------------------------------------------------------- */ #bar { - position:absolute; + position:fixed; padding: 10px; left:0; top:0; right:0; height:60px; + z-index: 1; + min-width: 768px; } /* Header for modals / panes @@ -639,6 +642,7 @@ a:hover .icon.out-link { background-position: -500px -14px;} float: right; height: 100%; overflow: hidden; + z-index: 2; } .inspector-wrap { @@ -1520,7 +1524,7 @@ img.wiki-image { left: 0; top: 80px; width: 30px; - position: absolute; + position: fixed; z-index: 100; } @@ -1752,7 +1756,7 @@ img.wiki-image { } .help-wrap { - position: absolute; + position: fixed; top:60px; bottom: 30px; padding: 20px 20px 20px 50px; @@ -1874,10 +1878,8 @@ img.wiki-image { .about-block { position: absolute; - right:0px; - bottom:0px; - white-space: nowrap; - text-overflow: ellipsis; + right:0; + bottom:0; border-radius: 0; opacity: .625; -webkit-transition: opacity 200ms; diff --git a/data/core.yaml b/data/core.yaml index ed6181215..07165e3b7 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -161,8 +161,8 @@ en: deleted: Deleted created: Created contributors: - list: "Contributed by {users}" - truncated_list: "Contributed by {users} and {count} others" + list: "Edits by {users}" + truncated_list: "Edits by {users} and {count} others" geocoder: title: Find a place placeholder: Find a place diff --git a/dist/img/sprite.svg b/dist/img/sprite.svg index cb2af8eef..900126f6b 100644 --- a/dist/img/sprite.svg +++ b/dist/img/sprite.svg @@ -39,21 +39,21 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="487.21412" - inkscape:cy="494.27874" + inkscape:cx="322.08714" + inkscape:cy="548.36131" inkscape:document-units="px" inkscape:current-layer="layer12" showgrid="false" inkscape:window-width="1280" inkscape:window-height="756" - inkscape:window-x="35" + inkscape:window-x="56" inkscape:window-y="0" inkscape:window-maximized="0" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - showguides="false" + showguides="true" inkscape:guide-bbox="true" inkscape:snap-bbox="true" inkscape:snap-nodes="true" @@ -228,7 +228,7 @@ image/svg+xml - + @@ -377,13 +377,6 @@ id="path3769" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc" /> - - - - - + id="path14426" + d="m 114,1.999997 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -100.15625,1 C 35.5625,3.046867 35,3.249997 35,3.999997 l 0,4 c 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.429283,-0.27516 -0.5,-0.5 -0.304688,-0.96875 -0.867187,-2.36459 -1,-3 -0.204595,-0.97885 -0.666667,-1 -1,-1 -1,0 -1,1 -1,1 l 1,4 0,3 -1.5,-1.5 c -0.554688,-0.55469 -1.242341,-0.75701 -1.6875,-0.5 -0.435451,0.25141 -0.661558,0.89541 -0.3125,1.5 0.353553,0.61237 3.5,4.5 3.5,4.5 1,1 2,1 4,1 l 3,0 c 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 0.113427,-0.42332 -0.04289,-0.846 -0.5,-1 -0.880461,-0.29662 -1.36006,0.35278 -1.5,1 -0.25,1.15625 -0.5,2 -0.5,2 -0.09375,0.31383 0.0013,0.5 -0.5,0.5 -0.50914,0 -0.5,-0.5 -0.5,-0.5 l 0,-4 c 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 l 0,3 c 0,0 0.01305,0.5 -0.5,0.5 -0.501327,0 -0.5,-0.5 -0.5,-0.5 l 0,-4 c 0,-1 -1,-1 -1,-1 0,0 -0.0625,-0.01563 -0.15625,0 z m 43.15625,0 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z m -118,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 79.30935,5.719977 79.28,5.690657 79.25,5.656247 79.09665,5.480516 79,5.251518 79,4.999997 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 -3.5625,-3.5625 -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 40.125,0 -1.125,1 0,10 1.125,1 3.375,-2.875 3.375,2.875 1.125,-1 0,-10 -1.125,-1 z m -160.125,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z m -145,3 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.09375,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z" + style="opacity:1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/dist/locales/en.json b/dist/locales/en.json index a64bd2efe..051b6eaa5 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -201,8 +201,8 @@ "created": "Created" }, "contributors": { - "list": "Contributed by {users}", - "truncated_list": "Contributed by {users} and {count} others" + "list": "Edits by {users}", + "truncated_list": "Edits by {users} and {count} others" }, "geocoder": { "title": "Find a place",