cleanup for minor-buttons.

This commit is contained in:
Saman Bemel-Benrud
2013-03-26 14:53:13 -04:00
parent 5c084046c9
commit 3478c213a8
7 changed files with 48 additions and 54 deletions
+38 -44
View File
@@ -350,13 +350,16 @@ button.active:not([disabled]):not(.disabled) {
}
button.minor {
height: 20px;
position: absolute;
top: 0;
right: 0;
height: 100%;
width: 20px;
background: rgba(0,0,0,.5);
opacity: .5;
border-radius: 0;
}
button.minor:hover {
background: #222;
}
button.centered {
@@ -728,6 +731,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
text-align: left;
position: absolute;
padding: 5px;
height: 30px;
bottom: 0;
left: 0; right: 0;
white-space: nowrap;
@@ -738,12 +742,6 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
}
.grid-entry .tag-reference-button {
opacity: .5;
position: absolute;
bottom: 0;
right: 0;
width: 20px;
height: 29px;
border-left: 1px solid #CCC;
border-radius: 0 0 3px 0;
}
@@ -944,17 +942,13 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
}
.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;
right: 20px;
}
.modified .form-label .modified-icon {
@@ -1220,6 +1214,7 @@ div.combobox {
.tag-list {
padding-top: 20px;
margin-right: 40px;
}
.tag-row {
@@ -1251,42 +1246,48 @@ div.combobox {
.tag-row:first-child input.value {
border-top: 1px solid #CCC;
border-top-right-radius: 4px;
}
.tag-row:last-child input.value {
border-bottom-right-radius: 4px;
}
.tag-row button {
position: absolute;
height: 30px;
right: -20px;
opacity: 0;
border: 1px solid #CCC;
border-top-width: 0; border-left-width: 0;
border-radius: 0;
opacity: 1;
background: #fafafa;
}
.tag-row button:hover {
background: #f1f1f1;
}
.tag-row button .icon {
opacity: .5;
}
.tag-row:first-child button {
border-top-width: 1px;
}
.tag-row:first-child button.tag-help {
border-top-right-radius: 4px;
}
.tag-row:last-child button.tag-help {
border-bottom-right-radius: 4px;
}
.tag-row button.tag-help {
left: -20px
}
.tag-row div.tag-help {
display: hidden;
}
.tag-row:hover input.value,
.tag-row:hover input.key {
border-radius: 0;
}
.tag-row:hover button {
opacity: 1;
right: -40px;
}
/* Adding form fields to tag editor */
.inspector-inner .add-tag {
width: -webkit-calc(50% - 20px);
width: calc(50% - 20px);
height: 30px;
border-top: 0;
background: rgba(0,0,0,.5);
@@ -1867,19 +1868,12 @@ div.typeahead a:first-child {
max-height: 160px;
}
.commit-modal .warning-section .changeset-list {
border-radius: 4px 0 0 4px;
}
.commit-modal .warning-section .changeset-list button {
float: right;
.commit-modal .warning-section .changeset-list button {
position: absolute;
right: 0;
top: 0;
bottom: 0;
border-radius: 0;
height: 100%;
width: 30px;
border-left: 1px solid #CCC;
}
.commit-modal .changeset-list li {
+6 -6
View File
@@ -38,9 +38,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="319.99979"
inkscape:cy="247.06899"
inkscape:zoom="4"
inkscape:cx="382.23632"
inkscape:cy="299.5493"
inkscape:document-units="px"
inkscape:current-layer="layer12"
showgrid="false"
@@ -214,7 +214,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -710,7 +710,7 @@
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
style="color:#000000;fill:#1c1c1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 416.5,3.9999947 c -2.48528,0 -4.5,2.0147207 -4.5,4.5 0,0.7234907 0.19662,1.3943635 0.50001,2.0000053 L 409,13.999995 l 0,1.999999 2.00001,0 3.49999,-3.499997 c 0.60565,0.303377 1.27651,0.499995 2,0.499995 2.48528,0 4.5,-2.014712 4.5,-4.4999973 0,-2.4852793 -2.01472,-4.5 -4.5,-4.5 z m 0,1.9999993 c 1.38071,0 2.5,1.1192914 2.5,2.5000007 0,1.3807157 -1.11929,2.5000003 -2.5,2.5000003 -1.38071,0 -2.5,-1.1192846 -2.5,-2.5000003 0,-1.3807093 1.11929,-2.5000007 2.5,-2.5000007 z"
id="path47528"
inkscape:connector-curvature="0" />
@@ -1210,7 +1210,7 @@
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
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"
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 211,3.9999969 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7.0000001 1,1 6,0 1,-1 0,-7.0000001 z m 2,2 1,0 0,4.0000001 -1,0 0,-1 z m 3,0 1,0 0,3.0000001 0,1 -1,0 z"
id="path9820-4"
sodipodi:nodetypes="cccccccccccccccccccccccccccc" />

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 136 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 50 KiB

+2 -2
View File
@@ -118,14 +118,14 @@ iD.ui.preset = function(context, entity, preset) {
.text(function(field) { return field.label(); });
label.append('button')
.attr('class', 'tag-reference-button fr')
.attr('class', 'tag-reference-button minor')
.attr('tabindex', -1)
.on('click', toggleReference)
.append('span')
.attr('class', 'icon inspect');
label.append('button')
.attr('class', 'fr modified-icon')
.attr('class', 'modified-icon minor')
.attr('tabindex', -1)
.on('click', revert)
.append('div')
+1 -1
View File
@@ -265,7 +265,7 @@ iD.ui.PresetGrid = function(context, entity) {
label.filter(function(d) { return !d.members; })
.append('button')
.attr('tabindex', -1)
.attr('class', 'tag-reference-button fr')
.attr('class', 'tag-reference-button minor')
.on('click', helpClick, selection)
.append('span')
.attr('class', 'icon inspect');
+1 -1
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 light');
.attr('class', 'icon inspect');
row.append('div')
.attr('class', 'tag-help');