summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-08-02 20:23:21 +0200
committerGitHub <noreply@github.com>2018-08-02 20:23:21 +0200
commit01298cfa72105802533a2f0757c45a50c6d9bc67 (patch)
tree8928e01a103d88d039597dd7816cc1618ccc7b83 /settings
parent9057621d64589d1a45040e9dfbf87dd908e9acbb (diff)
parent84f99db7ab96746b9dc3fa662c136912c34274eb (diff)
downloadnextcloud-server-01298cfa72105802533a2f0757c45a50c6d9bc67.tar.gz
nextcloud-server-01298cfa72105802533a2f0757c45a50c6d9bc67.zip
Merge pull request #10480 from nextcloud/bugfix/10420/settings
Settings design polishing
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.scss2
-rw-r--r--settings/templates/settings/personal/personal.info.php5
2 files changed, 4 insertions, 3 deletions
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 {
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>