Merge branch 'master' into fix/infinitescroll

assets/built/jquery.fitvids.js

@@ -1,2 +1,2 @@
-!function(d){"use strict";d.fn.fitVids=function(t){var i={customSelector:null,ignore:null};if(!document.getElementById("fit-vids-style")){var e=document.head||document.getElementsByTagName("head")[0],r=document.createElement("div");r.innerHTML='<p>x</p><style id="fit-vids-style">.fluid-width-video-container{flex-grow: 1;width:100%;}.fluid-width-video-wrapper{width:100%;position:relative;padding:0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position:absolute;top:0;left:0;width:100%;height:100%;}</style>',e.appendChild(r.childNodes[1])}return t&&d.extend(i,t),this.each(function(){var t=['iframe[src*="player.vimeo.com"]','iframe[src*="youtube.com"]','iframe[src*="youtube-nocookie.com"]','iframe[src*="kickstarter.com"][src*="video.html"]',"object","embed"];i.customSelector&&t.push(i.customSelector);var r=".fitvidsignore";i.ignore&&(r=r+", "+i.ignore);var e=d(this).find(t.join(","));(e=(e=e.not("object object")).not(r)).each(function(){var t=d(this);if(!(0<t.parents(r).length||"embed"===this.tagName.toLowerCase()&&t.parent("object").length||t.parent(".fluid-width-video-wrapper").length)){t.css("height")||t.css("width")||!isNaN(t.attr("height"))&&!isNaN(t.attr("width"))||(t.attr("height",9),t.attr("width",16));var e=("object"===this.tagName.toLowerCase()||t.attr("height")&&!isNaN(parseInt(t.attr("height"),10))?parseInt(t.attr("height"),10):t.height())/(isNaN(parseInt(t.attr("width"),10))?t.width():parseInt(t.attr("width"),10));if(!t.attr("name")){var i="fitvid"+d.fn.fitVids._count;t.attr("name",i),d.fn.fitVids._count++}t.wrap('<div class="fluid-width-video-container"><div class="fluid-width-video-wrapper"></div></div>').parent(".fluid-width-video-wrapper").css("padding-top",100*e+"%"),t.removeAttr("height").removeAttr("width")}})})},d.fn.fitVids._count=0}(window.jQuery||window.Zepto);
+!function(o){"use strict";o.fn.fitVids=function(t){var e,i,d={customSelector:null,ignore:null};return document.getElementById("fit-vids-style")||(e=document.head||document.getElementsByTagName("head")[0],(i=document.createElement("div")).innerHTML='<p>x</p><style id="fit-vids-style">.fluid-width-video-container{flex-grow: 1;width:100%;}.fluid-width-video-wrapper{width:100%;position:relative;padding:0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position:absolute;top:0;left:0;width:100%;height:100%;}</style>',e.appendChild(i.childNodes[1])),t&&o.extend(d,t),this.each(function(){var t=['iframe[src*="player.vimeo.com"]','iframe[src*="youtube.com"]','iframe[src*="youtube-nocookie.com"]','iframe[src*="kickstarter.com"][src*="video.html"]',"object","embed"];d.customSelector&&t.push(d.customSelector);var r=".fitvidsignore";d.ignore&&(r=r+", "+d.ignore);var e=o(this).find(t.join(","));(e=(e=e.not("object object")).not(r)).each(function(){var t,e,i=o(this);0<i.parents(r).length||"embed"===this.tagName.toLowerCase()&&i.parent("object").length||i.parent(".fluid-width-video-wrapper").length||(i.css("height")||i.css("width")||!isNaN(i.attr("height"))&&!isNaN(i.attr("width"))||(i.attr("height",9),i.attr("width",16)),t=("object"===this.tagName.toLowerCase()||i.attr("height")&&!isNaN(parseInt(i.attr("height"),10))?parseInt(i.attr("height"),10):i.height())/(isNaN(parseInt(i.attr("width"),10))?i.width():parseInt(i.attr("width"),10)),i.attr("name")||(e="fitvid"+o.fn.fitVids._count,i.attr("name",e),o.fn.fitVids._count++),i.wrap('<div class="fluid-width-video-container"><div class="fluid-width-video-wrapper"></div></div>').parent(".fluid-width-video-wrapper").css("padding-top",100*t+"%"),i.removeAttr("height").removeAttr("width"))})})},o.fn.fitVids._count=0}(window.jQuery||window.Zepto);
 //# sourceMappingURL=jquery.fitvids.js.map

assets/css/components/buttons.css

@@ -32,10 +32,10 @@
 }
 
 .gh-button.gh-button-large {
-    height: calc(var(--height) * 1.14);
-    line-height: calc(var(--height) * 1.14);
-    padding: 0 3rem;
-    font-size: 1.6rem;
+    height: calc(var(--height) * 1.2);
+    line-height: calc(var(--height) * 1.2);
+    padding: 0 2.5rem;
+    font-size: 1.7rem;
 }
 
 .gh-button.gh-button-disabled,

assets/css/components/global.css

@@ -19,7 +19,7 @@ body {
     margin: 0;
     padding: 0;
     color: color(var(--color-base) l(+20%));
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
+    font-family: var(--font-sans-serif);
     font-size: 1.5rem;
     line-height: 1.6em;
     font-weight: 400;
@@ -65,6 +65,7 @@ button,
 select,
 textarea {
     font: inherit;
+    -webkit-appearance: none;
 }
 
 fieldset {
@@ -116,8 +117,8 @@ sub {
     bottom: -0.25em;
 }
 
-li:not([class]) + li:not([class]) {
-    margin-top: 1em;
+ul:not([class]) li + li {
+    margin-top: 0.6em;
 }
 
 a:not([class]) {

assets/css/ghost/badge.css

@@ -0,0 +1,26 @@
+.gh-powered {
+    display: inline-flex;
+    align-items: center;
+    padding: 6px 9px 6px 6px;
+    border: rgba(0,0,0,0.15) 1px solid;
+    font-size: 13px;
+    line-height: 13px;
+    letter-spacing: -0.1px;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    font-weight: 500;
+    color: #131313 !important;
+    background: #fff;
+    border-radius: 6px;
+}
+
+.gh-powered:hover {
+    border: rgba(0,0,0,0.3) 1px solid;
+    color: #131313 !important;
+    text-decoration: none !important;
+}
+
+.gh-powered svg {
+    height: 18px;
+    width: 18px;
+    margin: 0 6px 0 0;
+}

assets/css/ghost/members.css

@@ -73,7 +73,7 @@ form[data-members-form] .message-error {
     fill: #fff;
 }
 .message-error svg {
-    fill: red;
+    fill: var(--color-error);
 }
 
 form[data-members-form].success .message-success,
@@ -98,9 +98,9 @@ form[data-members-form].success .message-success {
     background: var(--color-success);
 }
 form[data-members-form].error .message-error {
-    color: red;
+    color: var(--color-error);
     background: #fff;
-    box-shadow: red 0 0 0 1px;
+    box-shadow: var(--color-error) 0 0 0 1px;
 }
 
 form[data-members-form] .gh-button {

assets/css/screen.css

@@ -21,6 +21,8 @@ production stylesheet in assets/built/screen.css using: gulp dev
 @import "ghost/members.css";
 @import "ghost/errors.css";
 @import "ghost/footer.css";
+@import "ghost/badge.css";
+
 
 
 /* Main - Your styles here! Edit below

assets/css/vars.css

@@ -8,6 +8,8 @@
     --color-base: #131313;
     --color-border: #ddd;
     --color-bg: #f5f5f5;
+    --color-success: #80b912;
+    --color-error: #f05230;
 
     /* Fonts */
     --font-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;