diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-28 17:28:27 +0200 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-28 17:28:27 +0200 |
commit | 325403ac24099e5e7d41ca97b4d7b1d2daa8c425 (patch) | |
tree | 5c8955de059c91bef85141dc9f0019c806837dd6 | |
parent | 8c73b13ac870b0a6b75b701f4f52463c198421a5 (diff) | |
download | nextcloud-server-325403ac24099e5e7d41ca97b4d7b1d2daa8c425.tar.gz nextcloud-server-325403ac24099e5e7d41ca97b4d7b1d2daa8c425.zip |
Design fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r-- | core/css/icons.scss | 4 | ||||
-rw-r--r-- | core/img/actions/timezone.svg | 3 | ||||
-rw-r--r-- | settings/css/settings.scss | 9 | ||||
-rw-r--r-- | settings/templates/settings/personal/personal.info.php | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/core/css/icons.scss b/core/css/icons.scss index 6685f53a081..91a90abe27e 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -402,6 +402,10 @@ img, object, video, button, textarea, input, select, div[contenteditable='true'] background-image: url('../img/actions/tag.svg?v=1'); } +.icon-timezone { + background-image: url('../img/actions/timezone.svg?v=1'); +} + .icon-toggle { background-image: url('../img/actions/toggle.svg?v=1'); } diff --git a/core/img/actions/timezone.svg b/core/img/actions/timezone.svg new file mode 100644 index 00000000000..f12c3665749 --- /dev/null +++ b/core/img/actions/timezone.svg @@ -0,0 +1,3 @@ +<svg enable-background="new 0 0 15 15" version="1.1" viewBox="0 0 15 15" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" width="16" height="16"> + <path d="m14.982 7c-0.246-3.744-3.238-6.737-6.982-6.983v-0.017h-1v0.017c-3.744 0.246-6.737 3.239-6.983 6.983h-0.017v1h0.017c0.246 3.744 3.239 6.736 6.983 6.982v0.018h1v-0.018c3.744-0.246 6.736-3.238 6.982-6.982h0.018v-1h-0.018zm-10.287-5.365c-0.483 0.642-0.884 1.447-1.176 2.365h-1.498c0.652-1.017 1.578-1.84 2.674-2.365zm-3.197 3.365h1.758c-0.134 0.632-0.219 1.303-0.246 2h-1.991c0.053-0.704 0.219-1.377 0.479-2zm-0.479 3h1.991c0.027 0.697 0.112 1.368 0.246 2h-1.758c-0.26-0.623-0.426-1.296-0.479-2zm1.002 3h1.497c0.292 0.918 0.693 1.723 1.177 2.365-1.096-0.525-2.022-1.347-2.674-2.365zm4.979 2.936c-1.028-0.275-1.913-1.379-2.45-2.936h2.45v2.936zm0-3.936h-2.731c-0.141-0.623-0.23-1.296-0.259-2h2.99v2zm0-3h-2.99c0.029-0.704 0.118-1.377 0.259-2h2.731v2zm0-3h-2.45c0.537-1.557 1.422-2.661 2.45-2.935v2.935zm5.979 0h-1.496c-0.293-0.918-0.693-1.723-1.178-2.365 1.095 0.525 2.022 1.348 2.674 2.365zm-4.979-2.935c1.027 0.274 1.913 1.378 2.45 2.935h-2.45v-2.935zm0 3.935h2.73c0.142 0.623 0.229 1.296 0.26 2h-2.99v-2zm0 3h2.99c-0.029 0.704-0.118 1.377-0.26 2h-2.73v-2zm0 5.936v-2.936h2.45c-0.537 1.557-1.423 2.661-2.45 2.936zm2.305-0.571c0.483-0.643 0.885-1.447 1.178-2.365h1.496c-0.652 1.018-1.579 1.84-2.674 2.365zm3.197-3.365h-1.758c0.134-0.632 0.219-1.303 0.246-2h1.99c-0.052 0.704-0.218 1.377-0.478 2zm-1.512-3c-0.027-0.697-0.112-1.368-0.246-2h1.758c0.26 0.623 0.426 1.296 0.479 2h-1.991z"/> +</svg> 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> |