From c0149ee997d44e021eed2380758cf4c31a543bfc Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Thu, 1 Oct 2020 08:36:55 +0100 Subject: [PATCH] Removed ember-sticky-element in favour of native `position: sticky` no issue - native `position: sticky` support is now good enough across the board of our supported browser versions to use in place of a JS version for our use cases - `ember-sticky-element` is preventing the dependency update of `ember-in-viewport` so removing it will allow a lot of our sub-dependencies to be updated --- .../koenig-editor/addon/components/koenig-card.hbs | 5 +++-- ghost/admin/package.json | 1 - ghost/admin/yarn.lock | 11 +---------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card.hbs index c6150711b4..56fde71a58 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card.hbs +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card.hbs @@ -1,7 +1,8 @@ {{#if this.icon}} - +
{{svg-jar this.icon class=this.iconClass}} - +
+
{{/if}} {{yield (hash diff --git a/ghost/admin/package.json b/ghost/admin/package.json index 945c531e94..ad52e95ed0 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -97,7 +97,6 @@ "ember-simple-auth": "3.0.0", "ember-sinon": "5.0.0", "ember-source": "3.21.3", - "ember-sticky-element": "0.2.3", "ember-svg-jar": "2.2.3", "ember-test-selectors": "5.0.0", "ember-truth-helpers": "2.1.0", diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock index 4121e29a79..c7197d64ef 100644 --- a/ghost/admin/yarn.lock +++ b/ghost/admin/yarn.lock @@ -6194,7 +6194,7 @@ ember-in-element-polyfill@^1.0.0: ember-cli-htmlbars "^4.3.1" ember-cli-version-checker "^5.0.2" -ember-in-viewport@3.5.8, ember-in-viewport@~3.0.0, ember-in-viewport@~3.7.2: +ember-in-viewport@3.5.8, ember-in-viewport@~3.7.2: version "3.5.8" resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.5.8.tgz#da03f5e69c5e5e6cbd048f0db8de0b05c2e3e68f" integrity sha512-2GBK5KbNYiGADy433tN3yHnxZ77wSnVyMezx23cr3qs2gwac+5ta2FkOTiKibNkGmWE/Mk/c7zcF7sDk1jy5DA== @@ -6480,15 +6480,6 @@ ember-source@3.21.3: semver "^6.1.1" silent-error "^1.1.1" -ember-sticky-element@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/ember-sticky-element/-/ember-sticky-element-0.2.3.tgz#39702e0fc0f04905a7b34add61a85a9186d3d16b" - integrity sha512-AtKkM8zh6LK5FsPxtsDywUSodGk5c2AI03vcgk995dC5Z7DG4XLJoAwV0FZM5RYnymnYEJvOs6VTcIM8uwcX5w== - dependencies: - ember-cli-babel "^6.8.2" - ember-cli-htmlbars "^2.0.1" - ember-in-viewport "~3.0.0" - ember-svg-jar@2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-2.2.3.tgz#632f8d6a999ceb1c815a135fbc2bd681b856330b"