From f499f1b9a113eaaf412ff8eb9e90000d0b2f578c Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 31 Jul 2018 16:29:07 +0200
Subject: Move locale preview to two lines to reduce grid height
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 settings/templates/settings/personal/personal.info.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'settings')

diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php
index 3e8f31cf073..a0d766f88f3 100644
--- a/settings/templates/settings/personal/personal.info.php
+++ b/settings/templates/settings/personal/personal.info.php
@@ -367,8 +367,9 @@ vendor_style('jcrop/css/jquery.Jcrop');
 						<?php endforeach;?>
 					</select>
 					<div id="localeexample" class="personal-info icon-timezone">
-						<p id="localeexample-time"></p>
-						<p id="localeexample-date"></p>
+						<p>
+							<span id="localeexample-date"></span> <span id="localeexample-time"></span>
+						</p>
 						<p id="localeexample-fdow"></p>
 					</div>
 				</form>
-- 
cgit v1.2.3


From 8abec697b0b544a22dcf0ff7718f97be3231e605 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 31 Jul 2018 16:30:58 +0200
Subject: Make user management heading font size lighter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 settings/css/settings.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'settings')

diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 45511c44dbf..3dd6bf82916 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -1473,7 +1473,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 				top: $grid-row-height;
 			}
 			&#grid-header {
-				color: var(--color-text-light);
+				color: var(--color-text-maxcontrast);
 				z-index: 60; /* above new-user */
 			}
 			&:hover {
-- 
cgit v1.2.3