mirror of
https://github.com/FoggedLens/iD.git
synced 2026-05-16 22:03:37 +02:00
action buttons are now filled, toggles and less important buttons are not.
This commit is contained in:
Saman Bemel-Benrud
+23
-8
@@ -91,14 +91,13 @@ button {
|
||||
display: inline-block;
|
||||
height:40px;
|
||||
}
|
||||
.fillD button { border: 1px solid black; }
|
||||
|
||||
button:hover {
|
||||
background-color: #ececec;
|
||||
}
|
||||
|
||||
button.active:not([disabled]) {
|
||||
background:#7392ff;
|
||||
background:#aaa;
|
||||
color:#fff;
|
||||
}
|
||||
|
||||
@@ -142,17 +141,29 @@ button.Browse {
|
||||
}
|
||||
|
||||
button[disabled] {
|
||||
color:#eee;
|
||||
color:#ccc;
|
||||
cursor:auto;
|
||||
}
|
||||
|
||||
button.save {
|
||||
display:inline-block;
|
||||
color:#6dc643;
|
||||
button.action {
|
||||
background: #7092ff;
|
||||
}
|
||||
button.action:hover {
|
||||
background: #6282ee;
|
||||
}
|
||||
|
||||
button.delete {
|
||||
color:#ff7070;
|
||||
background: #ff7070;
|
||||
}
|
||||
button.delete:hover {
|
||||
background: #ef5454;
|
||||
}
|
||||
|
||||
button.save {
|
||||
background:#6bc641;
|
||||
}
|
||||
button.save:hover {
|
||||
background: #59ac33;
|
||||
}
|
||||
|
||||
button.close {
|
||||
@@ -186,6 +197,11 @@ button .label {
|
||||
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
||||
}
|
||||
|
||||
button.action .label {
|
||||
color: white;
|
||||
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
||||
}
|
||||
|
||||
/* Icons */
|
||||
|
||||
.icon {
|
||||
@@ -263,7 +279,6 @@ button.Browse .label {
|
||||
/* Inspector */
|
||||
|
||||
.inspector-wrap {
|
||||
border:1px solid #ccc;
|
||||
position:absolute;
|
||||
right: 0;
|
||||
left: 530px;
|
||||
|
||||
+32
-5
@@ -329,11 +329,11 @@
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="1"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1"
|
||||
inkscape:cx="551.67736"
|
||||
inkscape:cy="614.51516"
|
||||
inkscape:zoom="8"
|
||||
inkscape:cx="-55.068441"
|
||||
inkscape:cy="832.46552"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer8"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
inkscape:window-width="1660"
|
||||
inkscape:window-height="971"
|
||||
@@ -2092,6 +2092,33 @@
|
||||
d="M 454 -35 L 453 -34 L 453 -33 L 454 -32 L 466 -32 L 467 -33 L 467 -34 L 466 -35 L 454 -35 z M 454 -31 L 454 -21 L 455 -20 L 465 -20 L 466 -21 L 466 -31 L 454 -31 z M 456 -29 L 458 -29 L 458 -23 L 457 -22 L 456 -23 L 456 -29 z M 459 -29 L 461 -29 L 461 -23 L 460 -22 L 459 -23 L 459 -29 z M 462 -29 L 464 -29 L 464 -23 L 463 -22 L 462 -23 L 462 -29 z "
|
||||
transform="translate(0,52.362183)"
|
||||
id="path16662" />
|
||||
<rect
|
||||
ry="0"
|
||||
rx="0"
|
||||
y="242.36218"
|
||||
x="-90"
|
||||
height="20"
|
||||
width="19.99999"
|
||||
id="rect22368"
|
||||
style="color:#000000;fill:#ef5454;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
<rect
|
||||
style="color:#000000;fill:#59ac33;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
id="rect22370"
|
||||
width="19.99999"
|
||||
height="20"
|
||||
x="-90"
|
||||
y="217.36218"
|
||||
rx="0"
|
||||
ry="0" />
|
||||
<rect
|
||||
ry="0"
|
||||
rx="0"
|
||||
y="192.36218"
|
||||
x="-90"
|
||||
height="20"
|
||||
width="19.99999"
|
||||
id="rect22372"
|
||||
style="color:#000000;fill:#6282ee;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
@@ -2113,7 +2140,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5129"
|
||||
d="m 51,94.362183 0,35.999997 97,0 0,-35.999994 z"
|
||||
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
|
||||
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#4672ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
|
||||
<text
|
||||
transform="translate(0,-52.362183)"
|
||||
xml:space="preserve"
|
||||
|
||||
|
Before Width: | Height: | Size: 272 KiB After Width: | Height: | Size: 273 KiB |
+29
-32
@@ -27,9 +27,9 @@
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1"
|
||||
inkscape:cx="90.845809"
|
||||
inkscape:cy="47.967567"
|
||||
inkscape:zoom="5.6568542"
|
||||
inkscape:cx="147.84941"
|
||||
inkscape:cy="137.77091"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer12"
|
||||
showgrid="false"
|
||||
@@ -161,8 +161,8 @@
|
||||
sodipodi:nodetypes="cccccccccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path16650"
|
||||
d="M 169.00002,10.999999 175,3.9999989 l 6.00002,7.0000201 -4,-10e-6 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 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" />
|
||||
d="M 169.00002,8.999999 175,1.9999989 l 6.00002,7.0000201 -4,-10e-6 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
|
||||
style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
<path
|
||||
inkscape:export-ydpi="90"
|
||||
inkscape:export-xdpi="90"
|
||||
@@ -438,23 +438,10 @@
|
||||
d="m 54.84375,4 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 55,7 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"
|
||||
id="path8139"
|
||||
inkscape:connector-curvature="0" />
|
||||
<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"
|
||||
d="M 134.5,5 129.5625,13.5625 126,10 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
|
||||
transform="translate(25,-3.8281252e-7)"
|
||||
id="path12560"
|
||||
inkscape:connector-curvature="0" />
|
||||
<g
|
||||
id="g5460"
|
||||
transform="translate(-321,-101.36218)"
|
||||
style="fill:#6bc641;fill-opacity:1;display:inline">
|
||||
<path
|
||||
style="color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
d="M 134.5,4 129.5625,12.5625 126,9 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
|
||||
transform="translate(346,101.36218)"
|
||||
id="path4961-2"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
style="fill:#6bc641;fill-opacity:1;display:inline" />
|
||||
<g
|
||||
id="g12598">
|
||||
<path
|
||||
@@ -734,7 +721,7 @@
|
||||
id="g16306-5"
|
||||
style="display:inline" />
|
||||
<path
|
||||
style="color:#000000;fill:#6bc641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
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 169.00002,9.9999989 5.99998,-7 6.00002,7.0000201 -4,-10e-6 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.0000201 z"
|
||||
id="path9203-8"
|
||||
inkscape:connector-curvature="0"
|
||||
@@ -769,18 +756,6 @@
|
||||
inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90" />
|
||||
<path
|
||||
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
|
||||
id="path16738"
|
||||
d="m 210,3.9999988 -1,1.0000001 0,1 1,1 9,0 1,-1 0,-1 -1,-1.0000001 z m 0,4.0000001 0,9.0000001 1,1 7,0 1,-1 0,-9.0000001 z m 2,2 1,0 0,6.0000001 -1,0 0,-1 z m 2,0 1,0 0,5.0000001 0,1 -1,0 z m 2,0 1,0 0,5.0000001 0,1 -1,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" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="color:#000000;fill:#ff7070;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
d="m 210,2.9999989 -1,0.9999999 0,1.0000001 1,1 9,0 1,-1 0,-1.0000001 -1,-0.9999999 z m 0,4 0,9.0000001 1,1 7,0 1,-1 0,-9.0000001 z m 2,2 1,0 0,6.0000001 -1,0 0,-1 z m 2,0 1,0 0,5.0000001 0,1 -1,0 z m 2,0 1,0 0,5.0000001 0,1 -1,0 z"
|
||||
id="path16662"
|
||||
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
@@ -831,5 +806,27 @@
|
||||
width="6"
|
||||
id="rect17381"
|
||||
style="opacity:0.2;color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
id="path22360"
|
||||
d="M 159.5,3 154.5625,11.5625 151,8 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
|
||||
style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
id="path22362"
|
||||
d="M 159.5,4 154.5625,12.5625 151,9 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,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" />
|
||||
<path
|
||||
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
|
||||
id="path22364"
|
||||
d="m 210,1.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
|
||||
style="opacity:0.25;color:#000000;fill:#000000;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" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
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"
|
||||
d="m 210,2.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
|
||||
id="path22366"
|
||||
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 8.3 KiB |
+1
-1
@@ -73,7 +73,7 @@ window.iD = function(container) {
|
||||
.attr('class', 'hello');
|
||||
|
||||
bar.append('button')
|
||||
.attr('class', 'save wide')
|
||||
.attr('class', 'save action wide')
|
||||
.html("<span class='icon icon-pre-text save'></span><span class='label'>Save</span><small id='as-username'></small>")
|
||||
.attr('title', 'Save changes to OpenStreetMap, making them visible to other users')
|
||||
.call(bootstrap.tooltip()
|
||||
|
||||
@@ -136,14 +136,14 @@ iD.Inspector = function() {
|
||||
|
||||
function drawbuttons(selection) {
|
||||
selection.append('button')
|
||||
.attr('class', 'save wide')
|
||||
.attr('class', 'apply wide action')
|
||||
.html("<span class='icon icon-pre-text apply'></span><span class='label'>Apply</span>")
|
||||
.on('click', function(entity) {
|
||||
event.changeTags(entity, clean(grabtags()));
|
||||
event.close(entity);
|
||||
});
|
||||
selection.append('button')
|
||||
.attr('class', 'delete wide')
|
||||
.attr('class', 'delete wide action')
|
||||
.html("<span class='icon icon-pre-text delete'></span><span class='label'>Delete</span>")
|
||||
.on('click', function(entity) { event.remove(entity); });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user