From 43e66db15790065105dda0b475df1cea9592391c Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 19 Dec 2012 16:27:41 -0500 Subject: [PATCH] style tweaks to inspector header --- css/app.css | 31 ++++++++++++++++++++----------- img/source/sprite.svg | 16 ++++++++-------- js/id/ui/inspector.js | 11 ++--------- js/id/ui/tag_reference.js | 6 ++++-- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/css/app.css b/css/app.css index 0c9e2da13..aadbb8154 100644 --- a/css/app.css +++ b/css/app.css @@ -23,8 +23,8 @@ body { } h2 { - font-size: 24px; - line-height: 1.3333; + font-size: 25px; + line-height: 1.6; font-weight: bold; margin-bottom: 10px; } @@ -336,6 +336,11 @@ button.action .label { overflow:hidden; } +.icon.big { + width: 40px; + height: 40px; +} + .icon.icon-pre-text { margin-right: 3px; } @@ -358,8 +363,8 @@ button.action .label { .icon.zoom-out { background-position: -260px 0px;} .icon.geocode { background-position: -280px 0px;} .icon.layers { background-position: -300px 0px;} -.icon.avatar { background-position: -320px 0px;} -.icon.nearby { background-position: -340px 0px;} +.icon.avatar { background-position: -320px 0px;} +.icon.nearby { background-position: -340px 0px;} .fillD .icon.browse { background-position: 0px -20px;} .fillD .icon.add-point { background-position: -20px -20px;} @@ -399,6 +404,10 @@ button[disabled] .icon.layers { background-position: -300px -40px;} button[disabled] .icon.avatar { background-position: -320px -40px;} button[disabled] .icon.nearby { background-position: -340px -40px;} +.icon.big-line { background-position: 0px -80px;} +.icon.big-point { background-position: -40px -80px;} +.icon.big-area { background-position: -80px -80px;} + /* Toggle Icon is special */ .toggle.icon { background-position: 0px -180px;} a:hover .toggle.icon { background-position: -20px -180px;} @@ -449,14 +458,14 @@ button.Browse .label { .inspector-inner.head { border-bottom: 1px solid #ccc; background:#fff; - height:80px; z-index:1; position:relative; } .inspector-wrap a.permalink { text-decoration:none; - margin-right:1em; + margin-right: 10px; + display: inline-block } .inspector-inner.tag-wrap { @@ -726,6 +735,11 @@ div.typeahead a:first-child { z-index: 3; } +.modal .content { + padding: 10px; + margin-bottom: 40px; +} + .modal .description { text-align: center; } @@ -743,11 +757,6 @@ div.typeahead a:first-child { left:0px; right:0px; top:0px; bottom:0px; } -.commit-modal { - padding: 10px; - margin-bottom: 40px; -} - .commit-modal h3 small.count { margin-right: 10px; text-align: center; diff --git a/img/source/sprite.svg b/img/source/sprite.svg index e19791111..db3af3316 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -38,22 +38,22 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="661.39825" - inkscape:cy="49.903618" + inkscape:zoom="2.8284271" + inkscape:cx="131.68853" + inkscape:cy="97.839246" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" inkscape:window-width="1560" inkscape:window-height="922" - inkscape:window-x="1136" - inkscape:window-y="155" + inkscape:window-x="308" + 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="false"> @@ -165,7 +165,7 @@ image/svg+xml - + diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js index 96ecccb3f..3ed664094 100644 --- a/js/id/ui/inspector.js +++ b/js/id/ui/inspector.js @@ -14,7 +14,7 @@ iD.Inspector = function() { var h2 = selection.append('h2'); h2.append('span').attr('class', function(d) { var icons = { way: 'line', node: 'point' }; - return 'icon add-' + icons[d.type]; + return 'icon big icon-pre-text big-' + icons[d.type]; }); h2.append('span').text(iD.util.friendlyName(selection.datum())); selection.append('a') @@ -155,18 +155,11 @@ iD.Inspector = function() { .html("Apply") .on('click', apply); selection.append('button') - .attr('class', 'delete wide action fr') + .attr('class', 'delete wide action') .html("Delete") .on('click', function(entity) { event.remove(entity); }); } - selection.html("").append('button') - .attr('class', 'narrow close') - .html("") - .on('click', function() { - event.close(entity); - }); - selection.append('div') .attr('class', 'head inspector-inner') .call(drawhead); diff --git a/js/id/ui/tag_reference.js b/js/id/ui/tag_reference.js index c47d398a5..dc799455c 100644 --- a/js/id/ui/tag_reference.js +++ b/js/id/ui/tag_reference.js @@ -3,8 +3,10 @@ iD.tagReference = function(selection) { function g(x) { return function(d) { return d[x]; }; } var selection = d3.select(this); selection - .append('h3') - .text(g('title')); + .append('div') + .attr('class','header') + .append('h2') + .text(g('title')); var icon_row = selection.append('div'); var icons = icon_row.selectAll('span.icon') .data(g('types'))