From 2959a7f7492e14b92c23ea755377ca5458955b44 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Tue, 28 May 2013 23:44:09 -0400 Subject: [PATCH] style fixes. --- css/app.css | 29 +++++++++-------------------- js/id/ui/entity_editor.js | 8 ++++---- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/css/app.css b/css/app.css index 2678681ad..23e11823d 100644 --- a/css/app.css +++ b/css/app.css @@ -688,15 +688,10 @@ a:hover .icon.out-link { background-position: -500px -14px;} } .inspector-inner { - padding: 20px 20px 0 20px; + padding: 20px; position: relative; } -.inspector-inner:last-child, -.inspector-inner:only-child { - padding-bottom: 20px; -} - /* Presets ------------------------------------------------------- */ @@ -863,7 +858,6 @@ a:hover .icon.out-link { background-position: -500px -14px;} .inspector-preset { overflow: hidden; - border-bottom: 1px solid #ccc; } .inspector-preset form.preset-form { @@ -958,14 +952,11 @@ a:hover .icon.out-link { background-position: -500px -14px;} border-radius: 0 0 4px 0; } -.inspector-external-links { - border-top: 1px solid #CCC; - margin-top: 20px; +.inspector-border { + border-bottom: 1px solid #CCC } - /* Preset form (hover mode) */ - .inspector-hover .header { background-color: #f6f6f6; } @@ -980,8 +971,10 @@ a:hover .icon.out-link { background-position: -500px -14px;} .inspector-hover textarea, .inspector-hover input, .inspector-hover .form-label, +.inspector-hover a, .inspector-hover .checkselect label:last-of-type, -.inspector-hover .preset-input-wrap { +.inspector-hover .preset-input-wrap, +.inspector-hover .preset-input-wrap li { color: #666; border-color: #DFDFDF; } @@ -997,6 +990,7 @@ input, .form-label, .checkselect label:last-of-type, .preset-input-wrap, +.preset-input-wrap li, .preset-input-wrap .label { -webkit-transition: all 200ms; -moz-transition: all 200ms; @@ -1357,12 +1351,7 @@ input[type=number] { .form-field .maxspeed-unit { border-radius: 0 0 4px 0; - border: 1px solid #ccc; - border-top: none; - height: 30px; width: 20%; - float: right; - padding: 5px 10px; color: #A9A9A9; } @@ -1659,13 +1648,13 @@ img.wiki-image { /* Raw relation membership editor */ -.raw-member-editor .member-list { +.raw-member-editor .member-list li:first-child, +.raw-membership-editor .member-list li:first-child { padding-top: 10px; } .raw-membership-editor .member-row { position: relative; - padding-top: 10px; } .raw-membership-editor .member-row .member-entity-name { diff --git a/js/id/ui/entity_editor.js b/js/id/ui/entity_editor.js index bdfef6588..747b54f29 100644 --- a/js/id/ui/entity_editor.js +++ b/js/id/ui/entity_editor.js @@ -59,16 +59,16 @@ iD.ui.EntityEditor = function(context) { .append('div'); $enter.append('div') - .attr('class', 'inspector-preset col12'); + .attr('class', 'inspector-border inspector-preset col12'); $enter.append('div') - .attr('class', 'raw-tag-editor inspector-inner col12'); + .attr('class', 'inspector-border raw-tag-editor inspector-inner col12'); $enter.append('div') - .attr('class', 'raw-member-editor inspector-inner col12'); + .attr('class', 'inspector-border raw-member-editor inspector-inner col12'); $enter.append('div') - .attr('class', 'raw-membership-editor inspector-inner col12'); + .attr('class', 'inspector-border raw-membership-editor inspector-inner col12'); $enter.append('div') .attr('class', 'inspector-external-links inspector-inner col12');