diff --git a/ghost/admin/app/styles/layouts/main.css b/ghost/admin/app/styles/layouts/main.css index 597e04962b..a27ef5d531 100644 --- a/ghost/admin/app/styles/layouts/main.css +++ b/ghost/admin/app/styles/layouts/main.css @@ -1228,7 +1228,7 @@ /* Grey background modifiers */ .gh-main-section-content.grey .gh-btn:not(.gh-btn-white):not(.gh-btn-green):not(.gh-btn-blue):not(.gh-btn-red), -.gh-expandable-content .gh-btn:not(.gh-btn-white):not(.gh-btn-green):not(.gh-btn-blue):not(.gh-btn-red) { +.gh-expandable-content .gh-btn:not(.gh-btn-white):not(.gh-btn-green):not(.gh-btn-blue):not(.gh-btn-red):not(.gh-btn-black) { background: var(--whitegrey-d2); } diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css index 5a8df9a670..8731651f20 100644 --- a/ghost/admin/app/styles/layouts/settings.css +++ b/ghost/admin/app/styles/layouts/settings.css @@ -231,9 +231,14 @@ margin-bottom: 0; } +.gh-setting-content-extended p { + color: var(--midgrey); + font-size: 1.3rem; +} + .gh-setting-content-extended label { display: block; - font-size: 1.25rem; + font-size: 1.3rem; font-weight: 600; color: var(--darkgrey); margin-bottom: 4px; @@ -250,6 +255,18 @@ border: 1px solid var(--whitegrey-d2); } +.gh-setting-content-extended .gh-btn span { + height: 36px; + line-height: 36px; +} + +.gh-setting-content-extended svg { + position: relative; + bottom: 1px; + width: 18px; + margin-right: 8px; +} + .gh-setting-liquid-section .liquid-container, .gh-setting-liquid-section .liquid-child { padding: 0 20px; diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs index c0213e3f10..4ade561abd 100644 --- a/ghost/admin/app/templates/settings/labs.hbs +++ b/ghost/admin/app/templates/settings/labs.hbs @@ -205,31 +205,36 @@
{{#if this.isOAuthEnabled}} -
- - To get started, you first have to set up Ghost to allow login and registration with Google OAuth2. Read our +
+ {{svg-jar "google-favicon"}}Configure Ghost in Google +

+ Read our {{!-- TODO: create an help desk article and update the url here --}} - setup guide here - -

Configure Ghost in Google
+ setup guide + to help you get started +

- - +
+ + +
- - +
+ + +
{{/if}} diff --git a/ghost/admin/public/assets/icons/google-favicon.svg b/ghost/admin/public/assets/icons/google-favicon.svg new file mode 100644 index 0000000000..17e2474f85 --- /dev/null +++ b/ghost/admin/public/assets/icons/google-favicon.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file