From 602819d6ab22f1795bd28dad01fc13c893ad46dd Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Mon, 6 Mar 2017 18:06:08 +0100
Subject: [PATCH 1/2] correct sorting of user management settings, wording
Signed-off-by: Jan-Christoph Borchardt
---
settings/templates/users/main.php | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
index 4fd8572029..3688f2296c 100644
--- a/settings/templates/users/main.php
+++ b/settings/templates/users/main.php
@@ -51,13 +51,6 @@ translation('settings');
t('Show storage location')) ?>
-
- />
-
-
/>
@@ -65,6 +58,20 @@ translation('settings');
t('Show user backend')) ?>
+
+ />
+
+
+
+ />
+
+
/>
@@ -73,14 +80,7 @@ translation('settings');
- t('When the password of the new user is left empty an activation email with a link to set the password is send to the user')) ?>
-
-
- />
-
+ t('When the password of a new user is left empty, an activation email with a link to set the password is sent.')) ?>
From 94d4d20c39bcacc7650a290189fe9ef3e4df6712 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Mon, 6 Mar 2017 18:07:07 +0100
Subject: [PATCH 2/2] proper padding for checkboxes in app-settings
Signed-off-by: Jan-Christoph Borchardt
---
core/css/inputs.scss | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 37405172d3..13a164e13f 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -1,12 +1,12 @@
/**
* @copyright Copyright (c) 2016, John Molakvoæ
* @copyright Copyright (c) 2016, Morris Jobke
- * @copyright Copyright (c) 2016, Jan-Christoph Borchardt
* @copyright Copyright (c) 2016, Joas Schilling
* @copyright Copyright (c) 2016, Julius Haertl
* @copyright Copyright (c) 2016, jowi
* @copyright Copyright (c) 2015, Joas Schilling
* @copyright Copyright (c) 2015, Hendrik Leppelsack
+ * @copyright Copyright (c) 2014-2017, Jan-Christoph Borchardt
*
* @license GNU AGPL version 3 or any later version
*
@@ -301,6 +301,21 @@ input {
}
}
}
+#app-settings-content {
+ input {
+ &[type='checkbox'],
+ &[type='radio'] {
+ &.radio,
+ &.checkbox {
+ + label {
+ display: inline-block;
+ width: 100%;
+ padding: 5px 0;
+ }
+ }
+ }
+ }
+}
/* Select2 overriding. Merged to core with vendor stylesheet */
.select2-drop {