From 710d6178c1bd87a1c921f2128d1a7a3ea4d5c3a5 Mon Sep 17 00:00:00 2001 From: Sanne de Vries Date: Wed, 16 Sep 2020 15:37:33 +0200 Subject: [PATCH] Added message box on Staff user page that indicates user is locked, and improved boxes naming and styling --- .../gh-post-settings-menu/email.hbs | 2 +- .../app/styles/components/settings-menu.css | 9 ----- ghost/admin/app/styles/layouts/settings.css | 8 ++--- ghost/admin/app/styles/patterns/boxes.css | 35 +++++++++---------- .../app/templates/settings/code-injection.hbs | 2 +- ghost/admin/app/templates/settings/labs.hbs | 4 +-- ghost/admin/app/templates/staff/user.hbs | 4 +++ ghost/admin/public/assets/icons/idea.svg | 4 +-- ghost/admin/public/assets/icons/info.svg | 2 +- 9 files changed, 31 insertions(+), 39 deletions(-) diff --git a/ghost/admin/app/components/gh-post-settings-menu/email.hbs b/ghost/admin/app/components/gh-post-settings-menu/email.hbs index bf73f5d61c..97ce457921 100644 --- a/ghost/admin/app/components/gh-post-settings-menu/email.hbs +++ b/ghost/admin/app/components/gh-post-settings-menu/email.hbs @@ -89,7 +89,7 @@ {{else}} {{!-- Mail not sent yet --}} {{#if this.mailgunError}} -

+

{{svg-jar "info" class="w5 h5 fill-yellow nl1"}} You need to configure Mailgun in Labs → Members settings to enable email newsletters.

diff --git a/ghost/admin/app/styles/components/settings-menu.css b/ghost/admin/app/styles/components/settings-menu.css index c9364d730c..59f2a7aef7 100644 --- a/ghost/admin/app/styles/components/settings-menu.css +++ b/ghost/admin/app/styles/components/settings-menu.css @@ -318,15 +318,6 @@ margin-bottom: 4px; } -.settings-menu-mailgun-warning .gh-box-info { - border-left: var(--yellow); -} - -.settings-menu-mailgun-warning a { - text-decoration: underline; - color: color-mod(var(--yellow) l(-8%) s(+10%)); -} - .settings-menu-email .disabled button, .settings-menu-email .disabled input { opacity: 0.5; diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css index 7841a7844b..9c99693269 100644 --- a/ghost/admin/app/styles/layouts/settings.css +++ b/ghost/admin/app/styles/layouts/settings.css @@ -611,8 +611,8 @@ margin-bottom: 25px; } -.gh-import-errors-warning { - border-left-color: var(--orange); +.gh-import-errors-alert { + border-left-color: color-mod(var(--yellow) l(-8%) s(+10%)); } .gh-import-errors-title { @@ -623,8 +623,8 @@ color: var(--red); } -.gh-import-errors-warning .gh-import-errors-title { - color: var(--orange); +.gh-import-errors-alert .gh-import-errors-title { + color: color-mod(var(--yellow) l(-8%) s(+10%)); } .gh-import-error { diff --git a/ghost/admin/app/styles/patterns/boxes.css b/ghost/admin/app/styles/patterns/boxes.css index 7861e94685..9ed5ee0268 100644 --- a/ghost/admin/app/styles/patterns/boxes.css +++ b/ghost/admin/app/styles/patterns/boxes.css @@ -15,46 +15,45 @@ box-shadow: 0 6px 10px -8px rgba(0,0,0,.15) } +.gh-box a { + color: var(--middarkgrey); + text-decoration: underline; +} + .gh-box svg:first-of-type { position: absolute; - top: 13px; left: 12px; - height: 2.1rem; width: auto; } -.gh-box-info { +.gh-box-tip { border-left-color: var(--blue); } -.gh-box-info svg:first-of-type { +.gh-box-tip svg:first-of-type { + top: 12px; + height: 2rem; fill: var(--blue); } -.gh-box-warning { - border-left-color: var(--yellow); +.gh-box-alert { + border-left-color: color-mod(var(--yellow) l(-8%) s(+10%)); } -.gh-box-warning svg:first-of-type { - fill: var(--yellow); -} - -.gh-box-warning a { - color: var(--yellow); +.gh-box-alert svg:first-of-type { + top: 14px; + height: 1.8rem; + fill: color-mod(var(--yellow) l(-8%) s(+10%)); } .gh-box-error { border-left-color: var(--red); - color: var(--middarkgrey); } .gh-box-error svg:first-of-type { - fill: var(--red); + top: 14px; height: 1.8rem; -} - -.gh-box-error a { - color: var(--red); + fill: var(--red); } .gh-box-error-border { diff --git a/ghost/admin/app/templates/settings/code-injection.hbs b/ghost/admin/app/templates/settings/code-injection.hbs index 9014f5fd3b..25de93ad71 100644 --- a/ghost/admin/app/templates/settings/code-injection.hbs +++ b/ghost/admin/app/templates/settings/code-injection.hbs @@ -18,7 +18,7 @@
-

+

{{svg-jar "idea"}} Ghost allows you to inject code into the top and bottom of your theme files without editing them. This allows for quick modifications to insert useful things like tracking codes and meta tags.

diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs index af03d25d15..61b89aaa6e 100644 --- a/ghost/admin/app/templates/settings/labs.hbs +++ b/ghost/admin/app/templates/settings/labs.hbs @@ -6,7 +6,7 @@
-

{{svg-jar "idea"}}This is a testing ground for new or experimental features. They may change, break or inexplicably disappear at any time.

+

{{svg-jar "idea"}}This is a testing ground for new or experimental features. They may change, break or inexplicably disappear at any time.

{{#if this.session.user.isOwner}}
Members (BETA)
@@ -69,7 +69,7 @@ {{#if this.importErrors}} -
+
{{#if this.importSuccessful}} Import successful with warnings diff --git a/ghost/admin/app/templates/staff/user.hbs b/ghost/admin/app/templates/staff/user.hbs index 13eb8d5a5a..684a3239b9 100644 --- a/ghost/admin/app/templates/staff/user.hbs +++ b/ghost/admin/app/templates/staff/user.hbs @@ -93,6 +93,10 @@
+ {{#if user.isLocked}} +

{{svg-jar "info"}}This user account is locked. To sign in, ask this user to perform a password reset on their account.

+ {{/if}} + {{!--
--}}
diff --git a/ghost/admin/public/assets/icons/idea.svg b/ghost/admin/public/assets/icons/idea.svg index 33aa0a7f17..65d338ff86 100644 --- a/ghost/admin/public/assets/icons/idea.svg +++ b/ghost/admin/public/assets/icons/idea.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/info.svg b/ghost/admin/public/assets/icons/info.svg index b8da26624d..d3d7af3a4d 100644 --- a/ghost/admin/public/assets/icons/info.svg +++ b/ghost/admin/public/assets/icons/info.svg @@ -1 +1 @@ -information-circle \ No newline at end of file + \ No newline at end of file