CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-26 15:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
saman bb
2013-03-25 20:52:02 -04:00
parent bc7b5908ba
commit 6f04e541b1
6 changed files with 97 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
css/app.css
View File

@@ -491,7 +491,6 @@ button[disabled] .label {
.icon.plus { background-position: -240px 0px;}
.icon.search { background-position: -280px 0px;}
.icon.geocode { background-position: -280px 0px;}
.icon.help { background-position: -460px 0px;}
.icon.layers { background-position: -300px 0px;}
.icon.avatar { background-position: -320px 0px;}
.icon.nearby { background-position: -340px 0px;}
@@ -499,8 +498,11 @@ button[disabled] .label {
.icon.warning { background-position: -380px 0px;}
.icon.back { background-position: -420px 0px;}
.icon.forward { background-position: -440px 0px;}
.icon.help { background-position: -460px 0px;}
.icon.inspect.light { background-position: -220px -20px;}
.icon.geocode.light { background-position: -280px -20px;}
.icon.help.light { background-position: -460px -20px;}
.fillD .icon.avatar { background-position: -320px -20px;}
.fillD .icon.nearby { background-position: -340px -20px;}
@@ -512,7 +514,6 @@ button[disabled] .icon.add-area { background-position: -60px -40px;}
button.disabled .icon.undo { background-position: -80px -40px;}
button.disabled .icon.redo { background-position: -100px -40px;}
button[disabled] .apply.icon { background-position: -120px -40px;}
button[disabled] .save.icon { background-position: -140px -40px;}
button[disabled] .close.icon { background-position: -160px -40px;}
button[disabled] .delete.icon { background-position: -180px -40px;}
button[disabled] .icon.remove { background-position: -200px -40px;}
@@ -705,25 +706,6 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
background: #ececec;
}
.grid-entry:hover .tag-reference-button {
display: block;
border-radius: 0;
}
.grid-entry .tag-reference-button {
display: none;
position: absolute;
bottom: 0;
right: 0;
height: 30px;
width: 30px;
background: rgba(0,0,0,.5);
}
.grid-entry .tag-reference-button:hover {
background: rgba(0,0,0,.9);
}
.grid-entry > .icon {
position: absolute;
top: 30px;left: 0px; right: 0px;
@@ -852,6 +834,25 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
color: #222;
}
.grid-entry:hover .tag-reference-button {
opacity: 1;
border-radius: 0;
}
.grid-entry .tag-reference-button {
opacity: 0;
position: absolute;
bottom: 0;
right: 0;
width: 20px;
height: 30px;
background: rgba(0,0,0,.5);
}
.grid-entry .tag-reference-button:hover {
background: rgba(0,0,0,.9);
}
/* Preset icon colors */
.inspector-body-line .icon.feature-marker-stroked {
@@ -910,7 +911,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
}
.tag-wrap .preset-icon-wrap div {
height: 90px;
height: 80px;
width: 33.3333%;
width: -webkit-calc(33.3333% - 10px);
width: calc(33.3333% - 10px);
@@ -937,29 +938,38 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
padding-right: 20px;
}
.form-field .modified-icon {
opacity: 0.2;
display: none;
pointer-events: all;
}
.form-field .modified-icon:hover {
opacity: 0.5;
}
.form-field.modified .modified-icon {
display: inline-block;
}
.form-label {
position: relative;
font-weight: bold;
border: 1px solid #cfcfcf;
padding: 5px 10px;
padding: 5px 0px 5px 10px;
background: #f6f6f6;
display: block;
border-radius: 4px 4px 0 0;
}
.form-label button {
pointer-events: all;
height: 29px;
margin-top: -5px;
border-left: 1px solid #CCC;
border-radius: 0;
opacity: .5;
}
.form-label .modified-icon {
border-right: 0;
opacity: 0;
}
.modified .form-label .modified-icon {
opacity: .5;
}
.form-label button.tag-reference-button {
border-top-right-radius: 3px;
}
.form-field > input,
.form-field > textarea,
.form-field .preset-input-wrap {

53
img/source/sprite.svg
View File

@@ -38,9 +38,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.858048"
inkscape:cx="497.26876"
inkscape:cy="307.47415"
inkscape:zoom="11.079848"
inkscape:cx="223.17822"
inkscape:cy="307.03685"
inkscape:document-units="px"
inkscape:current-layer="layer12"
showgrid="true"
@@ -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"
@@ -364,14 +364,9 @@
id="path3769"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccc" />
<path
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 255,3.9999969 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5.0000001 1,1 1,0 1,-1 0,-5.0000001 -1,-1 -1,0 z"
id="path10936"
inkscape:connector-curvature="0" />
<path
style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 113,2.01282 -5,4.5 5,4.5 0,-3 3,0 L 117,9 117,12.01282 116,13 l -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
d="m 114,2.01282 -5,4.5 5,4.5 0,-3 3,0 L 118,9 118,12.01282 117,13 l -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
id="path2997"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccccc"
@@ -684,7 +679,7 @@
inkscape:connector-curvature="0" />
<path
style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 113,42.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
d="m 114,42.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
id="path16239"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccccc"
@@ -848,7 +843,7 @@
sodipodi:nodetypes="cccccccccccccccccccccc"
inkscape:connector-curvature="0"
id="path33325"
d="m 113,22.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
d="m 114,22.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -2080,12 +2075,42 @@
sodipodi:nodetypes="ccccccccccccccc" />
<g
id="g3815"
transform="translate(0,50)">
transform="translate(0,50)"
style="fill:#1a1a1a;fill-opacity:1">
<path
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 464 2 L 463 3 L 463 16 L 464 17 L 475 17 L 476 16 L 476 6 L 472 6 L 472 12 L 469.5 10.5 L 467 12 L 467 6 L 465 6 L 465 5 L 465 4 L 476 4 L 476 3 L 476 2 L 464 2 z "
transform="translate(25,-50.000003)"
id="path3648" />
</g>
<g
transform="translate(0,70)"
id="g3822">
<path
id="path3824"
transform="translate(25,-50.000003)"
d="m 464,2 -1,1 0,13 1,1 11,0 1,-1 0,-10 -4,0 0,6 -2.5,-1.5 -2.5,1.5 0,-6 -2,0 0,-1 0,-1 11,0 0,-1 0,-1 -12,0 z"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:connector-curvature="0" />
</g>
<g
id="g3837"
transform="translate(-1,0)" />
<g
id="g3842"
transform="translate(0,20)"
style="fill:#ffffff" />
<path
style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 251,4.9999969 1.125,-1 6.75,0 1.125,1 0,10.0000001 -1.125,1 -3.375,-2.886751 -3.375,2.886751 -1.125,-1 z"
id="path3854"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccc" />
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="path3874"
d="m 251,24.999997 1.125,-1 6.75,0 1.125,1 0,10 -1.125,1 -3.375,-2.886751 -3.375,2.886751 -1.125,-1 z"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 131 KiB

BIN
img/sprite.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

14
js/id/ui/preset.js
View File

@@ -113,18 +113,22 @@ iD.ui.preset = function(context, entity, preset) {
.attr('for', function(field) { return 'preset-input-' + field.id; })
.text(function(field) { return field.label(); });
label.append('button')
.attr('class', 'fr icon undo modified-icon')
.attr('tabindex', -1)
.on('click', revert);
label.append('button')
.attr('class', 'tag-reference-button')
.attr('class', 'tag-reference-button fr')
.attr('tabindex', -1)
.on('click', toggleReference)
.append('span')
.attr('class', 'icon inspect');
label.append('button')
.attr('class', 'fr modified-icon')
.attr('tabindex', -1)
.on('click', revert)
.append('div')
.attr('class','icon undo');
enter.each(function(field) {
d3.select(this).call(field.input);
});

2
js/id/ui/preset_grid.js
View File

@@ -268,7 +268,7 @@ iD.ui.PresetGrid = function(context, entity) {
.attr('class', 'tag-reference-button')
.on('click', helpClick, selection)
.append('span')
.attr('class', 'icon inspect');
.attr('class', 'icon inspect light');
entries.order();
}

2
js/id/ui/taglist.js
View File

@@ -101,7 +101,7 @@ iD.ui.Taglist = function(context, entity) {
.call(iD.ui.TagReference(entity, {key: tag.key}));
})
.append('span')
.attr('class', 'icon inspect');
.attr('class', 'icon inspect light');
row.append('div')
.attr('class', 'tag-help');