summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-06-28 17:28:27 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-06-28 17:28:27 +0200
commit325403ac24099e5e7d41ca97b4d7b1d2daa8c425 (patch)
tree5c8955de059c91bef85141dc9f0019c806837dd6 /settings
parent8c73b13ac870b0a6b75b701f4f52463c198421a5 (diff)
downloadnextcloud-server-325403ac24099e5e7d41ca97b4d7b1d2daa8c425.tar.gz
nextcloud-server-325403ac24099e5e7d41ca97b4d7b1d2daa8c425.zip
Design fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.scss9
-rw-r--r--settings/templates/settings/personal/personal.info.php4
2 files changed, 6 insertions, 7 deletions
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 3770a30b466..cfca22d5bbb 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -103,7 +103,7 @@ input {
.profile-settings-container {
display: inline-grid;
grid-template-columns: 1fr;
- grid-template-rows: 1fr 2fr 1fr;
+ grid-template-rows: 1fr 1fr 1fr 1fr;
}
.personal-show-container {
@@ -124,10 +124,6 @@ select {
}
}
-#localeexample {
- text-align: center;
-}
-
input {
&#pass1,
&#pass2,
@@ -150,7 +146,8 @@ input {
}
.personal-info {
margin-right: 10%;
- margin-bottom: 20px;
+ margin-bottom: 12px;
+ margin-top: 12px;
}
.personal-info[class^='icon-'], .personal-info[class*=' icon-'] {
background-position: 0px 2px;
diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php
index f2cc2700833..1946e3ec66e 100644
--- a/settings/templates/settings/personal/personal.info.php
+++ b/settings/templates/settings/personal/personal.info.php
@@ -341,6 +341,8 @@ vendor_style('jcrop/css/jquery.Jcrop');
</a>
</form>
<?php } ?>
+ </div>
+ <div class="personal-settings-setting-box personal-settings-locale-box">
<?php if (isset($_['activelocale'])) { ?>
<form id="locale" class="section">
<h2>
@@ -366,7 +368,7 @@ vendor_style('jcrop/css/jquery.Jcrop');
</option>
<?php endforeach;?>
</select>
- <div id="localeexample">
+ <div id="localeexample" class="personal-info icon-timezone">
<p id="localeexample-time"></p>
<p id="localeexample-date"></p>
<p id="localeexample-fdow"></p>