Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into patch/320
Browse files Browse the repository at this point in the history
@georgepstaylor
georgepstaylor committed Jul 25, 2024
2 parents c0e743c + b875bea commit 175ae44
Showing 62 changed files with 1,594 additions and 1,812 deletions.
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@
"packages/*"
],
"useNx": false,
"version": "2.4.3",
"version": "2.4.5",
"npmClient": "yarn"
}
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -16,18 +16,18 @@
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"concurrently": "8.2.2",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-compile-handlebars": "0.6.1",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"lerna": "8.1.3",
"lerna": "8.1.7",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0",
"yargs": "17.7.2"
6 changes: 6 additions & 0 deletions packages/_shared/assets/css/v1/components/card.css
View file
Original file line number Diff line number Diff line change
@@ -98,6 +98,12 @@ blockquote.kg-blockquote-alt {
/* Bookmark
/* ---------------------------------------------------------- */

.kg-bookmark-card a.kg-bookmark-container,
.kg-bookmark-card a.kg-bookmark-container:hover {
background: var(--background-color, #fff) !important;
color: var(--color-darker-gray, #222) !important;
}

.kg-bookmark-card .kg-bookmark-container {
border-radius: 0.25em !important;
}
6 changes: 6 additions & 0 deletions packages/_shared/assets/css/v2/general/card.css
View file
Original file line number Diff line number Diff line change
@@ -111,6 +111,12 @@ blockquote.kg-blockquote-alt {
/* Bookmark
/* ---------------------------------------------------------- */

.kg-bookmark-card a.kg-bookmark-container,
.kg-bookmark-card a.kg-bookmark-container:hover {
background: var(--background-color, #fff) !important;
color: var(--color-darker-gray, #222) !important;
}

.kg-bookmark-card .kg-bookmark-container {
border-radius: 0.25em !important;
}
2 changes: 1 addition & 1 deletion packages/_shared/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tryghost/shared-theme-assets",
"description": "Shared theme assets for official Ghost themes",
"version": "2.4.3",
"version": "2.4.5",
"license": "MIT",
"author": {
"name": "Ghost Foundation",
2 changes: 1 addition & 1 deletion packages/alto/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/alto/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/alto/package.json
View file
Original file line number Diff line number Diff line change
@@ -97,19 +97,19 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}
2 changes: 1 addition & 1 deletion packages/bulletin/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/bulletin/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/bulletin/package.json
View file
Original file line number Diff line number Diff line change
@@ -66,19 +66,19 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}
2 changes: 1 addition & 1 deletion packages/dawn/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/dawn/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/dawn/package.json
View file
Original file line number Diff line number Diff line change
@@ -107,19 +107,19 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}
2 changes: 1 addition & 1 deletion packages/digest/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/digest/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/digest/package.json
View file
Original file line number Diff line number Diff line change
@@ -71,19 +71,19 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}
2 changes: 1 addition & 1 deletion packages/dope/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/dope/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/dope/package.json
View file
Original file line number Diff line number Diff line change
@@ -76,19 +76,19 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}
5 changes: 1 addition & 4 deletions packages/dope/partials/post-header.hbs
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@
sizes="100vw"
src="{{img_url feature_image size="xxl"}}"
alt="{{#if feature_image_alt}}{{feature_image_alt}}{{else}}{{title}}{{/if}}"
loading="lazy"
>

<header class="post-header gh-canvas">
@@ -26,9 +25,7 @@

{{#is "post"}}
<div class="post-meta">
<span class="post-meta-item post-meta-date">
<time datetime="{{date format="YYYY-MM-DD"}}">{{date published_at}}</time>
</span>
<time class="post-meta-item post-meta-date" datetime="{{date format="YYYY-MM-DD"}}">{{date published_at}}</time>
<span class="post-meta-item post-meta-length">{{reading_time}}</span>
{{#if @site.comments_enabled}}
{{comment_count class="post-meta-item"}}
2 changes: 1 addition & 1 deletion packages/ease/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/ease/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/ease/package.json
View file
Original file line number Diff line number Diff line change
@@ -76,19 +76,19 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}
2 changes: 1 addition & 1 deletion packages/edge/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/edge/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/edge/package.json
View file
Original file line number Diff line number Diff line change
@@ -78,19 +78,19 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}
2 changes: 1 addition & 1 deletion packages/edition/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/edition/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/edition/package.json
View file
Original file line number Diff line number Diff line change
@@ -120,19 +120,19 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}
2 changes: 2 additions & 0 deletions packages/edition/partials/content.hbs
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,8 @@
</div>
{{/if}}

<div class="author-name" style="display: none;">{{authors}}</div>

{{#if feature_image}}
{{#unless no_image}}
<figure class="single-media kg-width-{{width}}">
2 changes: 1 addition & 1 deletion packages/edition/partials/cover.hbs
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
{{#unless @site.members_invite_only}}
{{#unless @member}}
<form class="form-wrapper cover-form" data-members-form>
<input class="auth-email" type="email" data-members-email placeholder="Your email address" required="true" autocomplete="false">
<input class="auth-email" type="email" name="email" data-members-email placeholder="Your email address" required="true">
<button class="form-button" type="submit" aria-label="Submit">
<span class="default">Subscribe</span>
<span class="loader">{{> "icons/loader"}}</span>
2 changes: 1 addition & 1 deletion packages/episode/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/episode/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions packages/episode/package.json
View file
Original file line number Diff line number Diff line change
@@ -78,14 +78,14 @@
"default": "https://podcasts.apple.com/",
"group": "homepage"
},
"google_podcasts_link": {
"spotify_link": {
"type": "text",
"default": "https://podcasts.google.com/",
"default": "https://open.spotify.com/",
"group": "homepage"
},
"spotify_link": {
"youtube_music_link": {
"type": "text",
"default": "https://open.spotify.com/",
"default": "https://music.youtube.com/",
"group": "homepage"
}
}
@@ -96,19 +96,19 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "2.4.3",
"@tryghost/shared-theme-assets": "2.4.5",
"autoprefixer": "10.4.19",
"beeper": "2.1.0",
"cssnano": "7.0.2",
"gscan": "4.43.1",
"cssnano": "7.0.4",
"gscan": "4.43.2",
"gulp": "5.0.0",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "10.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"ordered-read-streams": "2.0.0",
"postcss": "8.4.38",
"postcss": "8.4.40",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}
9 changes: 0 additions & 9 deletions packages/episode/partials/icons/google.hbs
View file

This file was deleted.

12 changes: 12 additions & 0 deletions packages/episode/partials/icons/youtube.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<svg width="176" height="176" viewBox="0 0 176 176" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_3_2)">
<path d="M88 176C136.601 176 176 136.601 176 88C176 39.3989 136.601 0 88 0C39.3989 0 0 39.3989 0 88C0 136.601 39.3989 176 88 176Z" fill="#FF0000"/>
<path d="M88 46C111.1 46 130 64.8 130 88C130 111.2 111.2 130 88 130C64.8 130 46 111.2 46 88C46 64.8 64.9 46 88 46ZM88 42C62.6 42 42 62.6 42 88C42 113.4 62.6 134 88 134C113.4 134 134 113.4 134 88C134 62.6 113.4 42 88 42Z" fill="white"/>
<path d="M72 111L111 87L72 65V111Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_3_2">
<rect width="176" height="176" fill="white"/>
</clipPath>
</defs>
</svg>
14 changes: 7 additions & 7 deletions packages/episode/partials/podcast-services.hbs
View file
Original file line number Diff line number Diff line change
@@ -6,18 +6,18 @@
<span>Apple Podcasts</span>
</a>
{{/if}}
{{#if @custom.google_podcasts_link}}
<a href="{{@custom.google_podcasts_link}}" target="_blank" rel="noopener noreferrer">
{{> "icons/google"}}
<span>Listen on</span>
<span>Google Podcasts</span>
</a>
{{/if}}
{{#if @custom.spotify_link}}
<a href="{{@custom.spotify_link}}" target="_blank" rel="noopener noreferrer">
{{> "icons/spotify"}}
<span>Listen on</span>
<span>Spotify</span>
</a>
{{/if}}
{{#if @custom.youtube_music_link}}
<a href="{{@custom.youtube_music_link}}" target="_blank" rel="noopener noreferrer">
{{> "icons/youtube"}}
<span>Listen on</span>
<span>YouTube Music</span>
</a>
{{/if}}
</div>
2 changes: 1 addition & 1 deletion packages/headline/assets/built/screen.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/headline/assets/built/screen.css.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 175ae44

Please sign in to comment.