diff --git a/css/app.css b/css/app.css index e9fca1da5..0e1db9628 100644 --- a/css/app.css +++ b/css/app.css @@ -62,7 +62,7 @@ h2 { font-size: 25px; line-height: 1.25; font-weight: bold; - margin-bottom: 10px; + margin-bottom: 20px; } h3:last-child, @@ -94,8 +94,13 @@ h5 { } p { + font-size: 15px; margin:0; - padding:0; + padding-bottom:20px; +} + +p:last-child { + padding-bottom: 0; } em { @@ -628,10 +633,6 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} top: 120px; } -.inspector-body::-webkit-scrollbar { - background: #fff; -} - .inspector-inner { padding: 20px; position: relative; @@ -1552,28 +1553,14 @@ div.combobox { } .help-wrap { - background:#f1f1f1; position: absolute; - height: 100%; top:60px; - padding-left:40px; - padding-top:10px; - padding-right:20px; - padding-bottom:150px; + bottom: 30px; + padding: 20px 20px 20px 50px; left: 0; overflow-y: scroll; } -.help-wrap .left-content { - background: #fff; - margin-right:130px; - border-radius: 4px; - padding:10px; -} - -.help-wrap .left-content .body p { - padding: 0 0 5px 0; -} .help-wrap .left-content .body p code { padding:2px 4px; @@ -1581,23 +1568,33 @@ div.combobox { } .help-wrap .toc { - width:120px; + /* This is two columns, 41.66666 x .4 = 16.6666 */ + width:40%; float:right; + margin-left: 20px; + margin-bottom: 20px; + padding-left: 5px } -.help-wrap .toc li { +.help-wrap .toc li a { + display: block; font-weight: bold; - border-bottom: 1px solid #ccc; - padding:2px; + border: 1px solid #CCC; + border-bottom: 0px; + padding:2px 5px; } -.help-wrap .toc a.selected { - color:#222; +.help-wrap .toc li a.selected { + background: #eef0ff; } -.help-wrap .toc li:last-child { - font-weight: bold; - border: 0; +.help-wrap .toc li:first-child a { + border-radius: 4px 4px 0 0; +} + +.help-wrap .toc li:last-child a { + border-bottom: 1px solid #CCC; + border-radius: 0 0 4px 4px } /* Map @@ -2186,7 +2183,7 @@ a.success-action.twitter:before { height: 20px; overflow: visible; width: 10px; - background: #EBEBEB; + background: white; border-left: 1px solid #DDD; } ::-webkit-scrollbar-button { diff --git a/img/source/sprite.svg b/img/source/sprite.svg index 8050c990f..5422cdaa1 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -13,7 +13,7 @@ height="320" id="svg12393" version="1.1" - inkscape:version="0.48.2 r9819" + inkscape:version="0.48.1 r9760" sodipodi:docname="sprite.svg" inkscape:export-filename="/Users/tmcw/src/iD/img/sprite.png" inkscape:export-xdpi="90" @@ -38,12 +38,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="27.487791" - inkscape:cx="474.16358" - inkscape:cy="307.60208" + inkscape:zoom="1" + inkscape:cx="473.6954" + inkscape:cy="307.27342" inkscape:document-units="px" inkscape:current-layer="layer12" - showgrid="true" + showgrid="false" inkscape:window-width="1483" inkscape:window-height="804" inkscape:window-x="131" @@ -201,6 +201,10 @@ orientation="1,0" position="460,310" id="guide6106" /> + @@ -210,7 +214,7 @@ image/svg+xml - + @@ -2069,10 +2073,9 @@ inkscape:export-ydpi="90" /> + 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 465 4 L 462 6 L 462 16 L 463 17 L 468 17 L 469 18 L 471 18 L 472 17 L 477 17 L 478 16 L 478 6 L 475 4 L 473 4 L 470 6 L 467 4 L 465 4 z M 464 8 L 468 8 L 468 9 L 464 9 L 464 8 z M 472 8 L 476 8 L 476 9 L 472 9 L 472 8.40625 L 472 8 z M 464 10 L 468 10 L 468 11 L 464 11 L 464 10 z M 472 10 L 476 10 L 476 11 L 472 11 L 472 10 z M 464 12 L 468 12 L 468 13 L 464 13 L 464 12 z M 472 12 L 476 12 L 476 13 L 472 13 L 472 12 z " + transform="translate(25,-3.0624999e-6)" + id="path3363" /> diff --git a/img/sprite.png b/img/sprite.png index 171433ed2..675efeb45 100644 Binary files a/img/sprite.png and b/img/sprite.png differ diff --git a/js/id/ui.js b/js/id/ui.js index 9b671a115..9aba62ad3 100644 --- a/js/id/ui.js +++ b/js/id/ui.js @@ -54,7 +54,7 @@ iD.ui = function(context) { container.append('div') .style('display', 'none') - .attr('class', 'help-wrap col6'); + .attr('class', 'help-wrap fillL col5'); container.append('div') .attr('class', 'map-control zoombuttons') diff --git a/js/id/ui/help.js b/js/id/ui/help.js index 06f4d335f..9ec5db702 100644 --- a/js/id/ui/help.js +++ b/js/id/ui/help.js @@ -11,9 +11,8 @@ iD.ui.Help = function(context) { .select('.help-wrap') .html(''); - var toc = pane.append('div') - .attr('class', 'toc') - .append('ul'); + var toc = pane.append('ul') + .attr('class', 'toc'); function clickHelp(d) { doctitle.text(d.title); diff --git a/js/id/ui/preset_grid.js b/js/id/ui/preset_grid.js index c7a2b577e..989b947ff 100644 --- a/js/id/ui/preset_grid.js +++ b/js/id/ui/preset_grid.js @@ -211,7 +211,7 @@ iD.ui.PresetGrid = function(context, entity) { .style('max-height', '200px') .style('opacity', '1'); - presetinspect.append('h2') + presetinspect.append('h3') .text(d.name()); var tag = {key: Object.keys(d.tags)[0]};