From 325403ac24099e5e7d41ca97b4d7b1d2daa8c425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 28 Jun 2018 17:28:27 +0200 Subject: [PATCH] Design fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/icons.scss | 4 ++++ core/img/actions/timezone.svg | 3 +++ settings/css/settings.scss | 9 +++------ settings/templates/settings/personal/personal.info.php | 4 +++- 4 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 core/img/actions/timezone.svg diff --git a/core/css/icons.scss b/core/css/icons.scss index 6685f53a08..91a90abe27 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 0000000000..f12c366574 --- /dev/null +++ b/core/img/actions/timezone.svg @@ -0,0 +1,3 @@ + + + diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 3770a30b46..cfca22d5bb 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 f2cc270083..1946e3ec66 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'); + +

@@ -366,7 +368,7 @@ vendor_style('jcrop/css/jquery.Jcrop'); -
+