Support Ghost 5.x.

toddbirchard · toddbirchard · commit 072c4cd4c5b2 · 2022-05-30T17:44:04.000-04:00
diff --git a/assets/css/style-min-rtl.css b/assets/css/style-min-rtl.css
diff --git a/assets/css/style-min.css b/assets/css/style-min.css
diff --git a/assets/js/app.min.js b/assets/js/app.min.js
diff --git a/assets/sass/components/_bookmark-card.scss b/assets/sass/components/_bookmark-card.scss
@@ -11,7 +11,7 @@ a.kg-bookmark-container {
   min-height: 144px;
   border-radius: $global-border-radius;
   background-color: var(--bg-white);
-  color: var(--color-text);
+  color: $color-text;
   text-decoration: none;
 
   @include attention() {
diff --git a/assets/sass/components/_buttons.scss b/assets/sass/components/_buttons.scss
@@ -5,7 +5,7 @@
 .btn {
   display: inline-block;
   padding: $space-16 $space-32;
-  color: var(--color-white);
+  color: white;
   background-color: var(--color-dark);
   font-size: $type-xs;
   line-height: $type-xs-lh;
@@ -44,27 +44,27 @@
 
   &--outline {
     color: var(--color-brand);
-    background-color: var(--bg-white);
+    background-color: white;
     box-shadow: inset 0 0 0 1px var(--color-brand);
 
     @include attention() {
-      color: var(--color-white);
+      color: white;
       background-color: var(--color-brand);
     }
   }
 
   &--action {
-    color: var(--color-white);
+    color: white;
     background-color: var(--color-brand);
   }
 
   &--danger {
-    color: var(--color-white);
+    color: white;
     background-color: var(--color-error);
   }
 
   &--dark {
-    color: var(--color-white);
+    color: white;
     background-color: var(--bg-dark);
   }
 
diff --git a/assets/sass/components/_card-author.scss b/assets/sass/components/_card-author.scss
@@ -47,7 +47,7 @@
   }
 
   .icon {
-    fill: var(--color-text);
+    fill: $color-text;
     vertical-align: sub;
     transition: $global-transition;
 
diff --git a/assets/sass/components/_content.scss b/assets/sass/components/_content.scss
@@ -18,7 +18,7 @@
   }
 
   a {
-    color: var(--color-text);
+    color: $color-text;
     text-decoration: underline;
 
     @include attention() {
@@ -51,7 +51,7 @@
 
     &:before {
       content: '. . .';
-      color: var(--color-text);
+      color: $color-text;
     }
   }
 
diff --git a/assets/sass/components/_footer.scss b/assets/sass/components/_footer.scss
@@ -8,7 +8,7 @@
   border-top: 0.5px solid var(--color-border);
   background-color: white;
   margin: $space-40 auto 0;
-  @media (max-width: 800px) {
+  @media (max-width: 1000px) {
     padding: $space-40;
   }
 
diff --git a/assets/sass/components/_member-plan.scss b/assets/sass/components/_member-plan.scss
@@ -44,7 +44,7 @@
 
   &__title {
     margin-bottom: $space-16;
-    color: var(--color-text);
+    color: $color-text;
     font-size: $type--h-xxs;
     line-height: $type--h-xxs-lh;
     font-weight: $type-700;
diff --git a/assets/sass/components/_nav.scss b/assets/sass/components/_nav.scss
@@ -98,15 +98,15 @@
     }
 
     &--current {
-      color: var(--color-text);
+      color: $color-text;
 
       .home-template & {
         color: var(--color-gray);
       }
     }
 
     @include attention() {
-      color: var(--color-text);
+      color: $color-text;
     }
   }
 
@@ -137,7 +137,7 @@
     left: 0;
     width: $space-24;
     height: 1px;
-    background: var(--color-text);
+    background: $color-text;
     cursor: pointer;
 
     &:before,
@@ -159,7 +159,7 @@
       &:after {
         visibility: visible;
         position: relative;
-        background: var(--color-text);
+        background: $color-text;
       }
 
       &:before {
diff --git a/assets/sass/components/_search.scss b/assets/sass/components/_search.scss
@@ -48,7 +48,7 @@
     padding-left: $space-56;
     font-weight: $type-600;
     border: .5px solid var(--color-border);
-    color: var(--color-text);
+    color: $color-text;
     -webkit-appearance: none;
 
     &::placeholder {
@@ -184,7 +184,7 @@
   }
 
   @include attention() {
-    color: var(--color-text);
+    color: $color-text;
 
     .search-result__title {
       text-decoration: underline;
diff --git a/assets/sass/components/_subscribe.scss b/assets/sass/components/_subscribe.scss
@@ -4,7 +4,7 @@
 .subscribe {
   padding: $space-32 $space-24 $space-40;
   border-radius: $global-border-radius;
-  background-color: var(--color-text);
+  background-color: $color-text;
   background-image: url("data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9JzMwMHB4JyB3aWR0aD0nMzAwcHgnICBmaWxsPSIjMDIxNjM3IiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiIHhtbG5zOmlua3NjYXBlPSJodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy9uYW1lc3BhY2VzL2lua3NjYXBlIiB2ZXJzaW9uPSIxLjEiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCwtOTUyLjM2MjE4KSI+PHBhdGggc3R5bGU9InRleHQtaW5kZW50OjA7dGV4dC10cmFuc2Zvcm06bm9uZTtkaXJlY3Rpb246bHRyO2Jsb2NrLXByb2dyZXNzaW9uOnRiO2Jhc2VsaW5lLXNoaWZ0OmJhc2VsaW5lO2NvbG9yOiMwMDAwMDA7ZW5hYmxlLWJhY2tncm91bmQ6YWNjdW11bGF0ZTsiIGQ9Im0gMTYuOTk5OTk3LDk3My4zNjIxNiBjIC00LjQzODYsMCAtNy45OTk5OTk3LDMuNzMzMyAtNy45OTk5OTk3LDguMjE4OCBsIDAsNDEuNTMxMjQgYyAwLDQuNDg1NCAzLjU2MTM5OTcsOC4yNSA3Ljk5OTk5OTcsOC4yNSBsIDY2LjAwMDAwNiwwIGMgNC40Mzg2LDAgOCwtMy43NjQ2IDgsLTguMjUgbCAwLC00MS41MzEyNCBjIDAsLTQuNDg1NSAtMy41NjE0LC04LjIxODggLTgsLTguMjE4OCBsIC02Ni4wMDAwMDUsMCB6IG0gMCw0IDY2LjAwMDAwNiwwIGMgMC41OTE5LDAgMS4xNTA4LDAuMTcwNSAxLjY1NjIsMC40MDYyIEwgNTIuNDY4Nzk4LDEwMDguMzMxIGMgLTEuNDc3NCwxLjQwMjYgLTMuMzk1MSwxLjQwMjcgLTQuODc1LDAgbCAtMzIuMjUsLTMwLjU2MjY0IGMgMC41MDU0LC0wLjIzNTcgMS4wNjQzLC0wLjQwNjIgMS42NTYyLC0wLjQwNjIgeiBtIC0zLjkzNzUsMy43NSAyMi43ODEzLDIxLjU5Mzg0IC0yMi40MDYzLDIyLjM3NSBjIC0wLjI4MDYsLTAuNTgyNyAtMC40Mzc1LC0xLjI0OTcgLTAuNDM3NSwtMS45Njg4IGwgMCwtNDEuNTMxMjQgYyAwLC0wLjE2MjQgMC4wNDcsLTAuMzEyMyAwLjA2MiwtMC40Njg4IHogbSA3My44NzUwMDYsMCBjIDAuMDE2LDAuMTU2NSAwLjA2MiwwLjMwNjQgMC4wNjIsMC40Njg4IGwgMCw0MS41MzEyNCBjIDAsMC43MDg3IC0wLjE2NDQsMS4zNjA5IC0wLjQzNzUsMS45Mzc1IGwgLTIyLjM0MzcwNSwtMjIuMzc1IDIyLjcxODcwNSwtMjEuNTYyNTQgeiBtIC0yNS42MjUwMDUsMjQuMzQzODQgMjEuODc1MDA1LDIxLjkwNjIgYyAtMC4wNjMsMCAtMC4xMjQxLDAgLTAuMTg3NSwwIGwgLTY2LjAwMDAwNSwwIGMgLTAuMDUzLDAgLTAuMTA0LDAgLTAuMTU2MiwwIGwgMjEuOTA2MiwtMjEuODc1IDYuMDkzOCw1Ljc1IGMgMi45MDIzLDIuNzUxMiA3LjQ3MzMsMi43NTUxIDEwLjM3NSwwIGwgNi4wOTM3LC01Ljc4MTIgeiIgZmlsbD0iIzAyMTYzNyIgZmlsbC1vcGFjaXR5PSIxIiBzdHJva2U9Im5vbmUiIG1hcmtlcj0ibm9uZSIgdmlzaWJpbGl0eT0idmlzaWJsZSIgZGlzcGxheT0iaW5saW5lIiBvdmVyZmxvdz0idmlzaWJsZSI+PC9wYXRoPjwvZz48L3N2Zz4=");
   background-position: right (-$space-80) top (-($space-96 + $space-24));
   background-repeat: no-repeat;
diff --git a/assets/sass/components/_tags-list.scss b/assets/sass/components/_tags-list.scss
@@ -60,12 +60,12 @@
     }
 
     &--current {
-      box-shadow: inset 0 -2px var(--color-text);
-      color: var(--color-text);
+      box-shadow: inset 0 -2px $color-text;
+      color: $color-text;
     }
 
     @include attention() {
-      color: var(--color-text);
+      color: $color-text;
     }
   }
 }
diff --git a/assets/sass/components/_teaser.scss b/assets/sass/components/_teaser.scss
@@ -50,10 +50,10 @@
   }
 
   @include attention() {
-    color: var(--color-text);
+    color: $color-text;
 
     .teaser__title {
-      color: var(--color-text);
+      color: $color-text;
       text-decoration: underline;
     }
   }
diff --git a/assets/sass/elements/_body.scss b/assets/sass/elements/_body.scss
@@ -13,6 +13,6 @@ body {
   direction: ltr;
 
   p {
-    color: var(--color-text);
+    color: $color-text;
   }
 }
diff --git a/assets/sass/elements/_input.scss b/assets/sass/elements/_input.scss
@@ -8,7 +8,7 @@ input {
   border: 1px solid $input-color-border;
   border-radius: $global-border-radius;
   background-color: var(--color-white);
-  color: var(--color-text);
+  color: $color-text;
   font-family: $body-font;
 }
 
diff --git a/assets/sass/posts/_post-header.scss b/assets/sass/posts/_post-header.scss
@@ -55,7 +55,7 @@
 
     @include attention() {
       &__author_name {
-        color: var(--color-text);
+        color: $color-text;
       }
     }
 
@@ -75,7 +75,6 @@
     height: $space-32;
     border-radius: 100%;
     margin-right: $space-8;
-    background-color: var(--bg-white);
   }
 
   &__author_image {
diff --git a/assets/sass/posts/_post-mixins.scss b/assets/sass/posts/_post-mixins.scss
@@ -19,49 +19,4 @@
     font-size: 1.7em;
     text-align: left;
   }
-}
-
-@mixin lynx-roundup-blurb {
-  display: flex;
-  align-items: center;
-  justify-content: left;
-  width: auto;
-  min-height: 35px;
-  margin: 60px 0;
-  padding: 15px 30px;
-  border-top: 0;
-  border-bottom: 0;
-  border-left: 5px solid #c8dec8;
-  border-radius: 3px;
-  background: 0 0;
-  background: #e9f3e9;
-  box-shadow: -2px 2px 0 #d5e6d7;
-  @media (max-width: 1000px) {
-    margin: 70px 70px 40px;
-  }
-  @media (max-width: 800px) {
-    margin: 70px 50px 40px;
-    padding: 15px 20px;
-  }
-  @media (max-width: 600px) {
-    margin: 70px 30px 40px;
-  }
-
-  svg {
-    margin-right: 20px;
-    color: #9dc29f;
-    font-size: 40px;
-    @media (max-width: 800px) {
-      min-width: 30px;
-      min-height: 30px;
-      margin-right: 15px;
-      color: #9dc29f;
-      font-size: 3em;
-    }
-    @media (max-width: 600px) {
-      height: unset;
-      min-height: unset;
-      font-size: 4em;
-    }
-  }
 }
diff --git a/assets/sass/posts/_post.scss b/assets/sass/posts/_post.scss
@@ -25,10 +25,6 @@
       margin: 0;
     }
 
-    .post-roundup-blurb {
-      @include lynx-roundup-blurb;
-    }
-
     .intro-notice {
       @include post-intro-notice;
     }
diff --git a/assets/sass/settings/_colors.scss b/assets/sass/settings/_colors.scss
@@ -37,6 +37,8 @@ $secondary-font-color: #4d525d;
 $text-color-light: #494e59;
 $light-header-color: #6c7888;
 
+$color-text: #414d5a;
+
 // Form colors
 $color-error: #bf616a;
 $color-success: #a3be8c;
diff --git a/assets/sass/trumps/_colors.scss b/assets/sass/trumps/_colors.scss
@@ -15,7 +15,7 @@
 }
 
 .u-bg-white {
-  background-color: var(--bg-white);
+  background-color: white;
 }
 
 .u-border {
diff --git a/members/account.hbs b/members/account.hbs
@@ -24,7 +24,7 @@
               </div>
               <div class='o-grid__col o-grid__col--4-4-s o-grid__col--2-4-m o-grid__col--2-4-l'>
                 <span class='u-type-uppercase u-block u-type-600 u-type-sm'>{{t 'Your plan' }}</span>
-                <span class='u-type-sm'>{{ price currency=@price.currency }}{{ price plan.amount }} {{ plan.currency }} / {{ plan.interval }}</span>
+                <span class='u-type-sm'>{{ price currency=currency }}{{ price plan.amount }} {{ plan.currency }} / {{ plan.interval }}</span>
               </div>
             </div>
 
diff --git a/package.json b/package.json
@@ -5,8 +5,7 @@
   "demo": "https://hackersandslackers.com/",
   "engines": {
     "node": ">=16",
-    "ghost": ">=5.0.0",
-    "ghost-api": "v4"
+    "ghost": ">=5.0.0"
   },
   "keywords": [
     "ghost",
diff --git a/partials/compiled/inline-css-rtl.hbs b/partials/compiled/inline-css-rtl.hbs
diff --git a/partials/compiled/inline-css.hbs b/partials/compiled/inline-css.hbs
diff --git a/partials/member-plans.hbs b/partials/member-plans.hbs
@@ -15,38 +15,40 @@
     </div>
   {{/unless}}
 
-  <div class='member-plan member-plan--premium'>
-    <header class='member-plan__header'>
-      <h2 class='member-plan__title'>{{t 'Monthly'}}</h2>
-      <span class='member-plan__sign'>{{ price currency=@price.currency }}</span>
-      <strong class='member-plan__amount'>{{ @price.monthly }}</strong>
-    </header>
-    <div class='member-plan__content'>
-      <ul class='member-plan__list'>
-        <li>Full access to all private posts</li>
-        <li>Regular updates with new content</li>
-        <li>Support independent publishing</li>
-        <li>Simple, secure card payment</li>
-      </ul>
-      <a class='btn btn--dark' href='javascript:void(0)' data-members-plan='Monthly'>{{t 'Choose this plan'}}</a>
+  {{#get "tiers" include="monthly_price,yearly_price,benefits" limit="all" as |tiers|}}
+    <div class='member-plan member-plan--premium'>
+      <header class='member-plan__header'>
+        <h2 class='member-plan__title'>{{t 'Monthly'}}</h2>
+        <span class='member-plan__sign'>{{ price currency=currency }}</span>
+        <strong class='member-plan__amount'>{{ monthly_price }}</strong>
+      </header>
+      <div class='member-plan__content'>
+        <ul class='member-plan__list'>
+          <li>Full access to all private posts</li>
+          <li>Regular updates with new content</li>
+          <li>Support independent publishing</li>
+          <li>Simple, secure card payment</li>
+        </ul>
+        <a class='btn btn--dark' href='javascript:void(0)' data-members-plan='Monthly'>{{t 'Choose this plan'}}</a>
+      </div>
     </div>
-  </div>
 
-  <div class='member-plan member-plan--premium'>
-    <header class='member-plan__header'>
-      <h2 class='member-plan__title'>{{t 'Yearly'}}</h2>
-      <span class='member-plan__sign'>{{ price currency=@price.currency }}</span>
-      <strong class='member-plan__amount'>{{ @price.yearly }}</strong>
-    </header>
-    <div class='member-plan__content'>
-      <ul class='member-plan__list'>
-        <li>Full access to all private posts</li>
-        <li>Regular updates with new content</li>
-        <li>Support independent publishing</li>
-        <li>Simple, secure card payment</li>
-        <li>One easy payment instead of 12!</li>
-      </ul>
-      <a class='btn btn--dark' href='javascript:void(0)' data-members-plan='Yearly'>{{t 'Choose this plan'}}</a>
+    <div class='member-plan member-plan--premium'>
+      <header class='member-plan__header'>
+        <h2 class='member-plan__title'>{{t 'Yearly'}}</h2>
+        <span class='member-plan__sign'>{{ price currency=currency }}</span>
+        <strong class='member-plan__amount'>{{ yearly_price }}</strong>
+      </header>
+      <div class='member-plan__content'>
+        <ul class='member-plan__list'>
+          <li>Full access to all private posts</li>
+          <li>Regular updates with new content</li>
+          <li>Support independent publishing</li>
+          <li>Simple, secure card payment</li>
+          <li>One easy payment instead of 12!</li>
+        </ul>
+        <a class='btn btn--dark' href='javascript:void(0)' data-members-plan='Yearly'>{{t 'Choose this plan'}}</a>
+      </div>
     </div>
   </div>
-</div>
+{{/get}}

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`.icon {`
`50`		`- fill: var(--color-text);`
	`50`	`+ fill: $color-text;`
`51`	`51`	`vertical-align: sub;`
`52`	`52`	`transition: $global-transition;`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`a {`
`21`		`- color: var(--color-text);`
	`21`	`+ color: $color-text;`
`22`	`22`	`text-decoration: underline;`
`23`	`23`
`24`	`24`	`@include attention() {`
`@@ -51,7 +51,7 @@`
`51`	`51`
`52`	`52`	`&:before {`
`53`	`53`	`content: '. . .';`
`54`		`- color: var(--color-text);`
	`54`	`+ color: $color-text;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`border-top: 0.5px solid var(--color-border);`
`9`	`9`	`background-color: white;`
`10`	`10`	`margin: $space-40 auto 0;`
`11`		`- @media (max-width: 800px) {`
	`11`	`+ @media (max-width: 1000px) {`
`12`	`12`	`padding: $space-40;`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -98,15 +98,15 @@`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`&--current {`
`101`		`- color: var(--color-text);`
	`101`	`+ color: $color-text;`
`102`	`102`
`103`	`103`	`.home-template & {`
`104`	`104`	`color: var(--color-gray);`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@include attention() {`
`109`		`- color: var(--color-text);`
	`109`	`+ color: $color-text;`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`@@ -137,7 +137,7 @@`
`137`	`137`	`left: 0;`
`138`	`138`	`width: $space-24;`
`139`	`139`	`height: 1px;`
`140`		`- background: var(--color-text);`
	`140`	`+ background: $color-text;`
`141`	`141`	`cursor: pointer;`
`142`	`142`
`143`	`143`	`&:before,`
`@@ -159,7 +159,7 @@`
`159`	`159`	`&:after {`
`160`	`160`	`visibility: visible;`
`161`	`161`	`position: relative;`
`162`		`- background: var(--color-text);`
	`162`	`+ background: $color-text;`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`&:before {`