ghost 4.25.1 → 4.27.1

package/core/frontend/apps/amp/lib/views/amp.hbs

@@ -282,11 +282,12 @@
     }
 
     .post-content blockquote.kg-blockquote-alt {
-        font-size: 2rem;
-        line-height: 1.7;
+        font-size: 1.2em;
+        font-style: italic;
+        line-height: 1.6em;
         text-align: center;
         color: #738a94;
-        padding: 1rem 6rem 1.5rem;
+        padding: 0.75em 3em 1.25em;
     }
 
     .post-content blockquote.kg-blockquote-alt::before {
@@ -625,6 +626,10 @@
         color: #fff;
     }
 
+    .kg-callout-card-accent a {
+        color: #fff;
+    }
+
     .kg-callout-emoji {
         padding-right: 16px;
         line-height: 1.3;

package/core/frontend/helpers/ghost_head.js

@@ -199,7 +199,7 @@ module.exports = function ghost_head(options) { // eslint-disable-line camelcase
 
                 // @TODO do this in a more "frameworky" way
                 if (cardAssetService.hasFile('js')) {
-                    head.push(`<script async src="${getAssetUrl('public/cards.min.js')}"></script>`);
+                    head.push(`<script defer src="${getAssetUrl('public/cards.min.js')}"></script>`);
                 }
                 if (cardAssetService.hasFile('css')) {
                     head.push(`<link rel="stylesheet" type="text/css" href="${getAssetUrl('public/cards.min.css')}">`);

package/core/frontend/src/cards/css/audio.css

@@ -0,0 +1,258 @@
+.kg-audio-card {
+    display: flex;
+    width: 100%;
+    min-height: 96px;
+    box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+}
+
+.kg-audio-thumbnail {
+    width: 80px;
+    margin: 8px;
+    object-fit: cover;
+    aspect-ratio: 1/1;
+    border-radius: 3px;
+}
+
+.kg-player-container {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 100%;
+    --seek-before-width: 0%;
+    --volume-before-width: 100%;
+    --buffered-width: 0%;
+}
+
+.kg-audio-title {
+    width: 100%;
+    margin: 8px 0 0 0;
+    padding: 8px 12px 0;
+    border: none;
+    font-family: inherit;
+    font-size: 1em;
+    font-weight: 700;
+    background: transparent;
+}
+
+.kg-player {
+    display: flex;
+    flex-grow: 1;
+    align-items: center;
+    padding: 8px 12px;
+}
+
+.kg-audio-current-time {
+    min-width: 38px;
+    padding: 0 4px;
+    font-family: inherit;
+    font-size: .85em;
+    font-weight: 500;
+    line-height: 1.4em;
+}
+
+.kg-audio-time {
+    color: #ababab;
+    font-family: inherit;
+    font-size: .85em;
+    font-weight: 500;
+    line-height: 1.4em;
+}
+
+.kg-audio-duration {
+    padding: 0 4px;
+}
+
+.kg-audio-play-icon,
+.kg-audio-pause-icon {
+    position: relative;
+    bottom: 1px;
+    padding: 0px 4px 0 0;
+    background: transparent;
+}
+
+.kg-audio-hide {
+    display: none;
+}
+
+.kg-audio-play-icon svg,
+.kg-audio-pause-icon svg {
+    width: 14px;
+    height: 14px;
+    fill: currentColor;
+}
+
+.kg-audio-seek-slider {
+    flex-grow: 1;
+    margin: 0 4px;
+}
+
+.kg-audio-playback-rate {
+    width: 37px;
+    padding: 0 4px;
+    font-family: inherit;
+    font-size: .85em;
+    font-weight: 600;
+    line-height: 1.4em;
+    text-align: left;
+    background: transparent;
+}
+
+.kg-audio-mute-icon,
+.kg-audio-unmute-icon {
+    position: relative;
+    bottom: 1px;
+    padding: 0 4px;
+    background: transparent;
+}
+
+.kg-audio-mute-icon svg,
+.kg-audio-unmute-icon svg {
+    width: 16px;
+    height: 16px;
+    fill: currentColor;
+}
+
+.kg-audio-volume-slider {
+    width: 80px;
+}
+
+.kg-audio-seek-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--seek-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: currentColor;
+    border-radius: 2px;
+}
+
+.kg-audio-volume-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--volume-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: currentColor;
+    border-radius: 2px;
+}
+
+/* Resetting browser styles
+/* --------------------------------------------------------------- */
+
+.kg-player-container input[type=range] {
+    position: relative;
+    -webkit-appearance: none;
+    background: transparent;
+}
+
+.kg-player-container input[type=range]:focus {
+    outline: none;
+}
+
+.kg-player-container input[type=range]::-webkit-slider-thumb {
+    -webkit-appearance: none;
+}
+
+.kg-player-container input[type=range]::-ms-track {
+    cursor: pointer;
+    border-color: transparent;
+    color: transparent;
+    background: transparent;
+}
+
+/* Chrome & Safari styles
+/* --------------------------------------------------------------- */
+
+.kg-player-container input[type="range"]::-webkit-slider-runnable-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(124, 139, 154, 0.25);
+    border-radius: 2px;
+}
+
+.kg-player-container input[type="range"]::-webkit-slider-thumb {
+    position: relative;
+    box-sizing: content-box;
+    width: 12px;
+    height: 12px;
+    margin: -5px 0 0 0;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.kg-player-container input[type="range"]:active::-webkit-slider-thumb {
+    transform: scale(1.2);
+}
+
+/* Firefox styles
+/* --------------------------------------------------------------- */
+
+.kg-player-container input[type="range"]::-moz-range-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(124, 139, 154, 0.25);
+    border-radius: 2px;
+}
+
+.kg-player-container input[type="range"]::-moz-range-progress {
+    background: currentColor;
+    border-radius: 2px;
+}
+
+.kg-player-container input[type="range"]::-moz-range-thumb {
+    box-sizing: content-box;
+    width: 12px;
+    height: 12px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.kg-player-container input[type="range"]:active::-moz-range-thumb {
+    transform: scale(1.2);
+}
+
+/* Edge & IE styles
+/* --------------------------------------------------------------- */
+
+.kg-player-container input[type="range"]::-ms-track {
+    width: 100%;
+    height: 3px;
+    border: solid transparent;
+    color: transparent;
+    cursor: pointer;
+    background: transparent;
+}
+
+.kg-player-container input[type="range"]::-ms-fill-lower {
+    background: #fff;
+}
+
+.kg-player-container input[type="range"]::-ms-fill-upper {
+    background: currentColor;
+}
+
+.kg-player-container input[type="range"]::-ms-thumb {
+    box-sizing: content-box;
+    width: 12px;
+    height: 12px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.kg-player-container input[type="range"]:active::-ms-thumb {
+    transform: scale(1.2);
+}

package/core/frontend/src/cards/css/blockquote.css

@@ -1,29 +1,23 @@
-blockquote.kg-blockquote-alt {
-  background: none;
-  font-size: 2.4rem;
-  line-height: 1.7;
+.kg-blockquote-alt {
+  font-size: 1.5em;
+  font-style: italic;
+  line-height: 1.7em;
   text-align: center;
-  color: var(--color-midgrey);
-  padding: 1rem 8rem 1.5rem;
-  border: 0 none;
-}
-
-blockquote.kg-blockquote-alt::before {
-  display: none;
+  padding: 0 2.5em;
 }
 
 @media (max-width: 800px) {
-  blockquote.kg-blockquote-alt {
-    font-size: 2.2rem;
-    padding-left: 6rem;
-    padding-right: 6rem;
+  .kg-blockquote-alt {
+    font-size: 1.4em;
+    padding-left: 2em;
+    padding-right: 2em;
   }
 }
 
 @media (max-width: 600px) {
-  blockquote.kg-blockquote-alt {
-    font-size: 2rem;
-    padding-left: 3rem;
-    padding-right: 3rem;
+  .kg-blockquote-alt {
+    font-size: 1.2em;
+    padding-left: 1.75em;
+    padding-right: 1.75em;
   } 
 }

package/core/frontend/src/cards/css/product.css

@@ -0,0 +1,101 @@
+.kg-product-card-container {
+    display: flex;
+    background: transparent;
+    box-shadow: inset 0 0 0 1px rgb(124 139 154 / 25%);
+    border-radius: 5px;
+    flex-direction: column;
+    text-decoration: none;
+    max-width: 550px;
+    padding: 20px;
+    width: 100%;
+}
+
+.kg-product-card {
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+}
+
+.kg-product-card-image {
+    margin-bottom: 1.6rem;
+}
+
+.kg-product-card-header {
+    display: flex;
+    align-items: flex-start;
+    gap: 8px;
+    flex-wrap: wrap;
+    justify-content: space-between;
+}
+
+.kg-product-card-title-container {
+    flex: 2 1 250px;
+}
+
+.kg-product-card-title {
+    text-decoration: none;
+    font-weight: 700;
+    font-size: 1.4em;
+    margin-top: 0;
+    margin-bottom: 0;
+    line-height: 1.4em;
+}
+
+.kg-product-card-description {
+    font-size: 1em;
+    line-height: 1.6em;
+    opacity: .7;
+    margin-top: 8px;
+}
+
+.kg-product-card-button {
+    width: 100%;
+    margin-top: 16px;
+}
+
+.kg-product-card-rating {
+    display: flex;
+    align-items: center;
+    flex: 0 0 100px;
+}
+
+.kg-product-card-rating-star {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 32px;
+    width: 20px;
+}
+
+.kg-product-card-rating-star svg {
+    width: 16px;
+    height: 16px;
+    fill: #fff;
+}
+
+.kg-product-card-rating-edit .kg-product-card-rating-star:hover {
+    opacity: 0.7;
+}
+
+.kg-product-card-rating-edit {
+    background: none;
+    display: flex;
+    align-items: center;
+}
+
+.kg-product-card-rating-preview {
+    display: flex;
+}
+
+.kg-product-card-rating-star svg {
+    fill: #ebeef0;
+}
+
+.kg-product-card-rating-active.kg-product-card-rating-star svg {
+    fill: #394047;
+}
+
+.kg-product-card-button {
+    justify-content: center;
+}

package/core/frontend/src/cards/css/toggle.css

@@ -1,12 +1,8 @@
-.kg-toggle-card[data-kg-toggle-state="close"] .kg-toggle-content{
-    height: auto;
-    opacity: 1;
-    transition: opacity 1s ease, top .35s ease;
-    top: 0;
-    position: relative;
+.kg-toggle-card+.kg-toggle-card {
+    margin-top: 1em;
 }
 
-.kg-toggle-content {
+.kg-toggle-card[data-kg-toggle-state="close"] .kg-toggle-content{
     height: 0;
     overflow: hidden;
     transition: opacity .5s ease, top .35s ease;
@@ -15,6 +11,14 @@
     position: relative;
 }
 
+.kg-toggle-content {
+    height: auto;
+    opacity: 1;
+    transition: opacity 1s ease, top .35s ease;
+    top: 0;
+    position: relative;
+}
+
 .kg-toggle-content p:first-of-type {
     margin-top: 0.5em;
 }
@@ -59,6 +63,15 @@
     transform: rotate(-180deg);
 }
 
+.kg-toggle-heading path {
+    fill: none;
+    stroke: currentcolor;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+    stroke-width: 1.5;
+    fill-rule: evenodd;
+}
+
 .kg-toggle-heading-text {
     margin-top: 0;
     margin-bottom: 0;

package/core/frontend/src/cards/js/audio.js

@@ -0,0 +1,147 @@
+const handleAudioPlayer = function (audioElementContainer) {
+    const audioPlayerContainer = audioElementContainer.querySelector('.kg-player-container');
+    const playIconContainer = audioElementContainer.querySelector('.kg-audio-play-icon');
+    const pauseIconContainer = audioElementContainer.querySelector('.kg-audio-pause-icon');
+    const seekSlider = audioElementContainer.querySelector('.kg-audio-seek-slider');
+    const playbackRateContainer = audioElementContainer.querySelector('.kg-audio-playback-rate');
+    const muteIconContainer = audioElementContainer.querySelector('.kg-audio-mute-icon');
+    const unmuteIconContainer = audioElementContainer.querySelector('.kg-audio-unmute-icon');
+    const volumeSlider = audioElementContainer.querySelector('.kg-audio-volume-slider');
+    const audio = audioElementContainer.querySelector('audio');
+    const durationContainer = audioElementContainer.querySelector('.kg-audio-duration');
+    const currentTimeContainer = audioElementContainer.querySelector('.kg-audio-current-time');
+    let playbackRates = [{
+        rate: 0.75,
+        label: '0.7×'
+    }, {
+        rate: 1.0,
+        label: '1×'
+    }, {
+        rate: 1.25,
+        label: '1.2×'
+    }, {
+        rate: 1.75,
+        label: '1.7×'
+    }, {
+        rate: 2.0,
+        label: '2×'
+    }];
+
+    let raf = null;
+    let currentPlaybackRateIdx = 1;
+
+    audio.src = audioElementContainer.getAttribute('data-kg-audio-src');
+
+    const whilePlaying = () => {
+        seekSlider.value = Math.floor(audio.currentTime);
+        currentTimeContainer.textContent = calculateTime(seekSlider.value);
+        audioPlayerContainer.style.setProperty('--seek-before-width', `${seekSlider.value / seekSlider.max * 100}%`);
+        raf = requestAnimationFrame(whilePlaying);
+    }
+
+    const showRangeProgress = (rangeInput) => {
+        if (rangeInput === seekSlider) {
+            audioPlayerContainer.style.setProperty('--seek-before-width', rangeInput.value / rangeInput.max * 100 + '%');
+        }
+        else {
+            audioPlayerContainer.style.setProperty('--volume-before-width', rangeInput.value / rangeInput.max * 100 + '%');
+        }
+    }
+
+    const calculateTime = (secs) => {
+        const minutes = Math.floor(secs / 60);
+        const seconds = Math.floor(secs % 60);
+        const returnedSeconds = seconds < 10 ? `0${seconds}` : `${seconds}`;
+        return `${minutes}:${returnedSeconds}`;
+    }
+
+    const displayDuration = () => {
+        durationContainer.textContent = calculateTime(audio.duration);
+    }
+
+    const setSliderMax = () => {
+        seekSlider.max = Math.floor(audio.duration);
+    }
+
+    const displayBufferedAmount = () => {
+        if (audio.buffered.length > 0) {
+            const bufferedAmount = Math.floor(audio.buffered.end(audio.buffered.length - 1));
+            audioPlayerContainer.style.setProperty('--buffered-width', `${(bufferedAmount / seekSlider.max) * 100}%`);
+        }
+    }
+
+    if (audio.readyState > 0) {
+        displayDuration();
+        setSliderMax();
+        displayBufferedAmount();
+    } else {
+        audio.addEventListener('loadedmetadata', () => {
+            displayDuration();
+            setSliderMax();
+            displayBufferedAmount();
+        });
+    }
+
+    playIconContainer.addEventListener('click', () => {
+        playIconContainer.classList.add("kg-audio-hide");
+        pauseIconContainer.classList.remove("kg-audio-hide");
+        audio.play();
+        requestAnimationFrame(whilePlaying);
+    });
+
+    pauseIconContainer.addEventListener('click', () => {
+        pauseIconContainer.classList.add("kg-audio-hide");
+        playIconContainer.classList.remove("kg-audio-hide");
+        audio.pause();
+        cancelAnimationFrame(raf);
+    });
+
+    muteIconContainer.addEventListener('click', () => {
+        muteIconContainer.classList.add("kg-audio-hide");
+        unmuteIconContainer.classList.remove("kg-audio-hide");
+        audio.muted = false;
+    });
+
+    unmuteIconContainer.addEventListener('click', () => {
+        unmuteIconContainer.classList.add("kg-audio-hide");
+        muteIconContainer.classList.remove("kg-audio-hide");
+        audio.muted = true;
+    });
+
+    playbackRateContainer.addEventListener('click', () => {
+        let nextPlaybackRate = playbackRates[(currentPlaybackRateIdx + 1) % 5];
+        currentPlaybackRateIdx = currentPlaybackRateIdx + 1;
+        audio.playbackRate = nextPlaybackRate.rate;
+        playbackRateContainer.textContent = nextPlaybackRate.label;
+    });
+
+    audio.addEventListener('progress', displayBufferedAmount);
+
+    seekSlider.addEventListener('input', (e) => {
+        showRangeProgress(e.target);
+        currentTimeContainer.textContent = calculateTime(seekSlider.value);
+        if (!audio.paused) {
+            cancelAnimationFrame(raf);
+        }
+    });
+
+    seekSlider.addEventListener('change', () => {
+        audio.currentTime = seekSlider.value;
+        if (!audio.paused) {
+            requestAnimationFrame(whilePlaying);
+        }
+    });
+
+    volumeSlider.addEventListener('input', (e) => {
+        const value = e.target.value;
+        showRangeProgress(e.target);
+        audio.volume = value / 100;
+    });
+}
+
+const audioCardElements = document.querySelectorAll('.kg-audio-card');
+
+for (let i = 0; i < audioCardElements.length; i++) {
+    handleAudioPlayer(audioCardElements[i]);
+}
+

package/core/server/notify.js

@@ -8,7 +8,6 @@
 
 // Required Ghost internals
 const config = require('../shared/config');
-const logging = require('@tryghost/logging');
 
 let notified = {
     started: false,
@@ -53,7 +52,7 @@ async function notify(type, error = null) {
     let socketAddress = config.get('bootstrap-socket');
     if (socketAddress) {
         const bootstrapSocket = require('@tryghost/bootstrap-socket');
-        return bootstrapSocket.connectAndSend(socketAddress, logging, message);
+        return bootstrapSocket.connectAndSend(socketAddress, message);
     }
 
     return Promise.resolve();

package/core/server/services/mega/template.js

@@ -148,7 +148,7 @@ dd {
 }
 
 blockquote {
-    margin: 2em 0;
+    margin: 2em 0 2em 0;
     padding: 0 25px 0 25px;
     border-left: ${templateSettings.accentColor || '#15212A'} 2px solid;
     font-size: 17px;
@@ -159,11 +159,10 @@ blockquote {
 
 blockquote.kg-blockquote-alt {
     border-left: 0 none;
-    padding-left: 50px;
-    padding-right: 50px;
-    margin-bottom: 2.5em;
+    padding: 0 50px 0 50px;
     text-align: center;
     font-size: 1.2em;
+    font-style: italic;
     color: #999999;
 }
 
@@ -567,6 +566,16 @@ figure blockquote p {
     padding-bottom: 4px;
 }
 
+.kg-twitter-link {
+    display: block; 
+    text-decoration: none !important; 
+    color: #15212A !important; 
+    font-family: inherit !important;
+    font-size: 15px;
+    padding: 8px;
+    line-height: 1.3em;
+}
+
 .kg-callout-card {
     display: flex;
     margin: 0 0 1.5em 0;
@@ -898,15 +907,17 @@ figure blockquote p {
     }
 
     table.body blockquote {
-        font-size: 17px !important;
-        line-height: 1.6em !important;
-        margin-bottom: 0 !important;
-        padding-left: 15px !important;
+        font-size: 17px;
+        line-height: 1.6em;
+        margin-bottom: 0;
+        padding-left: 15px;
     }
 
     table.body blockquote.kg-blockquote-alt {
-        padding-left: 50px !important;
-        margin-bottom: 2.5em !important;
+        border-left: 0 none !important;
+        margin: 0 0 2.5em 0 !important;
+        padding: 0 50px 0 50px !important;
+        font-size: 1.2em;
     }
 
     table.body blockquote + * {