diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo index 80770942a6..1a2ecb0ddb 100644 --- a/ghost/admin/.lint-todo +++ b/ghost/admin/.lint-todo @@ -488,10 +488,6 @@ add|ember-template-lint|require-valid-alt-text|19|24|19|24|c1a223c4a0c265ed64685 add|ember-template-lint|no-autofocus-attribute|14|4|14|4|bc0a12a01d16038dd3224726d5c4fe81b2d458b6|1658102400000|1668474000000|1673658000000|app/components/gh-input-with-select/trigger.hbs add|ember-template-lint|no-down-event-binding|8|9|8|9|e82f6aa36fd44bb3dccff09770613eee19380f9b|1658102400000|1668474000000|1673658000000|app/components/gh-input-with-select/trigger.hbs add|ember-template-lint|require-input-label|4|0|4|0|ce9c488b3c6a110afe45e2242fb068fd4ed61f22|1658102400000|1668474000000|1673658000000|app/components/gh-input-with-select/trigger.hbs -add|ember-template-lint|no-action|63|39|63|39|dcc09bb23a476d5b83b273b693cd8cb2aba68365|1658102400000|1668474000000|1673658000000|app/components/gh-launch-wizard/set-pricing.hbs -add|ember-template-lint|no-action|78|39|78|39|a80dd18e18dda6fb6f1f97d87bef2b8c2ce3d847|1658102400000|1668474000000|1673658000000|app/components/gh-launch-wizard/set-pricing.hbs -add|ember-template-lint|no-passed-in-event-handlers|63|32|63|32|dcb4785647a50814bcfce82f8d68ac8dd8f54ec2|1658102400000|1668474000000|1673658000000|app/components/gh-launch-wizard/set-pricing.hbs -add|ember-template-lint|no-passed-in-event-handlers|78|32|78|32|70487c008d7dda453fef82f0140699ee93c0055c|1658102400000|1668474000000|1673658000000|app/components/gh-launch-wizard/set-pricing.hbs add|ember-template-lint|no-invalid-interactive|6|32|6|32|508e64575a985432d0588f3291a126c4b62e68d8|1658102400000|1668474000000|1673658000000|app/components/gh-nav-menu/design.hbs add|ember-template-lint|no-action|97|83|97|83|40a33b8afd29e93eebeaccdb49d729c06f755e1f|1658102400000|1668474000000|1673658000000|app/components/gh-nav-menu/footer.hbs add|ember-template-lint|no-invalid-interactive|97|83|97|83|91111b837d1217ec9988076f5263b0e32df72604|1658102400000|1668474000000|1673658000000|app/components/gh-nav-menu/footer.hbs diff --git a/ghost/admin/app/components/gh-benefit-item.hbs b/ghost/admin/app/components/gh-benefit-item.hbs index cf1d14dc99..d6fdcdfbbe 100644 --- a/ghost/admin/app/components/gh-benefit-item.hbs +++ b/ghost/admin/app/components/gh-benefit-item.hbs @@ -33,7 +33,7 @@ {{#if this.benefitItem.isNew}} {{else}} - - {{else}} - - {{/if}} -
- -
- - - - -
- -
-
Publication logo
-
The primary logo for your brand displayed across your theme, should be transparent and at least 600px x 72px
- -
- {{#each uploader.errors as |error|}} -
{{or error.context error.message}}
- {{/each}} - {{#if uploader.isUploading}} - {{uploader.progressBar}} - {{else if this.settings.logo}} -
- - -
- {{else}} - - {{/if}} -
- -
-
-
- -
- -
- -
-
Publication cover
-
An optional large background image for your site
- {{#each uploader.errors as |error|}} -
{{or error.context error.message}}
- {{/each}} - -
- {{#if uploader.isUploading}} - {{uploader.progressBar}} - {{else if this.settings.coverImage}} -
- cover photo - -
- {{else}} - - {{/if}} -
- -
-
-
- -
- \ No newline at end of file diff --git a/ghost/admin/app/components/gh-brand-settings-form.js b/ghost/admin/app/components/gh-brand-settings-form.js deleted file mode 100644 index bbab00ce2e..0000000000 --- a/ghost/admin/app/components/gh-brand-settings-form.js +++ /dev/null @@ -1,170 +0,0 @@ -import Component from '@glimmer/component'; -import config from 'ghost-admin/config/environment'; -import { - ICON_EXTENSIONS, - ICON_MIME_TYPES, - IMAGE_EXTENSIONS, - IMAGE_MIME_TYPES -} from 'ghost-admin/components/gh-image-uploader'; -import {action} from '@ember/object'; -import {htmlSafe} from '@ember/template'; -import {inject as service} from '@ember/service'; -import {task, timeout} from 'ember-concurrency'; - -export default class GhBrandSettingsFormComponent extends Component { - @service ajax; - @service config; - @service ghostPaths; - @service settings; - @service frontend; - - iconExtensions = ICON_EXTENSIONS; - iconMimeTypes = ICON_MIME_TYPES; - imageExtensions = IMAGE_EXTENSIONS; - imageMimeTypes = IMAGE_MIME_TYPES; - - get accentColor() { - const color = this.settings.get('accentColor'); - if (color && color[0] === '#') { - return color.slice(1); - } - return color; - } - - get accentColorPickerValue() { - return this.settings.get('accentColor') || '#ffffff'; - } - - get accentColorBgStyle() { - return htmlSafe(`background-color: ${this.accentColorPickerValue}`); - } - - get previewData() { - const params = new URLSearchParams(); - - params.append('c', this.accentColorPickerValue); - params.append('icon', this.settings.get('icon')); - params.append('logo', this.settings.get('logo')); - params.append('cover', this.settings.get('coverImage')); - - return params.toString(); - } - - constructor() { - super(...arguments); - this.updatePreviewTask.perform(); - } - - willDestroy() { - super.willDestroy?.(...arguments); - this.settings.errors.remove('accentColor'); - this.settings.rollbackAttributes(); - } - - @action - triggerFileDialog({target}) { - target.closest('.gh-setting-action')?.querySelector('input[type="file"]')?.click(); - } - - @action - async imageUploaded(property, results) { - if (results[0]) { - this.settings.set(property, results[0].url); - this.updatePreviewTask.perform(); - } - } - - @action - async removeImage(imageName) { - this.settings.set(imageName, ''); - this.updatePreviewTask.perform(); - } - - @action - blurElement(event) { - event.preventDefault(); - event.target.blur(); - } - - @action - async updateAccentColor(event) { - let newColor = event.target.value; - const oldColor = this.settings.get('accentColor'); - - // reset errors and validation - this.settings.errors.remove('accentColor'); - this.settings.hasValidated.removeObject('accentColor'); - - if (newColor === '') { - if (newColor === oldColor) { - return; - } - - // Don't allow empty accent color - this.settings.errors.add('accentColor', 'Please select an accent color'); - this.settings.hasValidated.pushObject('accentColor'); - return; - } - - // accentColor will be null unless the user has input something - if (!newColor) { - newColor = oldColor; - } - - if (newColor[0] !== '#') { - newColor = `#${newColor}`; - } - - if (newColor.match(/#[0-9A-Fa-f]{6}$/)) { - if (newColor === oldColor) { - return; - } - - this.settings.set('accentColor', newColor); - this.updatePreviewTask.perform(); - } else { - this.settings.errors.add('accentColor', 'Please enter a color in hex format'); - this.settings.hasValidated.pushObject('accentColor'); - } - } - - @task({restartable: true}) - *debounceUpdateAccentColor(event) { - yield timeout(500); - this.updateAccentColor(event); - } - - @task - *updatePreviewTask() { - // skip during testing because we don't have mocks for the front-end - if (config.environment === 'test') { - return; - } - - const previewResponse = yield this.frontend.fetch('/', { - method: 'POST', - headers: { - 'Content-Type': 'text/html;charset=utf-8', - 'x-ghost-preview': this.previewData, - Accept: 'text/plain' - } - }); - const previewContents = yield previewResponse.text(); - - // inject extra CSS to disable navigation and prevent clicks - const injectedCss = `html { pointer-events: none; }`; - - const domParser = new DOMParser(); - const htmlDoc = domParser.parseFromString(previewContents, 'text/html'); - - const stylesheet = htmlDoc.querySelector('style'); - const originalCSS = stylesheet.innerHTML; - stylesheet.innerHTML = `${originalCSS}\n\n${injectedCss}`; - - const doctype = new XMLSerializer().serializeToString(htmlDoc.doctype); - const html = doctype + htmlDoc.documentElement.outerHTML; - - // replace the iframe contents with the doctored preview html - this.args.replacePreviewContents(html); - } -} diff --git a/ghost/admin/app/components/gh-input-with-select/suggested-option.hbs b/ghost/admin/app/components/gh-input-with-select/suggested-option.hbs index 11d9bd9711..b058f60748 100644 --- a/ghost/admin/app/components/gh-input-with-select/suggested-option.hbs +++ b/ghost/admin/app/components/gh-input-with-select/suggested-option.hbs @@ -1 +1 @@ -{{@option.text}}{{svg-jar "add"}} \ No newline at end of file +{{@option.text}}{{svg-jar "plus"}} \ No newline at end of file diff --git a/ghost/admin/app/components/gh-member-label-input.hbs b/ghost/admin/app/components/gh-member-label-input.hbs index 8d436b7f19..5e522da43b 100644 --- a/ghost/admin/app/components/gh-member-label-input.hbs +++ b/ghost/admin/app/components/gh-member-label-input.hbs @@ -24,8 +24,10 @@ {{label.name}} {{#if (and @allowEdit label.slug)}} - {{/if}} diff --git a/ghost/admin/app/components/gh-member-settings-form.hbs b/ghost/admin/app/components/gh-member-settings-form.hbs index 72fcbe9818..66811b431a 100644 --- a/ghost/admin/app/components/gh-member-settings-form.hbs +++ b/ghost/admin/app/components/gh-member-settings-form.hbs @@ -123,7 +123,7 @@ {{on "click" (toggle-action "showMemberTierModal" this)}} data-test-button="add-complimentary" > - {{svg-jar "add"}} Add complimentary subscription + {{svg-jar "plus"}} Add complimentary subscription {{/if}} {{/if}} @@ -214,7 +214,7 @@ @@ -241,7 +241,7 @@ {{else}} - + {{svg-jar "dotdotdot"}} @@ -297,7 +297,7 @@
yearly
- + {{svg-jar "dotdotdot"}} @@ -329,7 +329,7 @@ {{on "click" (toggle-action "showMemberTierModal" this)}} data-test-button="add-complimentary" > - {{svg-jar "add"}} Add complimentary subscription + {{svg-jar "plus"}} Add complimentary subscription {{/if}} diff --git a/ghost/admin/app/components/gh-membership-tiers-alpha.hbs b/ghost/admin/app/components/gh-membership-tiers-alpha.hbs index b4b2755122..77e17a2834 100644 --- a/ghost/admin/app/components/gh-membership-tiers-alpha.hbs +++ b/ghost/admin/app/components/gh-membership-tiers-alpha.hbs @@ -36,7 +36,7 @@ {{#if (eq this.type "active" )}}
{{/if}} diff --git a/ghost/admin/app/components/gh-nav-menu/main.hbs b/ghost/admin/app/components/gh-nav-menu/main.hbs index 7b43d86f6b..9890f54b2f 100644 --- a/ghost/admin/app/components/gh-nav-menu/main.hbs +++ b/ghost/admin/app/components/gh-nav-menu/main.hbs @@ -36,7 +36,7 @@
  • {{svg-jar "posts"}}Posts - {{svg-jar "add-stroke"}} + {{svg-jar "plus"}} {{#if this.session.user.isAuthorOrContributor}} {{#if this.customViews.forPosts}}
      diff --git a/ghost/admin/app/components/gh-navitem.hbs b/ghost/admin/app/components/gh-navitem.hbs index 83c2f709f9..15e509cfac 100644 --- a/ghost/admin/app/components/gh-navitem.hbs +++ b/ghost/admin/app/components/gh-navitem.hbs @@ -45,7 +45,7 @@ {{#if this.navItem.isNew}} {{else}} + {{/unless}} 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 af1e45bc32..7ea00cda10 100644 --- a/ghost/admin/app/components/gh-post-settings-menu/email.hbs +++ b/ghost/admin/app/components/gh-post-settings-menu/email.hbs @@ -88,7 +88,7 @@ {{!-- Mail not sent yet --}} {{#if this.mailgunError}}

      - {{svg-jar "info" class="w5 h5 fill-yellow nl1"}} + {{svg-jar "info" class="w5 h5 stroke-yellow nl1"}} You need to configure Mailgun in Settings → Email newsletter to enable email newsletters.

      {{/if}} diff --git a/ghost/admin/app/components/gh-posts-list-item.hbs b/ghost/admin/app/components/gh-posts-list-item.hbs index 1cb82b1a66..c4919ed467 100644 --- a/ghost/admin/app/components/gh-posts-list-item.hbs +++ b/ghost/admin/app/components/gh-posts-list-item.hbs @@ -74,7 +74,7 @@ {{#if @post.isDraft}} - {{svg-jar "pen-stroke" class="gh-post-status-icon"}} + {{svg-jar "pen" class="gh-post-status-icon"}} Draft {{/if}} diff --git a/ghost/admin/app/components/gh-theme-table.hbs b/ghost/admin/app/components/gh-theme-table.hbs index cb5eb11a97..edd953c6c0 100644 --- a/ghost/admin/app/components/gh-theme-table.hbs +++ b/ghost/admin/app/components/gh-theme-table.hbs @@ -13,7 +13,7 @@ {{/unless}} - {{svg-jar "dotdotdot"}} + {{svg-jar "dotdotdot"}}
        diff --git a/ghost/admin/app/components/gh-tier-card.hbs b/ghost/admin/app/components/gh-tier-card.hbs index 4fb7e34d3d..f0ea6c4bef 100644 --- a/ghost/admin/app/components/gh-tier-card.hbs +++ b/ghost/admin/app/components/gh-tier-card.hbs @@ -67,7 +67,7 @@ diff --git a/ghost/admin/app/components/members/filter.hbs b/ghost/admin/app/components/members/filter.hbs index 54b150db56..30f81f2095 100644 --- a/ghost/admin/app/components/members/filter.hbs +++ b/ghost/admin/app/components/members/filter.hbs @@ -70,7 +70,7 @@ {{on "click" this.addFilter}} data-test-button="add-members-filter" > - {{svg-jar "add"}} Add filter + {{svg-jar "plus"}} Add filter diff --git a/ghost/admin/app/components/modal-members-label-form.hbs b/ghost/admin/app/components/modal-members-label-form.hbs index a0d06a1627..93223ccf0f 100644 --- a/ghost/admin/app/components/modal-members-label-form.hbs +++ b/ghost/admin/app/components/modal-members-label-form.hbs @@ -55,7 +55,7 @@ class="gh-btn gh-btn-red gh-btn-icon" data-test-button="delete-label" type="button" {{on "click" (action "toggleDeleteLabelModal")}} {{on "mousedown" (optional this.noop)}} > - {{svg-jar "trash"}} Delete + Delete {{/if}} diff --git a/ghost/admin/app/components/modal-portal-settings.hbs b/ghost/admin/app/components/modal-portal-settings.hbs index 19796fd88a..902e26db41 100644 --- a/ghost/admin/app/components/modal-portal-settings.hbs +++ b/ghost/admin/app/components/modal-portal-settings.hbs @@ -226,7 +226,7 @@ data-test-icon-img > {{#if (eq this.membersUtils.buttonIcon this.customIcon)}} - {{/if}} diff --git a/ghost/admin/app/components/modals/custom-view-form.hbs b/ghost/admin/app/components/modals/custom-view-form.hbs index c33782cad4..7e6ba6288f 100644 --- a/ghost/admin/app/components/modals/custom-view-form.hbs +++ b/ghost/admin/app/components/modals/custom-view-form.hbs @@ -61,7 +61,6 @@ class="gh-btn gh-btn-red gh-btn-icon" data-test-button="delete-custom-view" type="button" {{on "click" (perform this.deleteTask)}} {{on "mousedown" (optional this.noop)}} > - {{svg-jar "trash"}} Delete {{/if}} diff --git a/ghost/admin/app/components/settings/audit-log/event-filter.js b/ghost/admin/app/components/settings/audit-log/event-filter.js index f0c25cfce8..6119d85052 100644 --- a/ghost/admin/app/components/settings/audit-log/event-filter.js +++ b/ghost/admin/app/components/settings/audit-log/event-filter.js @@ -2,7 +2,7 @@ import Component from '@glimmer/component'; import {action} from '@ember/object'; const ALL_EVENT_TYPES = [ - {event: 'added', name: 'Added', icon: 'add'}, + {event: 'added', name: 'Added', icon: 'plus-large'}, {event: 'edited', name: 'Edited', icon: 'pen'}, {event: 'deleted', name: 'Deleted', icon: 'trash'} ]; diff --git a/ghost/admin/app/components/settings/form-fields/publication-cover.hbs b/ghost/admin/app/components/settings/form-fields/publication-cover.hbs index 819b1ef228..b2efd5a7e4 100644 --- a/ghost/admin/app/components/settings/form-fields/publication-cover.hbs +++ b/ghost/admin/app/components/settings/form-fields/publication-cover.hbs @@ -25,7 +25,7 @@ data-test-cover-img > {{else}} diff --git a/ghost/admin/app/components/settings/form-fields/publication-icon.hbs b/ghost/admin/app/components/settings/form-fields/publication-icon.hbs index acf961b95c..eb8885d4e1 100644 --- a/ghost/admin/app/components/settings/form-fields/publication-icon.hbs +++ b/ghost/admin/app/components/settings/form-fields/publication-icon.hbs @@ -26,7 +26,7 @@ data-test-icon-img > {{else}} diff --git a/ghost/admin/app/components/settings/form-fields/publication-logo.hbs b/ghost/admin/app/components/settings/form-fields/publication-logo.hbs index 800fb3a4cd..53b1c8c8ff 100644 --- a/ghost/admin/app/components/settings/form-fields/publication-logo.hbs +++ b/ghost/admin/app/components/settings/form-fields/publication-logo.hbs @@ -25,7 +25,7 @@ data-test-logo-img > {{else}} diff --git a/ghost/admin/app/components/settings/newsletters/newsletter-management.hbs b/ghost/admin/app/components/settings/newsletters/newsletter-management.hbs index 002c5dd95a..c6d2f6dba4 100644 --- a/ghost/admin/app/components/settings/newsletters/newsletter-management.hbs +++ b/ghost/admin/app/components/settings/newsletters/newsletter-management.hbs @@ -84,7 +84,7 @@ Customize → {{else}} - + {{svg-jar "dotdotdot"}} @@ -123,5 +123,5 @@ {{/if}} - {{svg-jar "add-stroke"}}Add newsletter + {{svg-jar "plus"}}Add newsletter diff --git a/ghost/admin/app/helpers/parse-audit-log-event.js b/ghost/admin/app/helpers/parse-audit-log-event.js index dc14234164..9422f5ec1f 100644 --- a/ghost/admin/app/helpers/parse-audit-log-event.js +++ b/ghost/admin/app/helpers/parse-audit-log-event.js @@ -147,7 +147,7 @@ function getLinkTarget(ev) { function getActionIcon(ev) { switch (ev.event) { case 'added': - return 'add'; + return 'plus-large'; case 'edited': return 'pen'; case 'deleted': diff --git a/ghost/admin/app/services/custom-views.js b/ghost/admin/app/services/custom-views.js index dda105bfa4..6364e15d30 100644 --- a/ghost/admin/app/services/custom-views.js +++ b/ghost/admin/app/services/custom-views.js @@ -55,7 +55,7 @@ const DEFAULT_VIEWS = [{ route: 'posts', name: 'Drafts', color: 'midgrey', - icon: 'pencil', + icon: 'pen', filter: { type: 'draft' } diff --git a/ghost/admin/app/styles/app-dark.css b/ghost/admin/app/styles/app-dark.css index ac3eea8d51..64c3366cdd 100644 --- a/ghost/admin/app/styles/app-dark.css +++ b/ghost/admin/app/styles/app-dark.css @@ -66,7 +66,6 @@ @import "layouts/preview-email.css"; @import "layouts/portal-settings.css"; @import "layouts/billing.css"; -@import "layouts/fullscreen-wizard.css"; @import "layouts/post-preview.css"; @import "layouts/dashboard.css"; @import "layouts/tiers.css"; @@ -1086,34 +1085,6 @@ input:focus, background: var(--main-color-content-greybg) } -/* Launch-site wizard */ -.fullscreen-wizard-container { - background: var(--dark-main-bg-color); -} - -.gh-launch-wizard-content { - background: var(--dark-main-bg-color); - border-top: 1px solid var(--hairline-color-1); -} - -.gh-launch-wizard-btn { - color: var(--black); - background: var(--green-d1); -} - -.gh-launch-wizard-btn:hover { - color: #fff; - background: var(--green) !important; -} - -.gh-launch-wizard-btn svg { - fill: var(--black); -} - -.gh-lw-banner { - border: 1px solid color-mod(var(--green) a(60%)); -} - .gh-dashboard-box { flex: 1; border: 1px solid var(--lightgrey); diff --git a/ghost/admin/app/styles/app.css b/ghost/admin/app/styles/app.css index b10373a4eb..7fad4ead6c 100644 --- a/ghost/admin/app/styles/app.css +++ b/ghost/admin/app/styles/app.css @@ -66,7 +66,6 @@ @import "layouts/preview-email.css"; @import "layouts/portal-settings.css"; @import "layouts/billing.css"; -@import "layouts/fullscreen-wizard.css"; @import "layouts/post-preview.css"; @import "layouts/dashboard.css"; @import "layouts/tiers.css"; diff --git a/ghost/admin/app/styles/components/dropdowns.css b/ghost/admin/app/styles/components/dropdowns.css index b507ea48b6..87c25c646f 100644 --- a/ghost/admin/app/styles/components/dropdowns.css +++ b/ghost/admin/app/styles/components/dropdowns.css @@ -241,14 +241,7 @@ .dropdown-action .dropdown-action-icon svg { margin: 0; -} - -.dropdown-action .dropdown-action-icon svg path { - fill: var(--midgrey); -} - -.dropdown-action .dropdown-action-icon:hover svg path { - fill: var(--darkgrey); + fill: none; } .dropdown-action .dropdown-footer { @@ -299,6 +292,11 @@ .gh-member-settings .gh-member-label-input .dropdown-action-icon { margin-right: -8px; padding: 4px 6px; + color: var(--midgrey); +} + +.gh-member-settings .gh-member-label-input .dropdown-action-icon:hover { + color: var(--darkgrey); } .gh-member-label-input li:hover .dropdown-action-icon { @@ -314,13 +312,5 @@ height: 14px; width: 14px; line-height: 1em; - fill: #667380; -} - -.gh-member-label-input .dropdown-action-icon svg path { - fill: var(--midgrey); -} - -.gh-member-label-input .dropdown-action-icon:hover svg path { - fill: var(--darkgrey); + fill: none; } diff --git a/ghost/admin/app/styles/components/filter-builder.css b/ghost/admin/app/styles/components/filter-builder.css index 8ae18ca807..eb93d03f89 100644 --- a/ghost/admin/app/styles/components/filter-builder.css +++ b/ghost/admin/app/styles/components/filter-builder.css @@ -51,6 +51,11 @@ width: 20px; height: 33px; margin-left: 4px; + color: var(--middarkgrey); +} + +.gh-filter-builder .gh-delete-filter:hover { + color: var(--red); } .gh-filter-builder .gh-delete-filter svg { @@ -58,21 +63,10 @@ height: 10px; } -.gh-filter-builder .gh-delete-filter svg path { - stroke: var(--middarkgrey); -} - -.gh-filter-builder .gh-delete-filter:hover svg path { - stroke: var(--red); -} - .gh-add-filter svg { - margin-right: 7px; -} - -.gh-add-filter svg path { - stroke: none !important; - fill: var(--green-d1); + width: 10px; + height: 10px; + margin: 0 6px 0 2px; } .gh-filter-builder .gh-filter-block-divider { diff --git a/ghost/admin/app/styles/components/koenig.css b/ghost/admin/app/styles/components/koenig.css index 22c83ec9f3..a5376e46dc 100644 --- a/ghost/admin/app/styles/components/koenig.css +++ b/ghost/admin/app/styles/components/koenig.css @@ -927,15 +927,7 @@ .kg-cardmenu-card-hover .kg-cardmenu-action-icon svg { margin: 0; - height: 1em; -} - -.kg-cardmenu-card-hover .kg-cardmenu-action-icon svg path { - fill: var(--red); -} - -.kg-cardmenu-card-hover .kg-cardmenu-action-icon:hover svg path { - fill: var(--red); + height: 1.6rem; } /* Padded container housing title + editor canvas, scrollable content */ @@ -980,11 +972,13 @@ border-color: var(--darkgrey); } -.koenig-plus-menu-button:hover svg path, -.koenig-plus-menu-button:hover svg g { - stroke: var(--darkgrey); +.koenig-plus-menu-button svg path { + stroke-width: 1.2; } +.koenig-plus-menu-button:hover svg path { + stroke: var(--darkgrey); +} @media (max-width: 500px) { .koenig-plus-menu-button { @@ -3040,7 +3034,7 @@ button.emoji-picker__category-button.active { } .kg-settings-headerstyle-btn-group .kg-headerstyle-btn-image svg path { - stroke: var(--midgrey); + stroke-width: 1.5; } .kg-settings-headerstyle-btn-group .gh-btn-group-selected { diff --git a/ghost/admin/app/styles/components/modals.css b/ghost/admin/app/styles/components/modals.css index bc57555701..08e41f98d8 100644 --- a/ghost/admin/app/styles/components/modals.css +++ b/ghost/admin/app/styles/components/modals.css @@ -473,10 +473,12 @@ height: 44px; background: var(--black) !important; opacity: 0; + color: var(--whitegrey-d1); } .gh-header-img-deleteicon:hover { opacity: 1; + color: var(--whitegrey-d1); } .gh-header-img-deleteicon span { diff --git a/ghost/admin/app/styles/components/power-select.css b/ghost/admin/app/styles/components/power-select.css index 8c538d1e76..f63df12d9e 100644 --- a/ghost/admin/app/styles/components/power-select.css +++ b/ghost/admin/app/styles/components/power-select.css @@ -459,7 +459,6 @@ } .gh-btn-create-snippet svg { - width: 1.4rem; - height: 1.4rem; - fill: var(--green-d1) + width: 1.2rem; + height: 1.2rem; } diff --git a/ghost/admin/app/styles/components/settings-menu.css b/ghost/admin/app/styles/components/settings-menu.css index 93a3505c68..f87d304bc2 100644 --- a/ghost/admin/app/styles/components/settings-menu.css +++ b/ghost/admin/app/styles/components/settings-menu.css @@ -12,10 +12,6 @@ margin-right: 0 !important; } -.settings-menu-toggle svg { - fill: none !important; -} - .settings-menu-toggle .settings-menu-open svg path { stroke: var(--black); } @@ -291,6 +287,7 @@ .settings-menu-delete-button:hover { box-shadow: none; background: none; + color: color-mod(var(--red) lightness(-10%)); } .settings-menu-delete-button span { @@ -299,20 +296,9 @@ } .settings-menu-delete-button svg { - margin-bottom: 1px; -} - -.settings-menu-delete-button svg path { - stroke: var(--red); - fill: var(--red); - stroke-width: 1px; -} - -.settings-menu-delete-button:hover, -.settings-menu-delete-button:hover svg path { - stroke: color-mod(var(--red) lightness(-10%)); - fill: color-mod(var(--red) lightness(-10%)); - color: color-mod(var(--red) lightness(-10%)); + width: 1.6rem; + height: 1.6rem; + margin-right: .8rem; } .post-setting-custom-excerpt { diff --git a/ghost/admin/app/styles/components/uploader.css b/ghost/admin/app/styles/components/uploader.css index 7bcea470fe..e9c730fbf4 100644 --- a/ghost/admin/app/styles/components/uploader.css +++ b/ghost/admin/app/styles/components/uploader.css @@ -81,7 +81,6 @@ width: 13px; height: 13px; margin: 0 !important; - fill: #fff; } .image-delete:hover { diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css index 4678158d5f..9056fb8783 100644 --- a/ghost/admin/app/styles/layouts/editor.css +++ b/ghost/admin/app/styles/layouts/editor.css @@ -484,8 +484,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { } .gh-editor-feature-image-add-button svg path { - stroke: var(--midgrey-l2); - stroke-width: 2; + stroke-width: 1.8; } .gh-editor-feature-image-add-button:hover svg path { diff --git a/ghost/admin/app/styles/layouts/fullscreen-wizard.css b/ghost/admin/app/styles/layouts/fullscreen-wizard.css deleted file mode 100644 index dfea0d8232..0000000000 --- a/ghost/admin/app/styles/layouts/fullscreen-wizard.css +++ /dev/null @@ -1,116 +0,0 @@ -.fullscreen-wizard-container { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1000; - height: 100vh; - background: var(--white); - overflow: hidden; -} - -.gh-launch-wizard-step-indicator { - color: var(--midgrey); - font-size: 1.2rem; - font-weight: 500; - letter-spacing: 0.1px; - text-transform: uppercase; -} - -.gh-launch-wizard-content { - display: flex; - background: var(--white); - border-top: 1px solid var(--whitegrey); -} - -.gh-launch-wizard-content-left { - flex-grow: 0; - flex-shrink: 0; - flex-basis: 25%; - min-width: 348px; - max-width: 400px; - margin: 40px 48px 0; -} - -.gh-launch-wizard-content-right { - position: relative; - flex-grow: 1; - flex-basis: 100%; - margin: 40px 48px 56px 0; -} - -.gh-launch-wizard-preview { - box-shadow: - 0 0 0 1px rgba(0,0,0,0.02), - 0 2.8px 2.2px rgba(0, 0, 0, 0.02), - 0 6.7px 5.3px rgba(0, 0, 0, 0.028), - 0 12.5px 10px rgba(0, 0, 0, 0.035), - 0 22.3px 17.9px rgba(0, 0, 0, 0.042), - 0 41.8px 33.4px rgba(0, 0, 0, 0.05), - 0 100px 80px rgba(0, 0, 0, 0.07); - ; -} - -.gh-launch-wizard-settings-container { - display: flex; - flex-direction: column; - height: calc(100vh - 136px); -} - -.gh-launch-wizard-settings-container .gh-setting-action-largeimg-delete, -.gh-launch-wizard-settings-container .gh-setting-action-smallimg-delete { - position: absolute; - top: 5px; - right: 5px; - margin: 0; - padding: 5px; - border: 1px solid rgba(255, 255, 255, 0.25); - background: rgba(0, 0, 0, 0.9); - border-radius: 3px; - opacity: 0; -} - -.gh-launch-wizard-settings-container .gh-setting-action-largeimg-delete:hover, -.gh-launch-wizard-settings-container .gh-setting-action-smallimg-delete:hover { - border-color: transparent; - background: var(--red); -} - -.gh-launch-wizard-nav-buttons { - display: flex; - justify-content: space-between; - margin-bottom: 5.6rem; - padding-top: 2.4rem; - line-height: 0; -} - -.gh-launch-wizard-settings-container .gh-setting-nossl-container { - border: 1px solid var(--whitegrey); - border-radius: 3px; -} - -.gh-launch-wizard-settings-container .gh-setting-nossl-container svg { - width: 48px; - height: 48px; -} - - -/* Connect Stripe settings */ -.gh-launch-wizard-stripe-info { - width: 100%; - padding: 16px; -} - -.gh-launch-wizard-stripe-connect-token { - height: 88px; - min-height: unset; - font-family: var(--font-family-mono); - font-size: 1.3rem; - resize: none; - background: var(--whitegrey-l2); -} - -.gh-setting-desc.skip-step { - margin: 12px 0; -} \ No newline at end of file diff --git a/ghost/admin/app/styles/layouts/main.css b/ghost/admin/app/styles/layouts/main.css index d4237a7aec..60312ad110 100644 --- a/ghost/admin/app/styles/layouts/main.css +++ b/ghost/admin/app/styles/layouts/main.css @@ -597,13 +597,13 @@ } .gh-nav-list .gh-nav-new-post span svg { - width: 18px; - height: 18px; + width: 1.8rem; + height: 1.8rem; } .gh-nav-list .gh-nav-new-post span svg path { stroke: var(--darkgrey); - stroke-width: 1.5px; + stroke-width: 1; } .gh-nav-list .gh-nav-member-count { diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css index e6ea7d8ccb..635137e864 100644 --- a/ghost/admin/app/styles/layouts/members.css +++ b/ghost/admin/app/styles/layouts/members.css @@ -2220,10 +2220,7 @@ p.gh-members-import-errordetail:first-of-type { .gh-btn-addtier svg { width: .8em; height: .8em; -} - -.gh-btn-addtier svg path { - fill: var(--green); + color: var(--green-d1); } .gh-member-tier-memberdetails { diff --git a/ghost/admin/app/styles/layouts/offers.css b/ghost/admin/app/styles/layouts/offers.css index 20919c21a5..00163272d1 100644 --- a/ghost/admin/app/styles/layouts/offers.css +++ b/ghost/admin/app/styles/layouts/offers.css @@ -49,6 +49,11 @@ min-width: 140px; } +.gh-offers-list-cta .gh-btn-icon svg { + width: 1rem; + height: 1rem; +} + .gh-offers-list { padding: 0; } diff --git a/ghost/admin/app/styles/layouts/portal-settings.css b/ghost/admin/app/styles/layouts/portal-settings.css index da82c7f562..c759ad8328 100644 --- a/ghost/admin/app/styles/layouts/portal-settings.css +++ b/ghost/admin/app/styles/layouts/portal-settings.css @@ -330,6 +330,7 @@ height: 44px; width: 44px; border: none; + color: var(--white); box-shadow: none; } @@ -344,10 +345,6 @@ height: 18px; } -.gh-portal-button-deleteicon:hover span svg { - fill: var(--white); -} - .gh-portal-setting-copy { position: absolute; display: flex; diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css index cad69b7de1..c40792f29a 100644 --- a/ghost/admin/app/styles/layouts/settings.css +++ b/ghost/admin/app/styles/layouts/settings.css @@ -332,6 +332,7 @@ align-items: center; color: var(--midgrey); margin-top: 8px; + color: var(--whitegrey); text-decoration: none; font-size: 13px; line-height: 10px; @@ -339,15 +340,10 @@ .gh-setting-action-smallimg-delete:hover, .gh-setting-action-largeimg-delete:hover { - color: var(--red); + color: var(--white); text-decoration: underline; } -.gh-setting-action-smallimg-delete svg path, -.gh-setting-action-largeimg-delete svg path { - fill: #fff; -} - .gh-setting-action .gh-progress-container { width: 113px; height: 100%; @@ -819,18 +815,17 @@ padding: 8px 0 8px 10px; display: flex; align-items: center; -} - -.gh-blognav-delete svg { - fill: color-mod(var(--midgrey) l(+15%)); - height: 14px; - width: 14px; + color: var(--midgrey); transition: fill 0.1s linear; } -.gh-blognav-delete svg:hover, -.gh-blognav-delete svg:focus { - fill: var(--red); +.gh-blognav-delete:hover { + color: var(--red); +} + +.gh-blognav-delete svg { + height: 14px; + width: 14px; } .gh-blognav-add { @@ -839,6 +834,7 @@ width: 16px; height: 16px; background: var(--green); + color: var(--white); border-radius: 2px; transition: background 0.1s linear; display: flex; @@ -847,7 +843,6 @@ } .gh-blognav-add svg { - fill: #fff; height: 9px; width: 9px; } @@ -1123,6 +1118,8 @@ body:not([data-user-is-dragging]) .gh-newsletter-card-draggable:hover .grab-news } .gh-add-newsletter { + display: flex; + align-items: center; width: max-content; margin: .8rem 0 0; color: var(--green-d1); @@ -1131,12 +1128,7 @@ body:not([data-user-is-dragging]) .gh-newsletter-card-draggable:hover .grab-news .gh-add-newsletter svg { width: 1rem; height: 1rem; - margin: 1px 4px 0 0; -} - -.gh-add-newsletter svg path { - stroke: var(--green-d1); - stroke-width: 3; + margin-right: 6px; } .gh-newsletters-setting-sectionheading { @@ -1699,8 +1691,7 @@ p.theme-validation-details { margin: 32px 68px 68px; } -.gh-branding-settings-previewcontainer .site-frame, -.gh-launch-wizard-preview { +.gh-branding-settings-previewcontainer .site-frame { width: 133.33333%; height: 133.33333%; transform: scale(0.75); @@ -2940,10 +2931,6 @@ p.theme-validation-details { color: var(--lightgrey); } -.gh-audit-log-icon svg path { - fill: var(--midgrey-l1); -} - .gh-audit-log-description { font-size: 1.4rem; color: var(--darkgrey); @@ -2995,17 +2982,14 @@ p.theme-validation-details { background: var(--white); width: 22px; height: 22px; + color: var(--midgrey); border-radius: 999px; box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.12); } .gh-audit-log-icon svg { - width: 13px; - height: 13px; -} - -.gh-audit-log-icon svg path { - fill: var(--midgrey-l1); + width: 12px; + height: 12px; } @media (max-width: 620px) { diff --git a/ghost/admin/app/styles/layouts/tiers.css b/ghost/admin/app/styles/layouts/tiers.css index 92bef60194..0074d3850b 100644 --- a/ghost/admin/app/styles/layouts/tiers.css +++ b/ghost/admin/app/styles/layouts/tiers.css @@ -268,11 +268,6 @@ margin: 1px 4px 0 0; } -.gh-btn-icon.gh-btn-add-tier svg path { - stroke: var(--green-d1); - stroke-width: 3; -} - .gh-tier-list-icon { display: flex; align-items: flex-end; @@ -570,6 +565,11 @@ top: 4px; right: 8px; opacity: 0; + color: var(--midgrey); +} + +.gh-tier-benefits .gh-blognav-delete:hover { + color: var(--red); } .gh-tier-benefits .gh-blognav-add { diff --git a/ghost/admin/app/styles/layouts/users.css b/ghost/admin/app/styles/layouts/users.css index e9e496a160..01ba1412bc 100644 --- a/ghost/admin/app/styles/layouts/users.css +++ b/ghost/admin/app/styles/layouts/users.css @@ -209,8 +209,8 @@ .gh-roles-container .gh-radio svg { width: 16px; height: 16px; - fill: var(--midgrey); margin-left: 2px; + color: var(--midgrey); } .gh-roles-container .gh-radio-content { diff --git a/ghost/admin/app/styles/patterns/buttons.css b/ghost/admin/app/styles/patterns/buttons.css index 89b7cfcf5b..26524f0b71 100644 --- a/ghost/admin/app/styles/patterns/buttons.css +++ b/ghost/admin/app/styles/patterns/buttons.css @@ -85,11 +85,6 @@ fieldset[disabled] .gh-btn { background: color-mod(var(--black) l(-20%)) !important; } -.gh-btn-primary, -.gh-btn-black svg { - fill: var(--white); -} - /* Blue button /* ---------------------------------------------------------- */ @@ -164,7 +159,6 @@ fieldset[disabled] .gh-btn { /* The background of the button creates 1px gradient border */ .gh-btn-outline { color: var(--darkgrey); - fill: var(--darkgrey); border: 1px solid var(--lightgrey-l1); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); background: none; @@ -176,10 +170,6 @@ fieldset[disabled] .gh-btn { border-color: var(--lightgrey); } -.gh-btn-outline svg { - fill: var(--black); -} - /* When clicked or focused with keyboard */ .gh-btn-outline:active, .gh-btn-outline:focus { @@ -258,10 +248,9 @@ fieldset[disabled] .gh-btn { .gh-btn-icon svg, .gh-btn-block svg { - width: 1em; - height: 1em; + width: 1.2rem; + height: 1.2rem; margin-right: 0.6em; - fill: currentColor; } .gh-btn-white svg { @@ -289,15 +278,15 @@ svg.gh-btn-icon-right { } .gh-btn-icon svg path { - stroke: #fff; + stroke: currentColor; } -.gh-btn-icon.green svg path { - stroke: var(--green); +.gh-btn-icon.fill svg { + fill: currentColor; } -.gh-btn-icon.red svg path { - stroke: var(--red); +.gh-btn-icon.fill svg path { + stroke: none; } .gh-btn-icon-no-margin { diff --git a/ghost/admin/app/styles/spirit/_icons.css b/ghost/admin/app/styles/spirit/_icons.css index dac4de8fc8..99d767ea7e 100644 --- a/ghost/admin/app/styles/spirit/_icons.css +++ b/ghost/admin/app/styles/spirit/_icons.css @@ -251,7 +251,8 @@ .stroke-purple path, .stroke-purple g { stroke: var(--purple); } .stroke-yellow path, -.stroke-yellow g { stroke: var(--yellow); } +.stroke-yellow g, +.stroke-yellow circle { stroke: var(--yellow); } .stroke-red path, .stroke-red g { stroke: var(--red); } .stroke-pink path, diff --git a/ghost/admin/app/templates/offers.hbs b/ghost/admin/app/templates/offers.hbs index a9d52a53b3..f3fff940be 100644 --- a/ghost/admin/app/templates/offers.hbs +++ b/ghost/admin/app/templates/offers.hbs @@ -111,7 +111,7 @@ Boost your subscriptions by creating targeted discounts to potential members.

        - {{svg-jar "add"}} Add offer + {{svg-jar "plus"}} Add offer {{else}} diff --git a/ghost/admin/app/templates/settings/integration.hbs b/ghost/admin/app/templates/settings/integration.hbs index aa11981d94..5bdfe9912f 100644 --- a/ghost/admin/app/templates/settings/integration.hbs +++ b/ghost/admin/app/templates/settings/integration.hbs @@ -204,7 +204,7 @@ --}} - + {{svg-jar "dotdotdot"}} @@ -231,13 +231,13 @@
        -

        +

        No webhooks configured

        -
        - {{svg-jar "add" class="w3 h3 fill-green-d1"}} - Add webhook +
        + {{svg-jar "plus"}} + Add webhook
        @@ -250,9 +250,9 @@ -
        - {{svg-jar "add" class="w3 h3 fill-green-d1"}} - Add webhook +
        + {{svg-jar "plus"}} + Add webhook
        diff --git a/ghost/admin/app/templates/settings/integrations.hbs b/ghost/admin/app/templates/settings/integrations.hbs index c3f6ac7cf7..c4138b72e3 100644 --- a/ghost/admin/app/templates/settings/integrations.hbs +++ b/ghost/admin/app/templates/settings/integrations.hbs @@ -224,7 +224,7 @@ Create your own custom Ghost integrations with dedicated API keys & webhooks

        - {{svg-jar "add" class="w3 h3"}} Add custom integration + {{svg-jar "plus"}} Add custom integration
        {{/if}} @@ -236,7 +236,7 @@ {{!--
        --}}
        - {{svg-jar "add" class="w3 h3"}} Add custom integration + {{svg-jar "plus"}} Add custom integration
        {{!--
        --}} diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs index f535c2de84..f862946e36 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs @@ -20,7 +20,7 @@
        {{item.desc}}
        {{#if item.deleteClicked}} - {{svg-jar "trash"}} + {{svg-jar "trash"}} {{/if}} {{/if}} diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.hbs index cd66ffdce1..55b988bf1c 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.hbs +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.hbs @@ -1,5 +1,5 @@ {{#if this.showButton}} - + {{/if}} {{#if this.showMenu}} diff --git a/ghost/admin/public/assets/icons/add-stroke.svg b/ghost/admin/public/assets/icons/add-stroke.svg deleted file mode 100644 index d0600eb7ba..0000000000 --- a/ghost/admin/public/assets/icons/add-stroke.svg +++ /dev/null @@ -1,4 +0,0 @@ - - add-stroke - - \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/add.svg b/ghost/admin/public/assets/icons/add.svg deleted file mode 100644 index 1ccfbb073d..0000000000 --- a/ghost/admin/public/assets/icons/add.svg +++ /dev/null @@ -1,4 +0,0 @@ - - add - - \ 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 3e064232d1..d247dce9bc 100644 --- a/ghost/admin/public/assets/icons/info.svg +++ b/ghost/admin/public/assets/icons/info.svg @@ -1,6 +1,11 @@ - - info - - - + + info + + + + + + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/pen-stroke.svg b/ghost/admin/public/assets/icons/pen-stroke.svg deleted file mode 100644 index 21ed9dd8de..0000000000 --- a/ghost/admin/public/assets/icons/pen-stroke.svg +++ /dev/null @@ -1,4 +0,0 @@ - - pen-stroke - - \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/pen.svg b/ghost/admin/public/assets/icons/pen.svg index 694b72f080..74cb13a351 100644 --- a/ghost/admin/public/assets/icons/pen.svg +++ b/ghost/admin/public/assets/icons/pen.svg @@ -1,4 +1,10 @@ - + pen - + + + + + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/pencil.svg b/ghost/admin/public/assets/icons/pencil.svg deleted file mode 100644 index 07525ff895..0000000000 --- a/ghost/admin/public/assets/icons/pencil.svg +++ /dev/null @@ -1,6 +0,0 @@ - - pencil - - - - \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/plus-large.svg b/ghost/admin/public/assets/icons/plus-large.svg new file mode 100644 index 0000000000..856aa2eae8 --- /dev/null +++ b/ghost/admin/public/assets/icons/plus-large.svg @@ -0,0 +1,4 @@ + + plus-large + + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/plus.svg b/ghost/admin/public/assets/icons/plus.svg index 68a519ecd4..bb9c3c0890 100644 --- a/ghost/admin/public/assets/icons/plus.svg +++ b/ghost/admin/public/assets/icons/plus.svg @@ -1,4 +1,4 @@ - + plus - + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/trash.svg b/ghost/admin/public/assets/icons/trash.svg index ab1db075c2..e77f11c31a 100644 --- a/ghost/admin/public/assets/icons/trash.svg +++ b/ghost/admin/public/assets/icons/trash.svg @@ -1,4 +1,13 @@ - - trash - + + trash + + + + + + + + \ No newline at end of file