From 6ecbf3778fa46039cbdb0b42d17ec57adace5396 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 15 May 2013 16:57:04 -0400 Subject: [PATCH] cleanup / polish new changes --- css/app.css | 20 +++++++++++--------- data/core.yaml | 1 + dist/img/sprite.svg | 35 +++++++++++++++++++++++++---------- dist/locales/en.json | 1 + js/id/ui/preset/localized.js | 2 +- js/id/ui/preset/wikipedia.js | 1 - js/id/ui/taglist.js | 4 ++-- 7 files changed, 41 insertions(+), 23 deletions(-) diff --git a/css/app.css b/css/app.css index 2b61aef3f..41d43d680 100644 --- a/css/app.css +++ b/css/app.css @@ -1220,10 +1220,12 @@ input[type=number] { .form-field .button-input-action { position: relative; + right: 1px; width: 10%; margin-left: -10%; border: 1px solid #CCC; border-top-width: 0; + border-right-width: 0; border-radius: 0 0 4px 0; height: 30px; vertical-align: top; @@ -1347,10 +1349,6 @@ div.combobox { border-top: 1px solid #ccc; } -.tag-list { - margin-right: 20%; -} - .tag-row { width: 100%; position: relative; @@ -1364,6 +1362,12 @@ div.combobox { border-left: 1px solid #CCC; } +.tag-row .key-wrap, +.tag-row .input-wrap-position { + width: 40%; + float: left; +} + .tag-row input.key { background-color: #f6f6f6; } @@ -1384,7 +1388,7 @@ div.combobox { .tag-row button { position: absolute; height: 30px; - right: -10%; + right: 10%; border: 1px solid #CCC; border-top-width: 0; border-left-width: 0; border-radius: 0; @@ -1413,7 +1417,7 @@ div.combobox { } .tag-row button.tag-help-button { - right: -20%; + right: 0; } /* Adding form fields to tag editor */ @@ -1466,8 +1470,6 @@ div.combobox { .additional-tags div.tag-help { float: left; width: 100%; - width: -webkit-calc(100% + 40px); - width: calc(100% + 40px); } img.wiki-image { @@ -1764,7 +1766,7 @@ img.wiki-image { .help-wrap .toc li.walkthrough a { overflow: hidden; - border-radius: 4px; + border-radius: 0 0 4px 4px; } .help-wrap .nav { diff --git a/data/core.yaml b/data/core.yaml index be00c0506..2933770ca 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -127,6 +127,7 @@ en: browser_notice: "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map." view_on_osm: "View on OSM" translate: Translate + localized_translation_label: Translation zoom_in_edit: zoom in to edit the map logout: logout loading_auth: "Connecting to OpenStreetMap..." diff --git a/dist/img/sprite.svg b/dist/img/sprite.svg index 279a60130..3d3b656ce 100644 --- a/dist/img/sprite.svg +++ b/dist/img/sprite.svg @@ -38,9 +38,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="66.6258" - inkscape:cy="533.15512" + inkscape:zoom="9.3884297" + inkscape:cx="235.04931" + inkscape:cy="525.74069" inkscape:document-units="px" inkscape:current-layer="layer12" showgrid="false" @@ -53,7 +53,7 @@ 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" @@ -379,11 +379,11 @@ sodipodi:nodetypes="ccccccccc" /> + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscsssssccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsssssssssssssssccccccccccccccccccccccccccccsccssssssssssssss" /> + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscsssssccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsssssssssscccccccccccccccccccccsssssccccccccccccccccccccccccccccsccssssssssssssss" /> + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsscsssssccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsssssssssssssssccccccccccccccccccccccccccccsccssssssssssssss" /> + + + diff --git a/dist/locales/en.json b/dist/locales/en.json index c80078437..02c032568 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -161,6 +161,7 @@ "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.", "view_on_osm": "View on OSM", "translate": "Translate", + "localized_translation_label": "Translation", "zoom_in_edit": "zoom in to edit the map", "logout": "logout", "loading_auth": "Connecting to OpenStreetMap...", diff --git a/js/id/ui/preset/localized.js b/js/id/ui/preset/localized.js index 70e26b5fb..9056afbff 100644 --- a/js/id/ui/preset/localized.js +++ b/js/id/ui/preset/localized.js @@ -99,7 +99,7 @@ iD.ui.preset.localized = function(field, context) { wrap.append('label') .attr('class','form-label') - .text('Translation') + .text(t('localized_translation_label')) .attr('for','localized-lang'); wrap.append('input') diff --git a/js/id/ui/preset/wikipedia.js b/js/id/ui/preset/wikipedia.js index 2ddd3ab77..d24063ad9 100644 --- a/js/id/ui/preset/wikipedia.js +++ b/js/id/ui/preset/wikipedia.js @@ -43,7 +43,6 @@ iD.ui.preset.wikipedia = function(field, context) { title = selection.append('input') .attr('type', 'text') .attr('class', 'wiki-title') - .attr('plaeholder', 'URL to Wikipedia page') .attr('id', 'preset-input-' + field.id) .on('blur', change) .on('change', change) diff --git a/js/id/ui/taglist.js b/js/id/ui/taglist.js index 84e8cc177..e8abdf2a6 100644 --- a/js/id/ui/taglist.js +++ b/js/id/ui/taglist.js @@ -58,10 +58,10 @@ iD.ui.Taglist = function(context, entity) { li.exit().remove(); var row = li.enter().append('li') - .attr('class', 'tag-row'); + .attr('class', 'tag-row cf'); row.append('div') - .attr('class', 'key-wrap col6') + .attr('class', 'key-wrap') .append('input') .property('type', 'text') .attr('class', 'key')