diff --git a/app/styles/layouts/main.css b/app/styles/layouts/main.css index aaeba9bf60..c59488d55f 100644 --- a/app/styles/layouts/main.css +++ b/app/styles/layouts/main.css @@ -481,7 +481,7 @@ body > .ember-view:not(.default-liquid-destination) { .gh-canvas { flex-grow: 1; - padding: 2.9vw 4vw 3vw 4vw; + padding: 24px 4vw 3vw 4vw; margin: 0 auto; max-width: 1200px; } @@ -502,10 +502,27 @@ body > .ember-view:not(.default-liquid-destination) { padding: 0; text-overflow: ellipsis; white-space: nowrap; - font-size: 3.4rem; + font-size: 2.9rem; line-height: 1.2em; font-weight: 700; letter-spacing: 0.4px; + /* match button height to avoid jump on navigation between screens*/ + min-height: 35px; +} + +.gh-canvas-title a { + color: var(--darkgrey); +} + +.gh-canvas-title span { + display: inline-block; + height: 100%; + vertical-align: baseline; +} + +.gh-canvas-title svg { + height: 0.6em; + margin: 0 10px; } .view-header { diff --git a/app/styles/layouts/user.css b/app/styles/layouts/user.css index 35f6673fd1..2cc69abcd5 100644 --- a/app/styles/layouts/user.css +++ b/app/styles/layouts/user.css @@ -6,8 +6,7 @@ /* ---------------------------------------------------------- */ .user-actions-cog { - margin-right: 10px; - padding: 9px 11px; + margin-right: 10px } .user-actions-cog svg { diff --git a/app/templates/posts-loading.hbs b/app/templates/posts-loading.hbs index bb63084fe5..265fdf256c 100644 --- a/app/templates/posts-loading.hbs +++ b/app/templates/posts-loading.hbs @@ -1,6 +1,6 @@
-

Your stories

+

Your stories

{{#link-to "editor.new" class="gh-btn gh-btn-green" data-test-new-post-button=true}}New story{{/link-to}}
diff --git a/app/templates/posts.hbs b/app/templates/posts.hbs index 5260b08df3..77556021cd 100644 --- a/app/templates/posts.hbs +++ b/app/templates/posts.hbs @@ -1,6 +1,6 @@
-

Your stories

+

Your stories

{{#link-to "editor.new" class="gh-btn gh-btn-green" data-test-new-post-button=true}}New story{{/link-to}}
diff --git a/app/templates/settings/apps.hbs b/app/templates/settings/apps.hbs index a469f7fcef..c24cd68950 100644 --- a/app/templates/settings/apps.hbs +++ b/app/templates/settings/apps.hbs @@ -1,3 +1 @@ -
- {{outlet}} -
+{{outlet}} diff --git a/app/templates/settings/apps/amp.hbs b/app/templates/settings/apps/amp.hbs index b5f6abd75d..23eb20d9ff 100644 --- a/app/templates/settings/apps/amp.hbs +++ b/app/templates/settings/apps/amp.hbs @@ -1,11 +1,17 @@ -
- {{#gh-view-title openMobileMenu="openMobileMenu"}}{{#link-to "settings.apps.index"}}Apps{{/link-to}} {{inline-svg "arrow-right"}} AMP{{/gh-view-title}} -
- {{gh-task-button task=save class="gh-btn gh-btn-blue gh-btn-icon" data-test-save-button=true}} -
-
-
-
+
+
+

+ {{#link-to "settings.apps.index"}}Apps{{/link-to}} + {{inline-svg "arrow-right"}} + AMP +

+
+ {{gh-task-button task=save class="gh-btn gh-btn-blue gh-btn-icon" data-test-save-button=true}} +
+
+ +
+
@@ -15,19 +21,21 @@

Accelerated Mobile Pages

-
-

Enable Google Accelerated Mobile Pages for your site?

-
-
-
- - -
-
+
AMP configuration
+
+
+
Enable AMP
+
Enable Google Accelerated Mobile Pages for your posts
+
+
+
+ +
+
+
diff --git a/app/templates/settings/apps/index.hbs b/app/templates/settings/apps/index.hbs index 751ec46819..6c892e48af 100644 --- a/app/templates/settings/apps/index.hbs +++ b/app/templates/settings/apps/index.hbs @@ -1,57 +1,59 @@ -
-

Apps

-
+
+
+

Apps

+
-
- Available integrations -
-
- {{#link-to "settings.apps.slack" id="slack-link"}} -
-
-
-
-

Slack

-

A team communication tool

+
+ Available integrations +
+
+ {{#link-to "settings.apps.slack" id="slack-link"}} +
+
+
+
+

Slack

+

A team communication tool

+
-
-
-
- {{#if slack.isActive}} - Active - {{else}} - Configure - {{/if}} - {{inline-svg "arrow-right"}} +
+
+ {{#if slack.isActive}} + Active + {{else}} + Configure + {{/if}} + {{inline-svg "arrow-right"}} +
-
-
- {{/link-to}} -
+ + {{/link-to}} +
-
- {{#link-to "settings.apps.amp" id="amp-link"}} -
-
-
-
-

AMP

-

Google Accelerated Mobile Pages

+
+ {{#link-to "settings.apps.amp" id="amp-link"}} +
+
+
+
+

AMP

+

Google Accelerated Mobile Pages

+
-
-
-
- {{#if amp}} - Active - {{else}} - Configure - {{/if}} - {{inline-svg "arrow-right"}} +
+
+ {{#if amp}} + Active + {{else}} + Configure + {{/if}} + {{inline-svg "arrow-right"}} +
-
-
- {{/link-to}} + + {{/link-to}} +
- -

(More coming soon!)

+

(More coming soon!)

+
diff --git a/app/templates/settings/apps/slack.hbs b/app/templates/settings/apps/slack.hbs index 5a6cb83b82..3d52878b3a 100644 --- a/app/templates/settings/apps/slack.hbs +++ b/app/templates/settings/apps/slack.hbs @@ -1,11 +1,17 @@ -
- {{#gh-view-title openMobileMenu="openMobileMenu"}}{{#link-to "settings.apps.index"}}Apps{{/link-to}} {{inline-svg "arrow-right"}} Slack{{/gh-view-title}} -
- {{gh-task-button task=save class="gh-btn gh-btn-blue gh-btn-icon" data-test-save-button=true}} -
-
-
-
+
+
+

+ {{#link-to "settings.apps.index"}}Apps{{/link-to}} + {{inline-svg "arrow-right"}} + Slack +

+
+ {{gh-task-button task=save class="gh-btn gh-btn-blue gh-btn-icon" data-test-save-button=true}} +
+
+ +
+
@@ -15,23 +21,27 @@

A messaging app for teams

-
-

Automatically send newly published posts to a channel in Slack.

-
- {{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="url"}} - - {{gh-input model.url name="slack[url]" update=(action "updateURL") onenter=(action "save") placeholder="https://hooks.slack.com/services/..." data-test-slack-url-input=true}} - {{#unless model.errors.url}} -

Set up a new incoming webhook here, and grab the URL.

- {{else}} - {{gh-error-message errors=model.errors property="url"}} - {{/unless}} - {{/gh-form-group}} +
Slack configuration
+
+
+
Webhook URL
+
Automatically send newly published posts to a channel in Slack
+
+ {{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="url"}} + {{gh-input model.url name="slack[url]" update=(action "updateURL") onenter=(action "save") placeholder="https://hooks.slack.com/services/..." data-test-slack-url-input=true}} + {{#unless model.errors.url}} +

Set up a new incoming webhook here, and grab the URL.

+ {{else}} + {{gh-error-message errors=model.errors property="url"}} + {{/unless}} + {{/gh-form-group}} +
+
+
{{gh-task-button "Send Test Notification" task=sendTestNotification successText="Sent" class="gh-btn gh-btn-grey gh-btn-icon" disabled=testNotificationDisabled data-test-send-notification-button=true}} -
diff --git a/app/templates/settings/code-injection-loading.hbs b/app/templates/settings/code-injection-loading.hbs index db68c80254..589be07966 100644 --- a/app/templates/settings/code-injection-loading.hbs +++ b/app/templates/settings/code-injection-loading.hbs @@ -1,6 +1,6 @@
-

Code injection

+

Code injection

{{gh-task-button task=save class="gh-btn gh-btn-blue gh-btn-icon" disabled=true data-test-save-button=true}}
diff --git a/app/templates/settings/code-injection.hbs b/app/templates/settings/code-injection.hbs index 7eed078ae4..b052d7e10e 100644 --- a/app/templates/settings/code-injection.hbs +++ b/app/templates/settings/code-injection.hbs @@ -1,6 +1,6 @@
-

Code injection

+

Code injection

{{gh-task-button task=save class="gh-btn gh-btn-blue gh-btn-icon" data-test-save-button=true}}
diff --git a/app/templates/settings/design-loading.hbs b/app/templates/settings/design-loading.hbs index fbbd5dd3c4..6a6691c5f1 100644 --- a/app/templates/settings/design-loading.hbs +++ b/app/templates/settings/design-loading.hbs @@ -1,6 +1,6 @@
-

Design

+

Design

{{gh-task-button task=save class="gh-btn gh-btn-blue gh-btn-icon" disabled=true}}
diff --git a/app/templates/settings/design.hbs b/app/templates/settings/design.hbs index 410f17f027..87fc371109 100644 --- a/app/templates/settings/design.hbs +++ b/app/templates/settings/design.hbs @@ -1,6 +1,6 @@
-

Design

+

Design

{{gh-task-button task=save class="gh-btn gh-btn-blue gh-btn-icon" data-test-save-button=true}}
diff --git a/app/templates/settings/general-loading.hbs b/app/templates/settings/general-loading.hbs index c256e454e3..3e669cd04a 100644 --- a/app/templates/settings/general-loading.hbs +++ b/app/templates/settings/general-loading.hbs @@ -1,6 +1,6 @@
-

General

+

General

{{gh-task-button "Save settings" task=save class="gh-btn gh-btn-blue gh-btn-icon" disabled=true data-test-save-button=true}}
diff --git a/app/templates/settings/general.hbs b/app/templates/settings/general.hbs index 8e0c6da53f..f7cda8352a 100644 --- a/app/templates/settings/general.hbs +++ b/app/templates/settings/general.hbs @@ -1,6 +1,6 @@
-

General

+

General

{{gh-task-button "Save settings" task=save class="gh-btn gh-btn-blue gh-btn-icon" data-test-save-button=true}}
diff --git a/app/templates/settings/labs-loading.hbs b/app/templates/settings/labs-loading.hbs index a5e441408b..e6c8bd5e0b 100644 --- a/app/templates/settings/labs-loading.hbs +++ b/app/templates/settings/labs-loading.hbs @@ -1,6 +1,6 @@
-

Labs

+

Labs

diff --git a/app/templates/settings/labs.hbs b/app/templates/settings/labs.hbs index 0c5175153b..47753514de 100644 --- a/app/templates/settings/labs.hbs +++ b/app/templates/settings/labs.hbs @@ -1,6 +1,6 @@
-

Labs

+

Labs

diff --git a/app/templates/subscribers.hbs b/app/templates/subscribers.hbs index 9316638473..341faab8a6 100644 --- a/app/templates/subscribers.hbs +++ b/app/templates/subscribers.hbs @@ -1,6 +1,6 @@
-

Subscribers ({{total}})

+

Subscribers ({{total}})

{{#link-to "subscribers.import" class="gh-btn gh-btn-hover-green"}}Import CSV{{/link-to}} Export CSV diff --git a/app/templates/team/index-loading.hbs b/app/templates/team/index-loading.hbs index bc50aac05d..9bdf481873 100644 --- a/app/templates/team/index-loading.hbs +++ b/app/templates/team/index-loading.hbs @@ -1,6 +1,6 @@
-

Team members

+

Team members

{{!-- Do not show Invite user button to authors --}} {{#unless session.user.isAuthor}}
diff --git a/app/templates/team/index.hbs b/app/templates/team/index.hbs index 5e1ffaee85..d3c25949b3 100644 --- a/app/templates/team/index.hbs +++ b/app/templates/team/index.hbs @@ -1,6 +1,6 @@
-

Team members

+

Team members

{{!-- Do not show Invite user button to authors --}} {{#unless session.user.isAuthor}}
diff --git a/app/templates/team/user-loading.hbs b/app/templates/team/user-loading.hbs index dbd3a75a95..ab1c5bef27 100644 --- a/app/templates/team/user-loading.hbs +++ b/app/templates/team/user-loading.hbs @@ -1,9 +1,10 @@ -
-
- {{#gh-view-title openMobileMenu="openMobileMenu"}} - {{link-to "Team" "team"}} - {{inline-svg "arrow-right"}} - {{/gh-view-title}} +
+
+

+ {{link-to "Team" "team" data-test-team-link=true}} + {{inline-svg "arrow-right"}} + {{user.name}} +

Save
diff --git a/app/templates/team/user.hbs b/app/templates/team/user.hbs index 60f778471e..fece4a9671 100644 --- a/app/templates/team/user.hbs +++ b/app/templates/team/user.hbs @@ -1,13 +1,15 @@ -
-
- {{#gh-view-title openMobileMenu="openMobileMenu"}} +
+
+

{{link-to "Team" "team" data-test-team-link=true}} - {{inline-svg "arrow-right"}} {{user.name}} + {{inline-svg "arrow-right"}} + {{user.name}} {{#if user.isSuspended}} Suspended {{/if}} - {{/gh-view-title}} +

+
{{#if userActionsAreVisible}} @@ -85,164 +87,161 @@
-
-
+ {{! change password form }} + {{/if}} + + {{!-- when using Ghost OAuth, users trying to change email/pass need to visit my.ghost.org --}} + {{#if showMyGhostLink}} + + {{/if}}
diff --git a/tests/acceptance/team-test.js b/tests/acceptance/team-test.js index b6f63a71b2..c54be9bd75 100644 --- a/tests/acceptance/team-test.js +++ b/tests/acceptance/team-test.js @@ -116,10 +116,12 @@ describe('Acceptance: Team', function () { expect(document.title, 'title after clicking user').to.equal('Team - User - Test Blog'); // view title should exist and be linkable and active - expect(find('.view-title a[href="/ghost/team"]').hasClass('active'), 'has linkable url back to team main page') - .to.be.true; + expect( + find(`${testSelector('screen-title')} a[href="/ghost/team"]`).hasClass('active'), + 'has linkable url back to team main page' + ).to.be.true; - await click('.view-title a'); + await click(`${testSelector('screen-title')} a`); // url should be /team again expect(currentURL(), 'url after clicking back').to.equal('/team');