ghost 4.38.1 → 4.40.0

package/core/frontend/apps/private-blogging/lib/middleware.js

@@ -13,7 +13,7 @@ const privateRoute = '/private/';
 
 const messages = {
     pageNotFound: 'Page not found.',
-    wrongPassword: 'Wrong password'
+    wrongPassword: 'Incorrect password.'
 };
 
 function verifySessionHash(salt, hash) {

package/core/frontend/apps/private-blogging/lib/views/private.hbs

@@ -22,23 +22,22 @@
                 <main class="gh-main" role="main">
                     <div class="gh-flow">
                         <div class="gh-flow-content-wrap">
-                            <section class="gh-flow-content">
+                            {{#if @site.icon}}
+                                <img class="site-icon" src="{{img_url @site.icon absolute="true"}}" alt="icon">
+                            {{/if}}
+                            <section class="gh-flow-content private">
                                 <header>
-                                    <h1>This site is private</h1>
+                                    <h1>This site is private.</h1>
                                 </header>
                                 <form class="gh-signin" method="post" novalidate="novalidate">
                                     <div class="form-group{{#if error}} error{{/if}}">
-                                        <span class="gh-input-icon gh-icon-lock">
-                                            <svg version="1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g><path d="M12 14c-.552 0-1 .449-1 1 0 .365.207.672.5.846v2.654c0 .276.224.5.5.5s.5-.224.5-.5v-2.654c.293-.174.5-.481.5-.846 0-.551-.448-1-1-1zM20.5 9h-2.5v-3c0-3.309-2.691-6-6-6s-6 2.691-6 6v3h-2.5c-.276 0-.5.224-.5.5v14c0 .276.224.5.5.5h17c.276 0 .5-.224.5-.5v-14c0-.276-.224-.5-.5-.5zm-13.5-3c0-2.757 2.243-5 5-5s5 2.243 5 5v3h-10v-3zm13 17h-16v-13h16v13z"/></g></svg>
                                             {{input_password class="gh-input" placeholder="Password"}}
-                                        </span>
+                                            {{#if error}}
+                                                <p class="main-error">{{error.message}}</p>
+                                            {{/if}}
                                     </div>
-                                    <button class="gh-btn gh-btn-blue gh-btn-block" type="submit"><span>Enter Now</span></button>
+                                    <button class="gh-btn" type="submit"><span>Access site &rarr;</span></button>
                                 </form>
-
-                                {{#if error}}
-                                    <p class="main-error">{{error.message}}</p>
-                                {{/if}}
                             </section>
                         </div>
                     </div>

package/core/frontend/public/ghost.css

@@ -349,49 +349,66 @@ th {
 }
 /* Colour classes
 /* ---------------------------------------------------------- */
+.black {
+    color: #15171A;
+}
+
 .darkgrey {
-    color: #343f44;
+    color: #394047;
 }
+
 .midgrey {
-    color: #738a94;
+    color: #7C8B9A;
 }
+
 .lightgrey {
-    color: #e5eff5;
+    color: #CED4D9;
 }
+
 .blue {
-    color: #3eb0ef;
+    color: #14b8ff;
 }
+
 .red {
-    color: #f05230;
+    color: #f50b23;
 }
+
 .orange {
-    color: #fecd35;
+    color: #ffb41f;
 }
+
 .green {
-    color: #a4d037;
+    color: #30cf43;
 }
+
 /* Colour classes (hover)
 /* ---------------------------------------------------------- */
 .darkgrey-hover:hover {
-    color: #343f44;
+    color: #394047
 }
+
 .midgrey-hover:hover {
-    color: #738a94;
+    color: #7C8B9A;
 }
+
 .lightgrey-hover:hover {
-    color: #e5eff5;
+    color: #CED4D9;
 }
+
 .blue-hover:hover {
-    color: #3eb0ef;
+    color: #14b8ff;
 }
+
 .red-hover:hover {
-    color: #f05230;
+    color: #f50b23;
 }
+
 .orange-hover:hover {
-    color: #fecd35;
+    color: #ffb41f;
 }
+
 .green-hover:hover {
-    color: #a4d037;
+    color: #30cf43;
 }
 
 /* Layout
@@ -493,7 +510,6 @@ h2 {
     outline: none;
     border: 1px solid rgb(214, 227, 235);
     color: rgb(130, 154, 168);
-    text-shadow: 0 1px 0 #fff;
     text-decoration: none !important;
     -webkit-user-select: none;
        -moz-user-select: none;
@@ -608,6 +624,7 @@ h2 {
     overflow: hidden;
     height: 100%;
 }
+
 /* Content viewport, contains everything else */
 .gh-viewport {
     -ms-flex-positive: 1;
@@ -617,6 +634,7 @@ h2 {
     overflow: hidden;
     max-height: 100%;
 }
+
 .gh-main {
     position: relative;
     -ms-flex-positive: 1;
@@ -630,185 +648,229 @@ h2 {
 /* Full screen workflow
 /* ---------------------------------------------------------- */
 .gh-flow {
-    -ms-flex-positive: 1;
-        flex-grow: 1;
-    display: -ms-flexbox;
+    flex-grow: 1;
     display: flex;
-    -ms-flex-direction: column;
-        flex-direction: column;
+    flex-direction: column;
     overflow-y: auto;
     min-height: 100%;
+    background: linear-gradient(315deg,#efefef,#fff);
 }
-.gh-flow-head {
-    -ms-flex-negative: 0;
-        flex-shrink: 0;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-pack: justify;
-        justify-content: space-between;
-    padding-top: 4vh;
-    padding-bottom: 20px;
-}
+
 .gh-flow-content-wrap {
-    -ms-flex-positive: 1;
-        flex-grow: 1;
-    -ms-flex-negative: 0;
-        flex-shrink: 0;
-    display: -ms-flexbox;
     display: flex;
-    -ms-flex-pack: center;
-        justify-content: center;
-    -ms-flex-align: center;
-        align-items: center;
-    margin: 0 5%;
+    flex-direction: column;
+    flex-grow: 1;
+    flex-shrink: 0;
+    justify-content: center;
+    align-items: center;
+    margin: 0 24px;
     padding-bottom: 8vh;
 }
-.gh-flow-back {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-        align-items: center;
-    margin: 0 0 0 3%;
-    padding: 2px 9px 2px 5px;
-    border: transparent 1px solid;
-    border-radius: 4px;
-    color: #7d878a;
-    font-weight: 100;
-    transition: all 0.3s ease;
-}
-.gh-flow-back svg {
-    margin-right: 4px;
-    height: 12px;
-    line-height: 14px;
-}
-.gh-flow-back svg path {
-    stroke: #7d878a;
-    stroke-width: 1.2px;
-}
-.gh-flow-back:hover {
-    border: #dae1e3 1px solid;
-}
-.gh-flow-back-plain {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-        align-items: center;
-    margin: 0 0 0 3%;
-    padding: 2px 9px 2px 5px;
-    color: #7d878a;
-    font-weight: 300;
-    transition: all 0.3s ease;
-    text-decoration: none;
-}
-.gh-flow-back-plain svg {
-    margin-right: 4px;
-    height: 12px;
-    line-height: 14px;
-}
-.gh-flow-back-plain svg path {
-    stroke: #7d878a;
-    stroke-width: 1.2px;
-}
-.gh-flow-back-plain:hover {
-    color: #15212A;
-}
-.gh-flow-nav {
-    position: relative;
-    -ms-flex: 1;
-        flex: 1;
+
+.gh-flow-content-wrap .site-icon {
+    width: 70px;
+    height: 70px;
+    border-radius: 3px;
 }
+
 .gh-flow-content {
-    display: -ms-flexbox;
     display: flex;
-    -ms-flex-direction: column;
-        flex-direction: column;
-    max-width: 700px;
+    flex-direction: column;
+    max-width: 520px;
     width: 100%;
-    color: #738a94;
-    text-align: center;
+    margin: 4rem 0 6rem;
+    padding: 40px;
+    background: #fff;
+    color: var(--darkgrey);
     font-size: 1.9rem;
     line-height: 1.5em;
-    font-weight: 100;
-}
-
-.gh-flow-content .gh-input-icon input {
-    padding-left: 35px;
+    font-weight: 300;
+    border-radius: 3px;
+    box-shadow: 
+        0 2.8px 2.2px rgba(0,0,0,.02),
+        0 6.7px 5.3px rgba(0,0,0,.02),
+        0 12.5px 10px rgba(0,0,0,.02),
+        0 22.3px 17.9px rgba(0,0,0,.03),
+        0 41.8px 33.4px rgba(0,0,0,.03),
+        0 100px 80px rgba(0,0,0,.05);
 }
 
-.gh-flow-content-unsubscribe {
-    font-weight: 300;
+.gh-flow-content.unsubscribe {
+        align-items: center;
+        justify-content: center;
+        max-width: 560px;
+        min-height: 200px;
+        margin: 4rem 0;
+        text-align: center;
 }
 
 @media (max-width: 500px) {
-    .gh-flow-head-unsubscribe {
-        padding-top: 2.8vh;
-    }
     .gh-flow-content {
-        font-size: 4vw;
-    }
-    .gh-flow-content-unsubscribe {
-        font-size: 1.8rem;
-        line-height: 1.6em;
+        padding: 0;
+        background: transparent;
+        box-shadow: none;
     }
 }
+
 .gh-flow-content header {
-    margin: 0 auto;
-    max-width: 520px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 }
+
 .gh-flow-content h1 {
-    font-size: 4.2rem;
-    font-weight: 100;
+    margin-bottom: 24px;
+    color: #15171A;
+    font-size: 4.1rem;
+    font-weight: 700;
+    line-height: 1.15em;
+}
+
+.gh-flow-content.unsubscribe h1 {
+    font-size: 3.2rem;
 }
+
 @media (max-width: 600px) {
-    .gh-flow-content h1 {
-        font-size: 7vw;
+    .gh-flow-content h1,
+    .gh-flow-content.unsubscribe h1 {
+        font-size: 6vw;
+    }
+}
+
+.gh-flow-content.unsubscribe p {
+    margin: 0 0 .4em;
+    color: #394047;
+    font-size: 1.8rem;
+}
+
+@media (max-width: 500px) {
+    .gh-flow-content.unsubscribe p {
+        font-size: 1.6rem;
+        line-height: 1.5;
     }
 }
+
 .gh-flow-content .gh-btn {
     display: block;
     margin: 20px auto 0;
     max-width: 400px;
 }
+
 .gh-flow-content .form-group {
+    position: relative;
     margin-bottom: 2.5rem;
 }
-.gh-flow-content input {
-    padding: 10px;
-    border: #dae1e3 1px solid;
-    font-size: 1.6rem;
-    line-height: 1.4em;
-    font-weight: 100;
+
+.gh-flow-content .form-group.error .gh-input {
+    border-color: #f50b23;
+    box-shadow: 0 0 0 3px rgba(239,24,24,.15);
+}
+
+.gh-flow-content .main-error {
+    position: absolute;
+    right: 0;
+    margin: 0;
+    color: #7C8B9A;
+    font-size: 1.35rem;
+    font-weight: 400;
+    text-align: center;
+    user-select: text;
 }
+
 .gh-flow-em {
     font-weight: 500;
 }
 
+.unsubscribe-footer {
+    text-align: center;
+    font-size: 1.5rem;
+}
+
+@media (max-width: 500px) {
+    .unsubscribe-footer {
+        padding: 0 24px;
+        font-size: 1.4rem;
+        line-height: 1.4em;
+    }
+}
+
+.unsubscribe-footer p {
+    color: #7C8B9A;
+    margin: 0 0 .4rem;
+}
+
+.unsubscribe-footer a {
+    color: #15171A;
+    text-decoration: none;
+}
+
+.unsubscribe-footer a:hover {
+    text-decoration: underline;
+}
+
 /* Sign in
 /* ---------------------------------------------------------- */
 .gh-signin {
-    position: relative;
-    margin: 30px auto;
-    padding: 40px;
-    max-width: 400px;
-    width: 100%;
-    border: #dae1e3 1px solid;
-    background: #f8fbfd;
-    border-radius: 5px;
-    text-align: left;
-}
-.gh-signin .form-group {
     margin-bottom: 1.5rem;
 }
+
+.gh-signin .gh-input,
+.gh-signin .gh-input:-webkit-autofill::first-line {
+    height: 54px;
+    padding: 12px 16px;
+    font-size: 1.8rem;
+    border-radius: 8px;
+}
+
+.gh-signin .gh-input::placeholder {
+    color: #abb4be;
+    font-weight: 400;
+    opacity: 1;
+}
+
+.gh-signin .gh-input::-webkit-input-placeholder {
+    color: #abb4be;
+    font-weight: 400;
+}
+
+.gh-signin .gh-input:-ms-input-placeholder {
+    color: #abb4be;
+    font-weight: 400;
+}
+
+.gh-signin .gh-input::-moz-placeholder {
+    color: #abb4be;
+    font-weight: 400;
+    opacity: 1;
+}
+
+.gh-signin .gh-input:focus {
+    border-color: #30cf43;
+    box-shadow: 0 0 0 3px rgba(26,170,96,.15);
+}
+
 .gh-signin .gh-btn {
     margin: 0;
 }
 
+.gh-signin .gh-btn {
+    width: 100%;
+    height: 54px;
+    max-width: unset;
+    margin-top: 32px;
+    background: #15171A;
+    font-weight: 300;
+    line-height: 54px;
+    border-radius: 8px;
+    transition: all 0.4s ease;
+    -webkit-font-smoothing: subpixel-antialiased;
+}
+
+.gh-signin .gh-btn span {
+    color: #fff;
+    font-size: 1.8rem;
+}
+
 /* Error /ghost/404/
 /* ---------------------------------------------------------- */
 

package/core/frontend/public/ghost.min.css

@@ -1 +1 @@
-/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;font-family:sans-serif}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}.darkgrey{color:#343f44}.midgrey{color:#738a94}.lightgrey{color:#e5eff5}.blue{color:#3eb0ef}.red{color:#f05230}.orange{color:#fecd35}.green{color:#a4d037}.darkgrey-hover:hover{color:#343f44}.midgrey-hover:hover{color:#738a94}.lightgrey-hover:hover{color:#e5eff5}.blue-hover:hover{color:#3eb0ef}.red-hover:hover{color:#f05230}.orange-hover:hover{color:#fecd35}.green-hover:hover{color:#a4d037}*,:after,:before{box-sizing:border-box}html{-webkit-tap-highlight-color:rgba(0,0,0,0);font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;font-size:62.5%;letter-spacing:.2px;line-height:1.65;overflow:hidden}body,html{height:100%;width:100%}body{color:#343f44;font-size:1.4rem;overflow:auto;overflow-x:hidden}.gh-view{-ms-flex-positive:1;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;flex-grow:1}h1,h2{text-rendering:optimizeLegibility;color:#343f44;font-size:2.9rem;line-height:1.15em;margin:0 0 .3em;text-indent:-1px}@media (max-width:500px){h1{font-size:2.4rem}}.gh-input{-webkit-appearance:none;border:1px solid #d6e3eb;border-radius:4px;color:#4b5b62;display:block;font-size:1.6rem;font-weight:300;height:40px;line-height:1em;padding:10px 12px;transition:border-color .15s linear;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text;width:100%}.gh-input:focus{border-color:#b4cbda;outline:0}.gh-btn{fill:#829aa8;-webkit-font-smoothing:subpixel-antialiased;border:1px solid #d6e3eb;border-radius:5px;color:#829aa8;display:inline-block;outline:none;text-decoration:none!important;text-shadow:0 1px 0 #fff;transition:all .2s ease;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.gh-btn span{border-radius:4px;display:block;font-size:1.3rem;font-weight:400;height:33px;letter-spacing:.2px;line-height:33px;padding:0 12px;text-align:center}.gh-btn:hover{border-color:#b4cbda}.gh-btn-hover-blue:hover{border-color:#3eb0ef;color:#3eb0ef}.gh-btn-blue{fill:#fff;background:linear-gradient(#3da1d6,#2288bf);border:0;box-shadow:0 1px 0 rgba(0,0,0,.12);color:#fff;padding:1px;text-shadow:0 -1px 0 rgba(0,0,0,.1);transition:none!important}.gh-btn-blue span{background:linear-gradient(#4ab6f0,#2fa5e4 60%,#2fa5e4 90%,#38a9e5);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.gh-btn-blue:active,.gh-btn-blue:focus{background:#1e78a9}.gh-btn-blue:active span,.gh-btn-blue:focus span{background:#29a0e0;box-shadow:none}.gh-btn-block{display:block;width:100%}.gh-input-icon{display:block;position:relative}.gh-input-icon svg{fill:color(var(--midgrey) l(15%));height:14px;left:10px;position:absolute;top:50%;transform:translateY(-7px);width:auto;z-index:2}.gh-input-icon input{padding-left:35px}.gh-app{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100%;overflow:hidden}.gh-viewport{max-height:100%;overflow:hidden}.gh-main,.gh-viewport{-ms-flex-positive:1;display:-ms-flexbox;display:flex;flex-grow:1}.gh-main{background:#fff;overflow-y:auto;position:relative}.gh-flow{-ms-flex-positive:1;-ms-flex-direction:column;flex-direction:column;flex-grow:1;min-height:100%;overflow-y:auto}.gh-flow,.gh-flow-head{display:-ms-flexbox;display:flex}.gh-flow-head{-ms-flex-negative:0;-ms-flex-pack:justify;flex-shrink:0;justify-content:space-between;padding-bottom:20px;padding-top:4vh}.gh-flow-content-wrap{-ms-flex-positive:1;-ms-flex-negative:0;-ms-flex-pack:center;flex-grow:1;flex-shrink:0;justify-content:center;margin:0 5%;padding-bottom:8vh}.gh-flow-back,.gh-flow-content-wrap{-ms-flex-align:center;align-items:center;display:-ms-flexbox;display:flex}.gh-flow-back{border:1px solid transparent;border-radius:4px;color:#7d878a;font-weight:100;left:0;margin:0 0 0 3%;padding:2px 9px 2px 5px;position:absolute;top:0;transition:all .3s ease}.gh-flow-back svg{height:12px;line-height:14px;margin-right:4px}.gh-flow-back svg path{stroke:#7d878a;stroke-width:1.2px}.gh-flow-back:hover{border:1px solid #dae1e3}.gh-flow-back-plain{-ms-flex-align:center;align-items:center;color:#7d878a;display:-ms-flexbox;display:flex;font-weight:300;left:0;margin:0 0 0 3%;padding:2px 9px 2px 5px;position:absolute;text-decoration:none;top:0;transition:all .3s ease}.gh-flow-back-plain svg{height:12px;line-height:14px;margin-right:4px}.gh-flow-back-plain svg path{stroke:#7d878a;stroke-width:1.2px}.gh-flow-back-plain:hover{color:#15212a}.gh-flow-nav{-ms-flex:1;flex:1;position:relative}.gh-flow-content{color:#738a94;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;font-size:1.9rem;font-weight:100;line-height:1.5em;max-width:700px;text-align:center;width:100%}.gh-flow-content .gh-input-icon input{padding-left:35px}.gh-flow-content-unsubscribe{font-weight:300}@media (max-width:500px){.gh-flow-head-unsubscribe{padding-top:2.8vh}.gh-flow-content{font-size:4vw}.gh-flow-content-unsubscribe{font-size:1.8rem;line-height:1.6em}}.gh-flow-content header{margin:0 auto;max-width:520px}.gh-flow-content h1{font-size:4.2rem;font-weight:100}@media (max-width:600px){.gh-flow-content h1{font-size:7vw}}.gh-flow-content .gh-btn{display:block;margin:20px auto 0;max-width:400px}.gh-flow-content .form-group{margin-bottom:2.5rem}.gh-flow-content input{border:1px solid #dae1e3;font-size:1.6rem;font-weight:100;line-height:1.4em;padding:10px}.gh-flow-em{font-weight:500}.gh-signin{background:#f8fbfd;border:1px solid #dae1e3;border-radius:5px;margin:30px auto;max-width:400px;padding:40px;position:relative;text-align:left;width:100%}.gh-signin .form-group{margin-bottom:1.5rem}.gh-signin .gh-btn{margin:0}.error-content{flex-grow:1;justify-content:center;padding:8vw;user-select:text}.error-content,.error-details{align-items:center;display:flex}.error-details{margin-bottom:4rem}.error-ghost{height:115px;margin:15px}@media (max-width:630px){.error-ghost{display:none}}.error-code{color:#c5d2d9;font-size:10vw;font-weight:600;letter-spacing:-.4vw;line-height:.9em;margin:0}.error-description{border:none;color:#54666d;font-size:2.3rem;font-weight:300;line-height:1.3em;margin:0;padding:0}.error-message{align-items:center;display:flex;flex-direction:column;margin:15px}.error-message a{font-size:1.4rem;line-height:1;margin:8px 0}.error-link{background-color:transparent;color:#5ba4e5;text-decoration:none;transition:background .3s,color .3s}.error-stack{background-color:hsla(0,0%,100%,.3);margin:1rem auto;max-width:800px;padding:2rem}.error-stack-list{list-style-type:none;margin:0;padding:0}.error-stack-list li{display:block}.error-stack-list li:before{color:#bbb;content:"\21AA";display:inline-block;font-size:1.2rem;margin-right:.5rem}.error-stack-function{font-weight:700}
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;font-family:sans-serif}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}.black{color:#15171a}.darkgrey{color:#394047}.midgrey{color:#7c8b9a}.lightgrey{color:#ced4d9}.blue{color:#14b8ff}.red{color:#f50b23}.orange{color:#ffb41f}.green{color:#30cf43}.darkgrey-hover:hover{color:#394047}.midgrey-hover:hover{color:#7c8b9a}.lightgrey-hover:hover{color:#ced4d9}.blue-hover:hover{color:#14b8ff}.red-hover:hover{color:#f50b23}.orange-hover:hover{color:#ffb41f}.green-hover:hover{color:#30cf43}*,:after,:before{box-sizing:border-box}html{-webkit-tap-highlight-color:rgba(0,0,0,0);font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;font-size:62.5%;letter-spacing:.2px;line-height:1.65;overflow:hidden}body,html{height:100%;width:100%}body{color:#343f44;font-size:1.4rem;overflow:auto;overflow-x:hidden}.gh-view{-ms-flex-positive:1;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;flex-grow:1}h1,h2{text-rendering:optimizeLegibility;color:#343f44;font-size:2.9rem;line-height:1.15em;margin:0 0 .3em;text-indent:-1px}@media (max-width:500px){h1{font-size:2.4rem}}.gh-input{-webkit-appearance:none;border:1px solid #d6e3eb;border-radius:4px;color:#4b5b62;display:block;font-size:1.6rem;font-weight:300;height:40px;line-height:1em;padding:10px 12px;transition:border-color .15s linear;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text;width:100%}.gh-input:focus{border-color:#b4cbda;outline:0}.gh-btn{fill:#829aa8;-webkit-font-smoothing:subpixel-antialiased;border:1px solid #d6e3eb;border-radius:5px;color:#829aa8;display:inline-block;outline:none;text-decoration:none!important;transition:all .2s ease;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.gh-btn span{border-radius:4px;display:block;font-size:1.3rem;font-weight:400;height:33px;letter-spacing:.2px;line-height:33px;padding:0 12px;text-align:center}.gh-btn:hover{border-color:#b4cbda}.gh-btn-hover-blue:hover{border-color:#3eb0ef;color:#3eb0ef}.gh-btn-blue{fill:#fff;background:linear-gradient(#3da1d6,#2288bf);border:0;box-shadow:0 1px 0 rgba(0,0,0,.12);color:#fff;padding:1px;text-shadow:0 -1px 0 rgba(0,0,0,.1);transition:none!important}.gh-btn-blue span{background:linear-gradient(#4ab6f0,#2fa5e4 60%,#2fa5e4 90%,#38a9e5);box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1)}.gh-btn-blue:active,.gh-btn-blue:focus{background:#1e78a9}.gh-btn-blue:active span,.gh-btn-blue:focus span{background:#29a0e0;box-shadow:none}.gh-btn-block{display:block;width:100%}.gh-input-icon{display:block;position:relative}.gh-input-icon svg{fill:color(var(--midgrey) l(15%));height:14px;left:10px;position:absolute;top:50%;transform:translateY(-7px);width:auto;z-index:2}.gh-input-icon input{padding-left:35px}.gh-app{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100%;overflow:hidden}.gh-viewport{max-height:100%;overflow:hidden}.gh-main,.gh-viewport{-ms-flex-positive:1;display:-ms-flexbox;display:flex;flex-grow:1}.gh-main{background:#fff;overflow-y:auto;position:relative}.gh-flow{background:linear-gradient(315deg,#efefef,#fff);min-height:100%;overflow-y:auto}.gh-flow,.gh-flow-content-wrap{display:flex;flex-direction:column;flex-grow:1}.gh-flow-content-wrap{align-items:center;flex-shrink:0;justify-content:center;margin:0 24px;padding-bottom:8vh}.gh-flow-content-wrap .site-icon{border-radius:3px;height:70px;width:70px}.gh-flow-content{background:#fff;border-radius:3px;box-shadow:0 2.8px 2.2px rgba(0,0,0,.02),0 6.7px 5.3px rgba(0,0,0,.02),0 12.5px 10px rgba(0,0,0,.02),0 22.3px 17.9px rgba(0,0,0,.03),0 41.8px 33.4px rgba(0,0,0,.03),0 100px 80px rgba(0,0,0,.05);color:var(--darkgrey);display:flex;flex-direction:column;font-size:1.9rem;font-weight:300;line-height:1.5em;margin:4rem 0 6rem;max-width:520px;padding:40px;width:100%}.gh-flow-content.unsubscribe{align-items:center;justify-content:center;margin:4rem 0;max-width:560px;min-height:200px;text-align:center}@media (max-width:500px){.gh-flow-content{background:transparent;box-shadow:none;padding:0}}.gh-flow-content header{align-items:center;display:flex;flex-direction:column}.gh-flow-content h1{color:#15171a;font-size:4.1rem;font-weight:700;line-height:1.15em;margin-bottom:24px}.gh-flow-content.unsubscribe h1{font-size:3.2rem}@media (max-width:600px){.gh-flow-content h1,.gh-flow-content.unsubscribe h1{font-size:6vw}}.gh-flow-content.unsubscribe p{color:#394047;font-size:1.8rem;margin:0 0 .4em}@media (max-width:500px){.gh-flow-content.unsubscribe p{font-size:1.6rem;line-height:1.5}}.gh-flow-content .gh-btn{display:block;margin:20px auto 0;max-width:400px}.gh-flow-content .form-group{margin-bottom:2.5rem;position:relative}.gh-flow-content .form-group.error .gh-input{border-color:#f50b23;box-shadow:0 0 0 3px rgba(239,24,24,.15)}.gh-flow-content .main-error{color:#7c8b9a;font-size:1.35rem;font-weight:400;margin:0;position:absolute;right:0;text-align:center;user-select:text}.gh-flow-em{font-weight:500}.unsubscribe-footer{font-size:1.5rem;text-align:center}@media (max-width:500px){.unsubscribe-footer{font-size:1.4rem;line-height:1.4em;padding:0 24px}}.unsubscribe-footer p{color:#7c8b9a;margin:0 0 .4rem}.unsubscribe-footer a{color:#15171a;text-decoration:none}.unsubscribe-footer a:hover{text-decoration:underline}.gh-signin{margin-bottom:1.5rem}.gh-signin .gh-input,.gh-signin .gh-input:-webkit-autofill:first-line{border-radius:8px;font-size:1.8rem;height:54px;padding:12px 16px}.gh-signin .gh-input::placeholder{color:#abb4be;font-weight:400;opacity:1}.gh-signin .gh-input::-webkit-input-placeholder{color:#abb4be;font-weight:400}.gh-signin .gh-input:-ms-input-placeholder{color:#abb4be;font-weight:400}.gh-signin .gh-input::-moz-placeholder{color:#abb4be;font-weight:400;opacity:1}.gh-signin .gh-input:focus{border-color:#30cf43;box-shadow:0 0 0 3px rgba(26,170,96,.15)}.gh-signin .gh-btn{-webkit-font-smoothing:subpixel-antialiased;background:#15171a;border-radius:8px;font-weight:300;height:54px;line-height:54px;margin:0;margin-top:32px;max-width:unset;transition:all .4s ease;width:100%}.gh-signin .gh-btn span{color:#fff;font-size:1.8rem}.error-content{flex-grow:1;justify-content:center;padding:8vw;user-select:text}.error-content,.error-details{align-items:center;display:flex}.error-details{margin-bottom:4rem}.error-ghost{height:115px;margin:15px}@media (max-width:630px){.error-ghost{display:none}}.error-code{color:#c5d2d9;font-size:10vw;font-weight:600;letter-spacing:-.4vw;line-height:.9em;margin:0}.error-description{border:none;color:#54666d;font-size:2.3rem;font-weight:300;line-height:1.3em;margin:0;padding:0}.error-message{align-items:center;display:flex;flex-direction:column;margin:15px}.error-message a{font-size:1.4rem;line-height:1;margin:8px 0}.error-link{background-color:transparent;color:#5ba4e5;text-decoration:none;transition:background .3s,color .3s}.error-stack{background-color:hsla(0,0%,100%,.3);margin:1rem auto;max-width:800px;padding:2rem}.error-stack-list{list-style-type:none;margin:0;padding:0}.error-stack-list li{display:block}.error-stack-list li:before{color:#bbb;content:"\21AA";display:inline-block;font-size:1.2rem;margin-right:.5rem}.error-stack-function{font-weight:700}

package/core/frontend/services/theme-engine/middleware/update-local-template-options.js

@@ -33,7 +33,9 @@ function updateLocalTemplateOptions(req, res, next) {
                 default_payment_card_last4: sub.default_payment_card_last4 || '****'
             });
         }),
-        paid: req.member.status !== 'free'
+        paid: req.member.status !== 'free',
+        status: req.member.status,
+        products: req.member.products
     } : null;
 
     hbs.updateLocalTemplateOptions(res.locals, _.merge({}, localTemplateOptions, {

package/core/frontend/views/unsubscribe.hbs

@@ -5,8 +5,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>
-        {{#if member}}Successfully Unsubscribed{{/if}}
-        {{#if error}}Unsubscribe Failed{{/if}}
+        {{#if error}}
+            Unsubscribe Failed
+        {{else}}
+            Successfully Unsubscribed
+        {{/if}}
     </title>
     <link rel="stylesheet" href="{{asset "public/ghost.css" hasMinFile="true"}}" />
 </head>
@@ -15,42 +18,34 @@
         <div class="gh-viewport">
             <main class="gh-main" role="main">
                 <div class="gh-flow">
-                    <header class="gh-flow-head gh-flow-head-unsubscribe">
-                        <nav class="gh-flow-nav">
-                            <a href="{{@site.url}}" class="gh-flow-back-plain">
-                                <!--?xml version="1.0" encoding="UTF-8" standalone="no"?-->
-                                <svg width="17px" height="27px" viewBox="0 0 17 27" version="1.1"
-                                    xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-                                    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"
-                                        stroke-linecap="round" stroke-linejoin="round">
-                                        <g id="Stroke-42" transform="translate(2.000000, 2.000000)" stroke-width="3"
-                                            stroke="#7d878a">
-                                            <polyline points="13.5401 0.4256 0.3971 11.9256 13.5401 23.4256"></polyline>
-                                        </g>
-                                    </g>
-                                </svg>
-                                Back to {{@site.title}}
-                            </a>
-                        </nav>
-                    </header>
-
                     <div class="gh-flow-content-wrap">
-                        <section class="gh-flow-content gh-flow-content-unsubscribe">
+                        {{#if @site.icon}}
+                            <img class="site-icon" src="{{img_url @site.icon absolute="true"}}" layout="fixed">
+                        {{/if}}
+                        <section class="gh-flow-content unsubscribe">
                             {{#if error}}
+                                <h1>Unsubscribe failed.</h1>
                                 <p>{{error}}</p>
-                            {{else}}
-                                {{#if member}}
-                                    <p>
-                                        <span class="gh-flow-em">{{member.email}}</span> has been successfully unsubscribed from emails.
-                                        {{#match member.status "!=" "free"}}
-                                            <br>
-                                            Don't worry, this will not cancel your paid subscription to {{@site.title}}.
-                                        {{/match}}
-                                    </p>
-                                    <p>Didn't mean to do this? Manage your account <a href="{{@site.url}}/#/portal/account">here</a>.</p>
-                                {{/if}}
+                            {{else if member}}
+                                <h1>Successfully unsubscribed.</h1>
+                                <p>
+                                    <span class="gh-flow-em">{{member.email}}</span> will no longer receive this newsletter.
+                                    {{#match member.status "!=" "free"}}
+                                        This will not cancel your paid subscription{{#if @site.title}} to {{@site.title}}{{/if}}.
+                                    {{/match}}
+                                </p>
                             {{/if}}
                         </section>
+                        <div class="unsubscribe-footer">
+                            {{#unless error}}
+                                <p>Didn't mean to do this? Manage your account <a href="{{@site.url}}/#/portal/account">here</a>.</p>
+                            {{/unless}}
+                            {{#if @site.title}}
+                                <a href="{{@site.url}}">{{@site.title}}</a>
+                            {{else}}
+                                <a href="{{@site.url}}">Visit site</a>
+                            {{/if}}
+                        </div>
                     </div>
                 </div>
             </main>

package/core/frontend/web/middleware/error-handler.js

@@ -84,10 +84,10 @@ const themeErrorRenderer = (err, req, res, next) => {
 };
 
 module.exports.handleThemeResponse = [
-    // Make sure the error can be served
-    prepareError,
     // Handle the error in Sentry
     sentry.errorHandler,
+    // Make sure the error can be served
+    prepareError,
     // Render the error using theme template
     themeErrorRenderer
 ];

package/core/server/api/canary/authentication.js

@@ -49,6 +49,13 @@ module.exports = {
 
                     return auth.setup.setupUser(setupDetails);
                 })
+                .then((data) => {
+                    try {
+                        return auth.setup.doFixtures(data, api.products);
+                    } catch (e) {
+                        return data;
+                    }
+                })
                 .then((data) => {
                     try {
                         return auth.setup.doProduct(data, api.products);