From 376ded041cf480cd013800592314904c6571a362 Mon Sep 17 00:00:00 2001 From: German Bisurgi Date: Thu, 30 Apr 2020 08:56:17 +0200 Subject: [PATCH 1/3] Moved headline styling into themes --- src/editors/object.js | 1 - src/theme.js | 2 ++ src/themes/bootstrap4.js | 2 ++ src/themes/spectre.js | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/editors/object.js b/src/editors/object.js index 99cdc42b2..4ab98c376 100644 --- a/src/editors/object.js +++ b/src/editors/object.js @@ -547,7 +547,6 @@ export class ObjectEditor extends AbstractEditor { this.header.textContent = this.getTitle() } this.title = this.theme.getHeader(this.header) - this.title.style.display = 'inline-block' this.controls = this.theme.getButtonHolder() this.controls.style.margin = '0 0 0 10px' diff --git a/src/theme.js b/src/theme.js index 39334445e..9ab0ab1e9 100644 --- a/src/theme.js +++ b/src/theme.js @@ -127,6 +127,8 @@ export class AbstractTheme { el.appendChild(text) } + el.style.display = 'inline-block' + return el } diff --git a/src/themes/bootstrap4.js b/src/themes/bootstrap4.js index 1189276b9..d92d64f38 100644 --- a/src/themes/bootstrap4.js +++ b/src/themes/bootstrap4.js @@ -328,6 +328,8 @@ export class bootstrap4Theme extends AbstractTheme { el.appendChild(text) } + el.style.display = 'inline-block' + /* cardHeader.appendChild(el) */ return el diff --git a/src/themes/spectre.js b/src/themes/spectre.js index 98923a85a..9147cf555 100644 --- a/src/themes/spectre.js +++ b/src/themes/spectre.js @@ -106,6 +106,8 @@ export class spectreTheme extends AbstractTheme { el.appendChild(text) } + el.style.display = 'inline-block' + return el } From 6cbcdc0740ed8698ee34d4147782b0e1ad38b2f2 Mon Sep 17 00:00:00 2001 From: German Bisurgi Date: Thu, 30 Apr 2020 09:28:27 +0200 Subject: [PATCH 2/3] fix Can't click text to select checkbox in properties #736 --- src/themes/bootstrap4.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/themes/bootstrap4.js b/src/themes/bootstrap4.js index d92d64f38..c153c836a 100644 --- a/src/themes/bootstrap4.js +++ b/src/themes/bootstrap4.js @@ -126,6 +126,11 @@ export class bootstrap4Theme extends AbstractTheme { } } + console.log(label.innerText) + const unique = label.innerText + label.setAttribute('for', unique) + input.setAttribute('id', unique) + check.appendChild(input) check.appendChild(label) if (infoText) check.appendChild(infoText) From e160d842a2e03f557c804a571cfc10fbbf1dc3f2 Mon Sep 17 00:00:00 2001 From: German Bisurgi Date: Thu, 30 Apr 2020 09:39:19 +0200 Subject: [PATCH 3/3] removed console .log --- src/themes/bootstrap4.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/themes/bootstrap4.js b/src/themes/bootstrap4.js index c153c836a..659678c9a 100644 --- a/src/themes/bootstrap4.js +++ b/src/themes/bootstrap4.js @@ -126,7 +126,6 @@ export class bootstrap4Theme extends AbstractTheme { } } - console.log(label.innerText) const unique = label.innerText label.setAttribute('for', unique) input.setAttribute('id', unique)