From 833ea4e06ee6f48d4f839640031ff15df2228dae Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Fri, 24 Jan 2020 15:26:20 +0100
Subject: [PATCH] Connect labels with their form fields
---
js/src/admin/components/MailPage.js | 18 ++++++++++++------
less/admin/MailPage.less | 9 +--------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/js/src/admin/components/MailPage.js b/js/src/admin/components/MailPage.js
index c1540d5bb..fb3350dbf 100644
--- a/js/src/admin/components/MailPage.js
+++ b/js/src/admin/components/MailPage.js
@@ -73,8 +73,10 @@ export default class MailPage extends Page {
className: 'MailPage-MailSettings',
children: [
<div className="MailPage-MailSettings-input">
- <label>{app.translator.trans('core.admin.email.from_label')}</label>
- <input className="FormControl" value={this.values.mail_from() || ''} oninput={m.withAttr('value', this.values.mail_from)} />
+ <label>
+ {app.translator.trans('core.admin.email.from_label')}
+ <input className="FormControl" value={this.values.mail_from() || ''} oninput={m.withAttr('value', this.values.mail_from)} />
+ </label>
</div>
]
})}
@@ -84,8 +86,10 @@ export default class MailPage extends Page {
className: 'MailPage-MailSettings',
children: [
<div className="MailPage-MailSettings-input">
- <label>{app.translator.trans('core.admin.email.driver_label')}</label>
- <Select value={this.values.mail_driver()} options={Object.keys(this.driverFields).reduce((memo, val) => ({...memo, [val]: val}), {})} onchange={this.values.mail_driver} />
+ <label>
+ {app.translator.trans('core.admin.email.driver_label')}
+ <Select value={this.values.mail_driver()} options={Object.keys(this.driverFields).reduce((memo, val) => ({...memo, [val]: val}), {})} onchange={this.values.mail_driver} />
+ </label>
</div>
]
})}
@@ -101,8 +105,10 @@ export default class MailPage extends Page {
children: [
<div className="MailPage-MailSettings-input">
{fieldKeys.map(field => [
- <label>{app.translator.trans(`core.admin.email.${field}_label`)}</label>,
- this.renderField(field),
+ <label>
+ {app.translator.trans(`core.admin.email.${field}_label`)}
+ {this.renderField(field)}
+ </label>,
this.status.errors[field] && <p className='ValidationError'>{this.status.errors[field]}</p>,
])}
</div>
diff --git a/less/admin/MailPage.less b/less/admin/MailPage.less
index 66756ce09..63348b21f 100644
--- a/less/admin/MailPage.less
+++ b/less/admin/MailPage.less
@@ -22,18 +22,11 @@
.MailPage-MailSettings-input {
label {
- margin-bottom: 5px;
- }
-
- .FormControl {
+ display: block;
margin-bottom: 7px;
}
.Select {
display: block;
}
-
- :last-child {
- margin-bottom: 0;
- }
}