From 5f65ae179afb2330f61cc145eac32f3ff798e5f9 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 22 May 2013 11:09:43 -0400 Subject: [PATCH] minor adjustments to sidebar, adding mock-ups. --- css/app.css | 1 + js/id/ui.js | 2 +- svg/ui-mockups.svg | 4484 +++++++++++++++++++------------------------- 3 files changed, 1905 insertions(+), 2582 deletions(-) diff --git a/css/app.css b/css/app.css index 2a7cb2400..b4b57ec6e 100644 --- a/css/app.css +++ b/css/app.css @@ -643,6 +643,7 @@ a:hover .icon.out-link { background-position: -500px -14px;} height: 100%; overflow: hidden; z-index: 2; + background: #f6f6f6; } .inspector-wrap { diff --git a/js/id/ui.js b/js/id/ui.js index 3d100a170..6ae548b13 100644 --- a/js/id/ui.js +++ b/js/id/ui.js @@ -15,7 +15,7 @@ iD.ui = function(context) { container.append('div') .attr('id', 'sidebar') - .attr('class', 'col4 fillL2') + .attr('class', 'col4') .call(iD.ui.Sidebar(context)); var m = container.append('div') diff --git a/svg/ui-mockups.svg b/svg/ui-mockups.svg index 3a3a99baa..eb721bd0c 100644 --- a/svg/ui-mockups.svg +++ b/svg/ui-mockups.svg @@ -126,8 +126,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="-5486.5385" - inkscape:cy="-17.330415" + inkscape:cx="-2951.3923" + inkscape:cy="126.56503" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -136,7 +136,7 @@ inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" - inkscape:snap-nodes="false" + inkscape:snap-nodes="true" inkscape:snap-bbox="true" showguides="false" inkscape:guide-bbox="true"> @@ -163,10 +163,6 @@ orientation="0,1" position="-2333,132" id="guide13787" /> - @@ -184,24 +180,6 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> - - 7th Street Northwest - - - - - - - - Route - US 50 DC/MD - - Residential Road - 8th Street Northwest - - - Building - - Secondary Road - - - Residential Road - - - - - Cafe - New World Cafe - - 7th Street Northwest - - forward - Route membership - - - - - - - Route - US 1 DC/MD - Role - forward - - - - - - - - - - - - US 50 DC/MD - - - - - - - - - - - - - - - - - - - - - - - - - - - Road - Role - forward - - - - - - - - - - US 50 DC/MD - - Role - - - - - - - - - - - - - - - - - - - - - View on openstreetmap.org - - - - - - Name - - 9th Street Northwest - - - - - - - - Road - US 1 DC/MD - - forward - - - - - - - - - - - - - - - - - - - - - All tags - - - - - - - - - - - - - - - - - - Editing Primary Road - - - - - Multipolygon membership - - Department of Treasury - - - - - View on openstreetmap.org - - Building - - - - All tags - - Editing Inner Wall - - - - - - - Route membership - - US 50 DC/MD - - - - Road - - - - - - View on openstreetmap.org - - - - - - Name - - 9th Street Northwest - - - - - - - - Road - US 1 DC/MD - - - - - - - - - - - - - - - - - - - - - All tags - - - - - - - - - - - - - - - - - - Editing Primary Road - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Relations - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -