diff --git a/ghost/admin/app/styles/layouts/apps.css b/ghost/admin/app/styles/layouts/apps.css index a57946b0ef..bfc69bad86 100644 --- a/ghost/admin/app/styles/layouts/apps.css +++ b/ghost/admin/app/styles/layouts/apps.css @@ -133,8 +133,9 @@ .apps-grid-cell { flex: 1 1 100%; } + .apps-grid-cell:hover { - background: color-mod(var(--lightgrey) l(+5%)); + background: color-mod(var(--lightgrey) l(+6%) s(-2%)); } .apps-card-app { @@ -148,11 +149,21 @@ transition: background 0.3s ease; } +.new-integration-cell .apps-card-app { + padding: 10px 14px; + height: auto; +} + @media (max-width: 500px) { .apps-card-app { min-height: 75px; height: auto; } + + .new-integration-cell .apps-card-app { + min-height: auto; + height: auto; + } } .apps-grid-cell:first-of-type .apps-card-app { @@ -229,7 +240,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - font-size: 1.7rem; + font-size: 1.75rem; line-height: 1.15em; font-weight: bold; } @@ -276,6 +287,7 @@ margin-top: 15px; width: 100%; } + /* Slack /* ---------------------------------------------------------- */ @@ -333,3 +345,14 @@ .app-config-form > .gh-btn-grey:focus { border-color: rgb(223, 225, 227); } + + +/* Custom Integrations +/* ---------------------------------------------------------- */ +.new-webhook-cell td { + padding: 0; +} + +.new-webhook-cell:hover { + background: color-mod(var(--lightgrey) l(+6%) s(-2%)); +} \ No newline at end of file diff --git a/ghost/admin/app/templates/settings/integration.hbs b/ghost/admin/app/templates/settings/integration.hbs index 1c5cfe338b..f1171324ee 100644 --- a/ghost/admin/app/templates/settings/integration.hbs +++ b/ghost/admin/app/templates/settings/integration.hbs @@ -17,7 +17,7 @@
{{#aspect-ratio-box class="flex items-center h-100" ratio="1/1" base="height"}} {{#unless integration.iconImage}} - {{svg-jar "integration" class="w14 h14 stroke-darkgrey"}} + {{svg-jar "integration" class="w14 h14"}} {{/unless}} {{/aspect-ratio-box}} @@ -191,22 +191,32 @@ {{else}} - No webhooks configured - - {{#link-to "settings.integration.webhooks.new" integration classNames="flex items-center" data-test-link="add-webhook"}} - {{svg-jar "add" class="w3 h3 fill-blue mr1"}} Add webhook +
+

+ No webhooks configured +

+ {{#link-to "settings.integration.webhooks.new" integration classNames="flex items-center" + data-test-link="add-webhook"}} +
+ {{svg-jar "add" class="w3 h3 fill-blue-d1"}} + Add webhook +
{{/link-to}} - +
{{/each}} {{#if filteredWebhooks}} - - - {{#link-to "settings.integration.webhooks.new" integration classNames="flex items-center" data-test-link="add-webhook"}} - {{svg-jar "add" class="w3 h3 fill-blue mr1"}} Add webhook + + + {{#link-to "settings.integration.webhooks.new" integration classNames="flex items-center" + data-test-link="add-webhook"}} +
+ {{svg-jar "add" class="w3 h3 fill-blue-d1"}} + Add webhook +
{{/link-to}} diff --git a/ghost/admin/app/templates/settings/integrations.hbs b/ghost/admin/app/templates/settings/integrations.hbs index 9a9652f060..c311251688 100644 --- a/ghost/admin/app/templates/settings/integrations.hbs +++ b/ghost/admin/app/templates/settings/integrations.hbs @@ -156,13 +156,8 @@
-
- Custom integrations - {{#link-to "settings.integrations.new" class="gh-btn gh-btn-green" data-test-button="new-integration"}} - Add custom integration - {{/link-to}} -
+ Custom integrations
{{#each integrations as |integration|}}
@@ -193,17 +188,37 @@ {{/link-to}}
{{else}} -
+
{{#if fetchIntegrations.isRunning}}
{{else}} -

- Create your own custom Ghost integrations
- with dedicated API keys & webhooks -

+
+

+ Create your own custom Ghost integrations with dedicated API keys & webhooks +

+ {{#link-to "settings.integrations.new" class="" data-test-button="new-integration"}} +
+ {{svg-jar "add" class="w3 h3 fill-blue-d1"}} + Add custom integration +
+ {{/link-to}} +
{{/if}}
{{/each}} + + {{#if integrations}} +
+ {{#link-to "settings.integrations.new" class="" data-test-button="new-integration"}} +
+
+ {{svg-jar "add" class="w3 h3 fill-blue-d1"}} + Add custom integration +
+
+ {{/link-to}} +
+ {{/if}}
diff --git a/ghost/admin/public/assets/icons/integration.svg b/ghost/admin/public/assets/icons/integration.svg index 302b3f0512..d07eab2fc8 100644 --- a/ghost/admin/public/assets/icons/integration.svg +++ b/ghost/admin/public/assets/icons/integration.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file