From 5c6406ea63cfc3f48d68db220843e0ba96916db2 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 8 Jan 2019 14:04:07 -0500 Subject: [PATCH] Remove section borders from inspector There is enough separation with the disclosure headings that we don't need to break the sidebar up with lines --- css/80_app.css | 6 +----- modules/ui/data_editor.js | 2 +- modules/ui/entity_editor.js | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index 5fcf099b2..427945b7b 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -784,10 +784,6 @@ a.hide-toggle { bottom: 0; } -.inspector-border { - border-bottom: 1px solid #ccc -} - .feature-list-pane .inspector-body, .preset-list-pane .inspector-body { top: 120px; @@ -1161,7 +1157,7 @@ img.tag-reference-wiki-image { ------------------------------------------------------- */ .preset-editor { overflow: hidden; - padding-bottom: 10px; + padding: 20px 0 10px 0; } .preset-editor a.hide-toggle { margin: 0 20px 5px 20px; diff --git a/modules/ui/data_editor.js b/modules/ui/data_editor.js index 593517de6..fda6bebd8 100644 --- a/modules/ui/data_editor.js +++ b/modules/ui/data_editor.js @@ -57,7 +57,7 @@ export function uiDataEditor(context) { rte.enter() .append('div') - .attr('class', 'inspector-border raw-tag-editor inspector-inner data-editor') + .attr('class', 'raw-tag-editor inspector-inner data-editor') .merge(rte) .call(rawTagEditor .expanded(true) diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js index 68f41dea6..a056efb23 100644 --- a/modules/ui/entity_editor.js +++ b/modules/ui/entity_editor.js @@ -47,28 +47,28 @@ export function uiEntityEditor(context) { .data([0]); // Enter - var enter = header.enter() + var headerEnter = header.enter() .append('div') .attr('class', 'header fillL cf'); - enter + headerEnter .append('button') .attr('class', 'fl preset-reset preset-choose') .call(svgIcon((textDirection === 'rtl') ? '#iD-icon-forward' : '#iD-icon-backward')); - enter + headerEnter .append('button') .attr('class', 'fr preset-close') .on('click', function() { context.enter(modeBrowse(context)); }) .call(svgIcon(_modified ? '#iD-icon-apply' : '#iD-icon-close')); - enter + headerEnter .append('h3') .text(t('inspector.edit')); // Update header = header - .merge(enter); + .merge(headerEnter); header.selectAll('.preset-reset') .on('click', function() { @@ -81,11 +81,11 @@ export function uiEntityEditor(context) { .data([0]); // Enter - enter = body.enter() + var bodyEnter = body.enter() .append('div') .attr('class', 'inspector-body'); - enter + bodyEnter .append('div') .attr('class', 'preset-list-item inspector-inner') .append('div') @@ -98,23 +98,23 @@ export function uiEntityEditor(context) { .append('div') .attr('class', 'label-inner'); - enter + bodyEnter .append('div') - .attr('class', 'inspector-border preset-editor'); + .attr('class', 'preset-editor'); - enter + bodyEnter .append('div') - .attr('class', 'inspector-border raw-tag-editor inspector-inner'); + .attr('class', 'raw-tag-editor inspector-inner'); - enter + bodyEnter .append('div') - .attr('class', 'inspector-border raw-member-editor inspector-inner'); + .attr('class', 'raw-member-editor inspector-inner'); - enter + bodyEnter .append('div') .attr('class', 'raw-membership-editor inspector-inner'); - enter + bodyEnter .append('input') .attr('type', 'text') .attr('class', 'key-trap'); @@ -122,7 +122,7 @@ export function uiEntityEditor(context) { // Update body = body - .merge(enter); + .merge(bodyEnter); if (_tagReference) { body.selectAll('.preset-list-button-wrap')