Skip to content

Commit 072c4cd

Browse files
committed
Support Ghost 5.x.
1 parent 994d90a commit 072c4cd

26 files changed

+70
-117
lines changed

assets/css/style-min-rtl.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/style-min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/app.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/sass/components/_bookmark-card.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ a.kg-bookmark-container {
1111
min-height: 144px;
1212
border-radius: $global-border-radius;
1313
background-color: var(--bg-white);
14-
color: var(--color-text);
14+
color: $color-text;
1515
text-decoration: none;
1616

1717
@include attention() {

assets/sass/components/_buttons.scss

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.btn {
66
display: inline-block;
77
padding: $space-16 $space-32;
8-
color: var(--color-white);
8+
color: white;
99
background-color: var(--color-dark);
1010
font-size: $type-xs;
1111
line-height: $type-xs-lh;
@@ -44,27 +44,27 @@
4444

4545
&--outline {
4646
color: var(--color-brand);
47-
background-color: var(--bg-white);
47+
background-color: white;
4848
box-shadow: inset 0 0 0 1px var(--color-brand);
4949

5050
@include attention() {
51-
color: var(--color-white);
51+
color: white;
5252
background-color: var(--color-brand);
5353
}
5454
}
5555

5656
&--action {
57-
color: var(--color-white);
57+
color: white;
5858
background-color: var(--color-brand);
5959
}
6060

6161
&--danger {
62-
color: var(--color-white);
62+
color: white;
6363
background-color: var(--color-error);
6464
}
6565

6666
&--dark {
67-
color: var(--color-white);
67+
color: white;
6868
background-color: var(--bg-dark);
6969
}
7070

assets/sass/components/_card-author.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
}
4848

4949
.icon {
50-
fill: var(--color-text);
50+
fill: $color-text;
5151
vertical-align: sub;
5252
transition: $global-transition;
5353

assets/sass/components/_content.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919

2020
a {
21-
color: var(--color-text);
21+
color: $color-text;
2222
text-decoration: underline;
2323

2424
@include attention() {
@@ -51,7 +51,7 @@
5151

5252
&:before {
5353
content: '. . .';
54-
color: var(--color-text);
54+
color: $color-text;
5555
}
5656
}
5757

assets/sass/components/_footer.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
border-top: 0.5px solid var(--color-border);
99
background-color: white;
1010
margin: $space-40 auto 0;
11-
@media (max-width: 800px) {
11+
@media (max-width: 1000px) {
1212
padding: $space-40;
1313
}
1414

assets/sass/components/_member-plan.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
&__title {
4646
margin-bottom: $space-16;
47-
color: var(--color-text);
47+
color: $color-text;
4848
font-size: $type--h-xxs;
4949
line-height: $type--h-xxs-lh;
5050
font-weight: $type-700;

assets/sass/components/_nav.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@
9898
}
9999

100100
&--current {
101-
color: var(--color-text);
101+
color: $color-text;
102102

103103
.home-template & {
104104
color: var(--color-gray);
105105
}
106106
}
107107

108108
@include attention() {
109-
color: var(--color-text);
109+
color: $color-text;
110110
}
111111
}
112112

@@ -137,7 +137,7 @@
137137
left: 0;
138138
width: $space-24;
139139
height: 1px;
140-
background: var(--color-text);
140+
background: $color-text;
141141
cursor: pointer;
142142

143143
&:before,
@@ -159,7 +159,7 @@
159159
&:after {
160160
visibility: visible;
161161
position: relative;
162-
background: var(--color-text);
162+
background: $color-text;
163163
}
164164

165165
&:before {

assets/sass/components/_search.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
padding-left: $space-56;
4949
font-weight: $type-600;
5050
border: .5px solid var(--color-border);
51-
color: var(--color-text);
51+
color: $color-text;
5252
-webkit-appearance: none;
5353

5454
&::placeholder {
@@ -184,7 +184,7 @@
184184
}
185185

186186
@include attention() {
187-
color: var(--color-text);
187+
color: $color-text;
188188

189189
.search-result__title {
190190
text-decoration: underline;

assets/sass/components/_subscribe.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.subscribe {
55
padding: $space-32 $space-24 $space-40;
66
border-radius: $global-border-radius;
7-
background-color: var(--color-text);
7+
background-color: $color-text;
88
background-image: url("data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9JzMwMHB4JyB3aWR0aD0nMzAwcHgnICBmaWxsPSIjMDIxNjM3IiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiIHhtbG5zOmlua3NjYXBlPSJodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy9uYW1lc3BhY2VzL2lua3NjYXBlIiB2ZXJzaW9uPSIxLjEiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCwtOTUyLjM2MjE4KSI+PHBhdGggc3R5bGU9InRleHQtaW5kZW50OjA7dGV4dC10cmFuc2Zvcm06bm9uZTtkaXJlY3Rpb246bHRyO2Jsb2NrLXByb2dyZXNzaW9uOnRiO2Jhc2VsaW5lLXNoaWZ0OmJhc2VsaW5lO2NvbG9yOiMwMDAwMDA7ZW5hYmxlLWJhY2tncm91bmQ6YWNjdW11bGF0ZTsiIGQ9Im0gMTYuOTk5OTk3LDk3My4zNjIxNiBjIC00LjQzODYsMCAtNy45OTk5OTk3LDMuNzMzMyAtNy45OTk5OTk3LDguMjE4OCBsIDAsNDEuNTMxMjQgYyAwLDQuNDg1NCAzLjU2MTM5OTcsOC4yNSA3Ljk5OTk5OTcsOC4yNSBsIDY2LjAwMDAwNiwwIGMgNC40Mzg2LDAgOCwtMy43NjQ2IDgsLTguMjUgbCAwLC00MS41MzEyNCBjIDAsLTQuNDg1NSAtMy41NjE0LC04LjIxODggLTgsLTguMjE4OCBsIC02Ni4wMDAwMDUsMCB6IG0gMCw0IDY2LjAwMDAwNiwwIGMgMC41OTE5LDAgMS4xNTA4LDAuMTcwNSAxLjY1NjIsMC40MDYyIEwgNTIuNDY4Nzk4LDEwMDguMzMxIGMgLTEuNDc3NCwxLjQwMjYgLTMuMzk1MSwxLjQwMjcgLTQuODc1LDAgbCAtMzIuMjUsLTMwLjU2MjY0IGMgMC41MDU0LC0wLjIzNTcgMS4wNjQzLC0wLjQwNjIgMS42NTYyLC0wLjQwNjIgeiBtIC0zLjkzNzUsMy43NSAyMi43ODEzLDIxLjU5Mzg0IC0yMi40MDYzLDIyLjM3NSBjIC0wLjI4MDYsLTAuNTgyNyAtMC40Mzc1LC0xLjI0OTcgLTAuNDM3NSwtMS45Njg4IGwgMCwtNDEuNTMxMjQgYyAwLC0wLjE2MjQgMC4wNDcsLTAuMzEyMyAwLjA2MiwtMC40Njg4IHogbSA3My44NzUwMDYsMCBjIDAuMDE2LDAuMTU2NSAwLjA2MiwwLjMwNjQgMC4wNjIsMC40Njg4IGwgMCw0MS41MzEyNCBjIDAsMC43MDg3IC0wLjE2NDQsMS4zNjA5IC0wLjQzNzUsMS45Mzc1IGwgLTIyLjM0MzcwNSwtMjIuMzc1IDIyLjcxODcwNSwtMjEuNTYyNTQgeiBtIC0yNS42MjUwMDUsMjQuMzQzODQgMjEuODc1MDA1LDIxLjkwNjIgYyAtMC4wNjMsMCAtMC4xMjQxLDAgLTAuMTg3NSwwIGwgLTY2LjAwMDAwNSwwIGMgLTAuMDUzLDAgLTAuMTA0LDAgLTAuMTU2MiwwIGwgMjEuOTA2MiwtMjEuODc1IDYuMDkzOCw1Ljc1IGMgMi45MDIzLDIuNzUxMiA3LjQ3MzMsMi43NTUxIDEwLjM3NSwwIGwgNi4wOTM3LC01Ljc4MTIgeiIgZmlsbD0iIzAyMTYzNyIgZmlsbC1vcGFjaXR5PSIxIiBzdHJva2U9Im5vbmUiIG1hcmtlcj0ibm9uZSIgdmlzaWJpbGl0eT0idmlzaWJsZSIgZGlzcGxheT0iaW5saW5lIiBvdmVyZmxvdz0idmlzaWJsZSI+PC9wYXRoPjwvZz48L3N2Zz4=");
99
background-position: right (-$space-80) top (-($space-96 + $space-24));
1010
background-repeat: no-repeat;

assets/sass/components/_tags-list.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
}
6161

6262
&--current {
63-
box-shadow: inset 0 -2px var(--color-text);
64-
color: var(--color-text);
63+
box-shadow: inset 0 -2px $color-text;
64+
color: $color-text;
6565
}
6666

6767
@include attention() {
68-
color: var(--color-text);
68+
color: $color-text;
6969
}
7070
}
7171
}

assets/sass/components/_teaser.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
}
5151

5252
@include attention() {
53-
color: var(--color-text);
53+
color: $color-text;
5454

5555
.teaser__title {
56-
color: var(--color-text);
56+
color: $color-text;
5757
text-decoration: underline;
5858
}
5959
}

assets/sass/elements/_body.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ body {
1313
direction: ltr;
1414

1515
p {
16-
color: var(--color-text);
16+
color: $color-text;
1717
}
1818
}

assets/sass/elements/_input.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ input {
88
border: 1px solid $input-color-border;
99
border-radius: $global-border-radius;
1010
background-color: var(--color-white);
11-
color: var(--color-text);
11+
color: $color-text;
1212
font-family: $body-font;
1313
}
1414

assets/sass/posts/_post-header.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
@include attention() {
5757
&__author_name {
58-
color: var(--color-text);
58+
color: $color-text;
5959
}
6060
}
6161

@@ -75,7 +75,6 @@
7575
height: $space-32;
7676
border-radius: 100%;
7777
margin-right: $space-8;
78-
background-color: var(--bg-white);
7978
}
8079

8180
&__author_image {

assets/sass/posts/_post-mixins.scss

-45
Original file line numberDiff line numberDiff line change
@@ -19,49 +19,4 @@
1919
font-size: 1.7em;
2020
text-align: left;
2121
}
22-
}
23-
24-
@mixin lynx-roundup-blurb {
25-
display: flex;
26-
align-items: center;
27-
justify-content: left;
28-
width: auto;
29-
min-height: 35px;
30-
margin: 60px 0;
31-
padding: 15px 30px;
32-
border-top: 0;
33-
border-bottom: 0;
34-
border-left: 5px solid #c8dec8;
35-
border-radius: 3px;
36-
background: 0 0;
37-
background: #e9f3e9;
38-
box-shadow: -2px 2px 0 #d5e6d7;
39-
@media (max-width: 1000px) {
40-
margin: 70px 70px 40px;
41-
}
42-
@media (max-width: 800px) {
43-
margin: 70px 50px 40px;
44-
padding: 15px 20px;
45-
}
46-
@media (max-width: 600px) {
47-
margin: 70px 30px 40px;
48-
}
49-
50-
svg {
51-
margin-right: 20px;
52-
color: #9dc29f;
53-
font-size: 40px;
54-
@media (max-width: 800px) {
55-
min-width: 30px;
56-
min-height: 30px;
57-
margin-right: 15px;
58-
color: #9dc29f;
59-
font-size: 3em;
60-
}
61-
@media (max-width: 600px) {
62-
height: unset;
63-
min-height: unset;
64-
font-size: 4em;
65-
}
66-
}
6722
}

assets/sass/posts/_post.scss

-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
margin: 0;
2626
}
2727

28-
.post-roundup-blurb {
29-
@include lynx-roundup-blurb;
30-
}
31-
3228
.intro-notice {
3329
@include post-intro-notice;
3430
}

assets/sass/settings/_colors.scss

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ $secondary-font-color: #4d525d;
3737
$text-color-light: #494e59;
3838
$light-header-color: #6c7888;
3939

40+
$color-text: #414d5a;
41+
4042
// Form colors
4143
$color-error: #bf616a;
4244
$color-success: #a3be8c;

assets/sass/trumps/_colors.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616

1717
.u-bg-white {
18-
background-color: var(--bg-white);
18+
background-color: white;
1919
}
2020

2121
.u-border {

members/account.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525
<div class='o-grid__col o-grid__col--4-4-s o-grid__col--2-4-m o-grid__col--2-4-l'>
2626
<span class='u-type-uppercase u-block u-type-600 u-type-sm'>{{t 'Your plan' }}</span>
27-
<span class='u-type-sm'>{{ price currency=@price.currency }}{{ price plan.amount }} {{ plan.currency }} / {{ plan.interval }}</span>
27+
<span class='u-type-sm'>{{ price currency=currency }}{{ price plan.amount }} {{ plan.currency }} / {{ plan.interval }}</span>
2828
</div>
2929
</div>
3030

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"demo": "https://hackersandslackers.com/",
66
"engines": {
77
"node": ">=16",
8-
"ghost": ">=5.0.0",
9-
"ghost-api": "v4"
8+
"ghost": ">=5.0.0"
109
},
1110
"keywords": [
1211
"ghost",

partials/compiled/inline-css-rtl.hbs

+1-1
Large diffs are not rendered by default.

partials/compiled/inline-css.hbs

+1-1
Large diffs are not rendered by default.

partials/member-plans.hbs

+33-31
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,40 @@
1515
</div>
1616
{{/unless}}
1717
18-
<div class='member-plan member-plan--premium'>
19-
<header class='member-plan__header'>
20-
<h2 class='member-plan__title'>{{t 'Monthly'}}</h2>
21-
<span class='member-plan__sign'>{{ price currency=@price.currency }}</span>
22-
<strong class='member-plan__amount'>{{ @price.monthly }}</strong>
23-
</header>
24-
<div class='member-plan__content'>
25-
<ul class='member-plan__list'>
26-
<li>Full access to all private posts</li>
27-
<li>Regular updates with new content</li>
28-
<li>Support independent publishing</li>
29-
<li>Simple, secure card payment</li>
30-
</ul>
31-
<a class='btn btn--dark' href='javascript:void(0)' data-members-plan='Monthly'>{{t 'Choose this plan'}}</a>
18+
{{#get "tiers" include="monthly_price,yearly_price,benefits" limit="all" as |tiers|}}
19+
<div class='member-plan member-plan--premium'>
20+
<header class='member-plan__header'>
21+
<h2 class='member-plan__title'>{{t 'Monthly'}}</h2>
22+
<span class='member-plan__sign'>{{ price currency=currency }}</span>
23+
<strong class='member-plan__amount'>{{ monthly_price }}</strong>
24+
</header>
25+
<div class='member-plan__content'>
26+
<ul class='member-plan__list'>
27+
<li>Full access to all private posts</li>
28+
<li>Regular updates with new content</li>
29+
<li>Support independent publishing</li>
30+
<li>Simple, secure card payment</li>
31+
</ul>
32+
<a class='btn btn--dark' href='javascript:void(0)' data-members-plan='Monthly'>{{t 'Choose this plan'}}</a>
33+
</div>
3234
</div>
33-
</div>
3435
35-
<div class='member-plan member-plan--premium'>
36-
<header class='member-plan__header'>
37-
<h2 class='member-plan__title'>{{t 'Yearly'}}</h2>
38-
<span class='member-plan__sign'>{{ price currency=@price.currency }}</span>
39-
<strong class='member-plan__amount'>{{ @price.yearly }}</strong>
40-
</header>
41-
<div class='member-plan__content'>
42-
<ul class='member-plan__list'>
43-
<li>Full access to all private posts</li>
44-
<li>Regular updates with new content</li>
45-
<li>Support independent publishing</li>
46-
<li>Simple, secure card payment</li>
47-
<li>One easy payment instead of 12!</li>
48-
</ul>
49-
<a class='btn btn--dark' href='javascript:void(0)' data-members-plan='Yearly'>{{t 'Choose this plan'}}</a>
36+
<div class='member-plan member-plan--premium'>
37+
<header class='member-plan__header'>
38+
<h2 class='member-plan__title'>{{t 'Yearly'}}</h2>
39+
<span class='member-plan__sign'>{{ price currency=currency }}</span>
40+
<strong class='member-plan__amount'>{{ yearly_price }}</strong>
41+
</header>
42+
<div class='member-plan__content'>
43+
<ul class='member-plan__list'>
44+
<li>Full access to all private posts</li>
45+
<li>Regular updates with new content</li>
46+
<li>Support independent publishing</li>
47+
<li>Simple, secure card payment</li>
48+
<li>One easy payment instead of 12!</li>
49+
</ul>
50+
<a class='btn btn--dark' href='javascript:void(0)' data-members-plan='Yearly'>{{t 'Choose this plan'}}</a>
51+
</div>
5052
</div>
5153
</div>
52-
</div>
54+
{{/get}}

0 commit comments

Comments
 (0)