From c2ca010d8fb6ddcbdf3ae6bcf6507e07d8a4a89e Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Tue, 19 Feb 2013 16:01:27 -0500 Subject: [PATCH] layout improvements. --- css/app.css | 34 ++++++++++++++++++---------------- js/id/ui.js | 2 +- js/id/ui/inspector.js | 2 +- js/id/ui/presetgrid.js | 8 +++----- js/id/ui/tageditor.js | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/css/app.css b/css/app.css index 2bba25c24..874387101 100644 --- a/css/app.css +++ b/css/app.css @@ -521,7 +521,6 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} opacity:0; display:none; max-width: 500px; - height: 100%; position: relative; } @@ -540,7 +539,9 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} border-bottom: 1px solid #ccc; } -.inspector-inner.message h3 { line-height: 40px;} +.inspector-inner.message h3 { + line-height: 40px; +} .inspector-inner.type { border: 1px solid #eee; @@ -589,6 +590,8 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} } .inspector-body { + overflow: auto; + max-height: 440px; } .tag-row { @@ -668,10 +671,6 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} /* Preset grid */ /* temp */ -.preset-grid { - overflow: auto; -} - .preset-grid .grid-entry { padding-bottom: 25%; position: relative; @@ -1493,16 +1492,6 @@ a.success-action { stroke-width: 1; } -/* Media Queries -------------------------------------------------------- */ - -@media only screen and (max-width: 840px) { - span.label {display: none;} - /* override hide for save button */ - .icon.icon-pre-text { margin-right: 0px;} - .save .label, .apply .label, .cancel .label { display: block;} -} - .inspector-preset.cf, .preset-section-input.cf { width: 100%; @@ -1584,3 +1573,16 @@ div.combobox { border-left: 5px solid transparent; border-right: 5px solid transparent; } + +/* Media Queries +------------------------------------------------------- */ + +@media only screen and (max-width: 840px) { + span.label {display: none;} + /* override hide for save button */ + .icon.icon-pre-text { margin-right: 0px;} + .save .label, .apply .label, .cancel .label { display: block;} +} + +@media only screen and (max-height: 840px) { +} \ No newline at end of file diff --git a/js/id/ui.js b/js/id/ui.js index 2ad42e813..44f2b443c 100644 --- a/js/id/ui.js +++ b/js/id/ui.js @@ -69,7 +69,7 @@ iD.ui = function(context) { var linkList = about.append('ul') .attr('id', 'about') - .attr('class', 'pad1 fillD about-block link-list'); + .attr('class', 'pad1 about-block link-list'); linkList.append('li') .append('a') diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js index 06ebe9704..d1b3c3e90 100644 --- a/js/id/ui/inspector.js +++ b/js/id/ui/inspector.js @@ -22,7 +22,7 @@ iD.ui.Inspector = function() { message = messagewrap.append('h3'); inspectorbody = iwrap.append('div') - .attr('class', 'inspector-body fillL'), + .attr('class', 'fillL'), iwrap.append('div') .attr('class', 'inspector-actions pad1 col12') .call(drawButtons); diff --git a/js/id/ui/presetgrid.js b/js/id/ui/presetgrid.js index 25ecc95bb..4abe81772 100644 --- a/js/id/ui/presetgrid.js +++ b/js/id/ui/presetgrid.js @@ -7,17 +7,15 @@ iD.ui.PresetGrid = function() { function presetgrid(selection) { selection.html(''); - var wrap = selection.append('div') - .attr('class', ''); var viable = presetData.match(entity); event.message('What kind of ' + entity.geometry(context.graph()) + ' are you adding?'); - var grid = wrap.append('div') - .attr('class', 'preset-grid pad1') + var grid = selection.append('div') + .attr('class', 'preset-grid inspector-body pad1') .call(drawGrid, filter('')); - var searchwrap = wrap.append('div') + var searchwrap = selection.append('div') .attr('class', 'preset-grid-search-wrap'); var search = searchwrap.append('input') diff --git a/js/id/ui/tageditor.js b/js/id/ui/tageditor.js index e7896dc16..c4a57254f 100644 --- a/js/id/ui/tageditor.js +++ b/js/id/ui/tageditor.js @@ -25,7 +25,7 @@ iD.ui.TagEditor = function() { selection.html(''); var editorwrap = selection.append('div') - .attr('class', 'inspector-inner tag-wrap'); + .attr('class', 'inspector-inner tag-wrap inspector-body'); var typewrap = editorwrap.append('div') .attr('class', 'type inspector-inner fillL')