Upgrading Casper to 2.1.7

Closes #407
The font color should be inherited to avoid "invisible" text.

* fix conflicts with upstream branch

.editorconfig

@@ -0,0 +1,17 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.hbs]
+insert_final_newline = false
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -13,9 +13,12 @@ results
 
 npm-debug.log
 node_modules
+package-lock.json
 
 .idea/*
 *.iml
 projectFilesBackup
 
-.DS_Store
+.DS_Store
+
+dist/

README.md

@@ -34,12 +34,18 @@ One really neat trick is that you can also create custom one-off templates just
 
 Casper styles are compiled using Gulp/PostCSS to polyfill future CSS spec. You'll need Node and Gulp installed globally. After that, from the theme's root directory:
 
-`$ npm install`
-
-`$ gulp`
+```bash
+$ npm install
+$ gulp
+```
 
 Now you can edit `/assets/css/` files, which will be compiled to `/assets/built/` automatically.
 
+The `zip` Gulp task packages the theme files into `dist/<theme-name>.zip`, which you can then upload to your site.
+
+```bash
+$ gulp zip
+```
 
 # PostCSS Features Used
 

assets/css/global.css

@@ -383,7 +383,7 @@ dd {
 blockquote {
     margin: 1.5em 0;
     padding: 0 1.6em 0 1.6em;
-    border-left: var(--whitegrey) 0.5em solid;;
+    border-left: var(--whitegrey) 0.5em solid;
 }
 
 blockquote p {

assets/css/screen.css

@@ -36,8 +36,8 @@ body {
     display: block;
     width: 100%;
     height: 100%;
-    background-size: cover;
     background-position: center center;
+    background-size: cover;
     border-radius: 100%;
 }
 
@@ -70,9 +70,9 @@ body {
 
 /* Centered content container blocks */
 .inner {
-    width: 100%;
-    max-width: 1040px;
     margin: 0 auto;
+    max-width: 1040px;
+    width: 100%;
 }
 
 /* Usage:
@@ -149,9 +149,9 @@ body {
     flex-direction: column;
     justify-content: center;
     align-items: center;
+    padding: 10vw 4vw;
     min-height: 200px;
     max-height: 450px;
-    padding: 10vw 4vw;
     text-align: center;
 }
 
@@ -196,8 +196,8 @@ body {
     display: flex;
     justify-content: space-between;
     align-items: flex-start;
-    height: 40px;
     overflow-y: hidden;
+    height: 40px;
     font-size: 1.2rem;
 }
 
@@ -206,11 +206,12 @@ body {
     align-items: center;
     overflow-x: auto;
     overflow-y: hidden;
+    -webkit-overflow-scrolling: touch;
     margin-right: 10px;
     padding-bottom: 80px;
     letter-spacing: 0.4px;
     white-space: nowrap;
-    -webkit-overflow-scrolling: touch;
+
     -ms-overflow-scrolling: touch;
 }
 
@@ -348,8 +349,8 @@ The knock-on effect of this is ugly browser-scroll bars at the bottom, so 80px o
 }
 
 .rss-button svg {
-    height: 2.1rem;
     margin-bottom: 1px;
+    height: 2.1rem;
     fill: #fff;
 }
 
@@ -383,9 +384,9 @@ The knock-on effect of this is ugly browser-scroll bars at the bottom, so 80px o
     flex: 1 1 300px;
     display: flex;
     flex-direction: column;
-    min-height: 300px;
     overflow: hidden;
     margin: 0 20px 40px;
+    min-height: 300px;
     background: #fff center center;
     background-size: cover;
     border-radius: 5px;
@@ -455,9 +456,9 @@ The knock-on effect of this is ugly browser-scroll bars at the bottom, so 80px o
 }
 
 .author-profile-image {
+    margin-right: 5px;
     width: 25px;
     height: 25px;
-    margin-right: 5px;
     border-radius: 100%;
 
     object-fit: cover;
@@ -485,6 +486,7 @@ The first (most recent) post in the list is styled to be bigger than the others
     .home-template .post-feed .post-card:nth-child(6n+1):not(.no-image) .post-card-image-link {
         position: relative;
         flex: 1 1 auto;
+        border-radius: 5px 0 0 5px;
     }
 
     .home-template .post-feed .post-card:nth-child(6n+1):not(.no-image) .post-card-image {
@@ -548,9 +550,9 @@ The first (most recent) post in the list is styled to be bigger than the others
 /* ^ Required to make .post-full-content:before/after z-index stacking work */
 
 .post-full-header {
-    max-width: 1040px;
     margin: 0 auto;
     padding: 6vw 3vw 3vw;
+    max-width: 1040px;
     text-align: center;
 }
 @media (max-width: 500px) {
@@ -584,8 +586,8 @@ The first (most recent) post in the list is styled to be bigger than the others
 }
 
 .post-full-image {
-    height: 800px;
     margin: 0 -10vw -165px;
+    height: 800px;
     background: var(--lightgrey) center center;
     background-size: cover;
     border-radius: 5px;
@@ -593,8 +595,8 @@ The first (most recent) post in the list is styled to be bigger than the others
 
 @media (max-width: 1170px) {
     .post-full-image {
-        height: 600px;
         margin: 0 -4vw -100px;
+        height: 600px;
         border-radius: 0;
     }
 }
@@ -607,9 +609,9 @@ The first (most recent) post in the list is styled to be bigger than the others
 
 .post-full-content {
     position: relative;
-    min-height: 230px;
     margin: 0 auto;
     padding: 70px 100px 0;
+    min-height: 230px;
     font-family: Georgia, serif;
     font-size: 2.2rem;
     line-height: 1.6em;
@@ -728,8 +730,8 @@ The first (most recent) post in the list is styled to be bigger than the others
 .post-full-content img,
 .post-full-content video {
     display: block;
-    max-width: 1040px;
     margin: 1.5em auto;
+    max-width: 1040px;
 }
 @media (max-width: 1040px) {
     .post-full-content img,
@@ -748,8 +750,8 @@ Usage (In Ghost edtior):
 
 */
 .post-full-content img[src$="#full"] {
-    width: 100vw;
     max-width: none;
+    width: 100vw;
 }
 
 
@@ -800,10 +802,10 @@ Usage (In Ghost editor):
 }
 
 .post-full-content pre {
-    max-width: 100%;
     overflow-x: auto;
     margin: 1.5em 0 3em;
     padding: 20px;
+    max-width: 100%;
     border: color(var(--darkgrey) l(-10%)) 1px solid;
     color: var(--whitegrey);
     font-size: 1.4rem;
@@ -819,6 +821,10 @@ Usage (In Ghost editor):
     background: transparent;
 }
 
+.post-full-content pre code * {
+    color: inherit;
+}
+
 .post-full-content .fluid-width-video-wrapper {
     margin: 1.5em 0 3em;
 }
@@ -833,9 +839,9 @@ Usage (In Ghost editor):
     top: -15px;
     left: 50%;
     display: block;
+    margin-left: -10px;
     width: 1px;
     height: 30px;
-    margin-left: -10px;
     background: color(var(--lightgrey) l(+10%));
     box-shadow: #fff 0 0 0 5px;
     transform: rotate(45deg);
@@ -908,8 +914,8 @@ Usage (In Ghost editor):
 }
 @media (min-width: 1180px) {
     .post-full-content h5 {
-        width: 100vw;
         max-width: 1060px;
+        width: 100vw;
     }
 }
 @media (max-width: 500px) {
@@ -960,8 +966,8 @@ Usage (In Ghost editor):
         font-size: 2.9rem;
     }
     .post-full-image {
-        height: 350px;
         margin-bottom: 4vw;
+        height: 350px;
     }
     .post-full-content {
         padding: 0;
@@ -975,24 +981,24 @@ Usage (In Ghost editor):
 /* Tables */
 .post-full-content table {
     display: inline-block;
-    width: auto;
-    max-width: 100%;
     overflow-x: auto;
     margin: 0.5em 0 2.5em;
+    max-width: 100%;
+    width: auto;
     border-spacing: 0;
     border-collapse: collapse;
-    vertical-align: top;
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
     font-size: 1.6rem;
     white-space: nowrap;
+    vertical-align: top;
 }
 
 .post-full-content table {
-    background: radial-gradient(ellipse at left, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0) 75%) 0 center, radial-gradient(ellipse at right, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0) 75%) 100% center;
-    background-size: 10px 100%, 10px 100%;
-    background-attachment: scroll, scroll;
-    background-repeat: no-repeat;
     -webkit-overflow-scrolling: touch;
+    background: radial-gradient(ellipse at left, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0) 75%) 0 center, radial-gradient(ellipse at right, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0) 75%) 100% center;
+    background-attachment: scroll, scroll;
+    background-size: 10px 100%, 10px 100%;
+    background-repeat: no-repeat;
 }
 
 .post-full-content table td:first-child {
@@ -1003,8 +1009,8 @@ Usage (In Ghost editor):
 
 .post-full-content table td:last-child {
     background-image: linear-gradient(to left, rgba(255,255,255, 1) 50%, rgba(255,255,255, 0) 100%);
-    background-size: 20px 100%;
     background-position: 100% 0;
+    background-size: 20px 100%;
     background-repeat: no-repeat;
 }
 
@@ -1058,8 +1064,8 @@ Usage (In Ghost editor):
     display: flex;
     justify-content: center;
     align-items: center;
-    max-width: 420px;
     margin: 0 auto;
+    max-width: 420px;
 }
 
 .subscribe-form .form-group {
@@ -1068,8 +1074,8 @@ Usage (In Ghost editor):
 
 .subscribe-email {
     display: block;
-    width: 100%;
     padding: 10px;
+    width: 100%;
     border: color(var(--lightgrey) l(+7%)) 1px solid;
     color: var(--midgrey);
     font-size: 1.8rem;
@@ -1089,9 +1095,9 @@ Usage (In Ghost editor):
 
 .subscribe-form button {
     display: inline-block;
-    height: 41px;
     margin: 0 0 0 10px;
     padding: 0 20px;
+    height: 41px;
     outline: none;
     color: #fff;
     font-size: 1.5rem;
@@ -1133,8 +1139,8 @@ Usage (In Ghost editor):
         width: 100%;
     }
     .subscribe-form button {
-        width: 100%;
         margin: 10px 0 0 0;
+        width: 100%;
     }
 }
 
@@ -1146,9 +1152,9 @@ Usage (In Ghost editor):
     display: flex;
     justify-content: space-between;
     align-items: center;
-    max-width: 840px;
     margin: 0 auto;
     padding: 3vw 0 6vw 0;
+    max-width: 840px;
 }
 
 .author-card {
@@ -1157,9 +1163,9 @@ Usage (In Ghost editor):
 }
 
 .author-card .author-profile-image {
+    margin-right: 15px;
     width: 60px;
     height: 60px;
-    margin-right: 15px;
 }
 
 .author-card-name {
@@ -1211,8 +1217,8 @@ Usage (In Ghost editor):
 /* ---------------------------------------------------------- */
 
 .post-full-comments {
-    max-width: 840px;
     margin: 0 auto;
+    max-width: 840px;
 }
 
 
@@ -1297,8 +1303,9 @@ Usage (In Ghost editor):
 
 .read-next-divider svg {
     width: 40px;
-    stroke: #fff;
     fill: transparent;
+    stroke: #fff;
+
     stroke-width: 0.5px;
     stroke-opacity: 0.65;
 }
@@ -1316,8 +1323,8 @@ Usage (In Ghost editor):
     flex-direction: column;
     margin: 0 auto;
     padding: 0;
-    list-style: none;
     text-align: center;
+    list-style: none;
 }
 
 .read-next-card-content li {
@@ -1333,9 +1340,9 @@ Usage (In Ghost editor):
     display: block;
     padding: 20px 0;
     border-bottom: rgba(255,255,255,0.3) 1px solid;
-    vertical-align: top;
     color: #fff;
     font-weight: 500;
+    vertical-align: top;
     transition: opacity 0.3s ease;
 }
 
@@ -1406,8 +1413,8 @@ Usage (In Ghost editor):
 }
 
 .floating-header-logo img {
-    max-height: 20px;
     margin: 0 10px 0 0;
+    max-height: 20px;
 }
 
 .floating-header-divider {
@@ -1458,9 +1465,9 @@ Usage (In Ghost editor):
 }
 
 .floating-header-share-label svg {
+    margin: 0 5px 0 10px;
     width: 18px;
     height: 18px;
-    margin: 0 5px 0 10px;
     stroke: rgba(0,0,0,0.7);
     transform: rotate(90deg);
 }
@@ -1570,17 +1577,17 @@ Usage (In Ghost editor):
 .site-header-content .author-profile-image {
     z-index: 10;
     flex-shrink: 0;
+    margin: 0 0 20px 0;
     width: 100px;
     height: 100px;
-    margin: 0 0 20px 0;
     box-shadow: rgba(255,255,255,0.1) 0 0 0 6px;
 }
 
 .site-header-content .author-bio {
     z-index: 10;
     flex-shrink: 0;
-    max-width: 600px;
     margin: 5px 0 10px 0;
+    max-width: 600px;
     font-size: 2rem;
     line-height: 1.3em;
     font-weight: 300;
@@ -1732,8 +1739,8 @@ Usage (In Ghost editor):
 }
 
 .subscribe-overlay-description {
-    max-width: 650px;
     margin: 0 auto 50px;
+    max-width: 650px;
     font-family: Georgia, serif;
     font-size: 3rem;
     line-height: 1.3em;
@@ -1745,8 +1752,8 @@ Usage (In Ghost editor):
     display: flex;
     justify-content: center;
     align-items: center;
-    max-width: 500px;
     margin: 0 auto;
+    max-width: 500px;
 }
 
 .subscribe-overlay .form-group {
@@ -1755,8 +1762,8 @@ Usage (In Ghost editor):
 
 .subscribe-overlay .subscribe-email {
     display: block;
-    width: 100%;
     padding: 14px 20px;
+    width: 100%;
     border: none;
     color: var(--midgrey);
     font-size: 2rem;
@@ -1777,9 +1784,9 @@ Usage (In Ghost editor):
 
 .subscribe-overlay button {
     display: inline-block;
-    height: 52px;
     margin: 0 0 0 15px;
     padding: 0 25px;
+    height: 52px;
     outline: none;
     color: #fff;
     font-size: 1.7rem;
@@ -1857,15 +1864,15 @@ Usage (In Ghost editor):
 
 .site-footer-content {
     display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
     align-items: center;
-    flex-wrap: wrap;
     color: rgba(255,255,255,0.7);
     font-size: 1.3rem;
 }
 
 .site-footer-content a {
-    color: rgba(255,255,255,0.7);;
+    color: rgba(255,255,255,0.7);
 }
 
 .site-footer-content a:hover {

author.hbs

@@ -22,15 +22,15 @@
                     {{plural ../pagination.total empty='No posts' singular='% post' plural='% posts'}} <span class="bull">&bull;</span>
                 </div>
                 {{#if website}}
-                    <a class="social-link social-link-wb" href="{{website}}" target="_blank">{{> "icons/website"}}</a>
+                    <a class="social-link social-link-wb" href="{{website}}" target="_blank" rel="noopener">{{> "icons/website"}}</a>
                 {{/if}}
                 {{#if twitter}}
-                    <a class="social-link social-link-tw" href="{{twitter_url}}" target="_blank">{{> "icons/twitter"}}</a>
+                    <a class="social-link social-link-tw" href="{{twitter_url}}" target="_blank" rel="noopener">{{> "icons/twitter"}}</a>
                 {{/if}}
                 {{#if facebook}}
-                    <a class="social-link social-link-fb" href="{{facebook_url}}" target="_blank">{{> "icons/facebook"}}</a>
+                    <a class="social-link social-link-fb" href="{{facebook_url}}" target="_blank" rel="noopener">{{> "icons/facebook"}}</a>
                 {{/if}}
-                <a class="social-link social-link-rss" href="http://cloud.feedly.com/#subscription/feed/{{url absolute="true"}}/rss/" target="_blank">{{> "icons/rss"}}</a>
+                <a class="social-link social-link-rss" href="http://cloud.feedly.com/#subscription/feed/{{url absolute="true"}}/rss/" target="_blank" rel="noopener">{{> "icons/rss"}}</a>
             </div>
         </div>
     </div>

default.hbs

@@ -14,7 +14,7 @@
     {{!-- Styles'n'Scripts --}}
     <link rel="stylesheet" type="text/css" href="{{asset "built/screen.css"}}" />
 
-    {{!-- This tag outputes SEO meta+structured data and other important settings --}}
+    {{!-- This tag outputs SEO meta+structured data and other important settings --}}
     {{ghost_head}}
 
 </head>
@@ -31,9 +31,9 @@
                 <section class="copyright"><a href="{{@blog.url}}">{{@blog.title}}</a> &copy; {{date format="YYYY"}}</section>
                 <nav class="site-footer-nav">
                     <a href="{{@blog.url}}">Latest Posts</a>
-                    {{#if @blog.facebook}}<a href="{{facebook_url @blog.facebook}}" target="_blank">Facebook</a>{{/if}}
-                    {{#if @blog.twitter}}<a href="{{twitter_url @blog.twitter}}" target="_blank">Twitter</a>{{/if}}
-                    <a href="https://ghost.org" target="_blank">Ghost</a>
+                    {{#if @blog.facebook}}<a href="{{facebook_url @blog.facebook}}" target="_blank" rel="noopener">Facebook</a>{{/if}}
+                    {{#if @blog.twitter}}<a href="{{twitter_url @blog.twitter}}" target="_blank" rel="noopener">Twitter</a>{{/if}}
+                    <a href="https://ghost.org" target="_blank" rel="noopener">Ghost</a>
                 </nav>
             </div>
         </footer>

gulpfile.js

@@ -6,6 +6,7 @@ var livereload = require('gulp-livereload');
 var nodemon = require('gulp-nodemon');
 var postcss = require('gulp-postcss');
 var sourcemaps = require('gulp-sourcemaps');
+var zip = require('gulp-zip');
 
 // postcss plugins
 var autoprefixer = require('autoprefixer');
@@ -36,7 +37,8 @@ gulp.task('css', function () {
         autoprefixer({browsers: ['last 2 versions']}),
         cssnano()
     ];
-    gulp.src('assets/css/*.css')
+
+    return gulp.src('assets/css/*.css')
         .on('error', swallowError)
         .pipe(sourcemaps.init())
         .pipe(postcss(processors))
@@ -49,6 +51,20 @@ gulp.task('watch', function () {
     gulp.watch('assets/css/**', ['css']);
 });
 
+gulp.task('zip', ['css'], function() {
+    var targetDir = 'dist/';
+    var themeName = require('./package.json').name;
+    var filename = themeName + '.zip';
+
+    return gulp.src([
+        '**',
+        '!node_modules', '!node_modules/**',
+        '!dist', '!dist/**'
+    ])
+        .pipe(zip(filename))
+        .pipe(gulp.dest(targetDir));
+});
+
 gulp.task('default', ['build'], function () {
     gulp.start('watch');
 });

package.json

@@ -2,7 +2,7 @@
     "name": "casper",
     "description": "The default personal blogging theme for Ghost. Beautiful, minimal and responsive.",
     "demo": "https://demo.ghost.io",
-    "version": "2.1.1",
+    "version": "2.1.7",
     "engines": {
         "ghost": ">=1.2.0"
     },
@@ -43,6 +43,7 @@
         "gulp-sourcemaps": "1.6.0",
         "gulp-util": "3.0.7",
         "gulp-watch": "4.3.8",
+        "gulp-zip": "4.0.0",
         "postcss-color-function": "2.0.1",
         "postcss-custom-properties": "5.0.1",
         "postcss-easy-import": "1.0.1"

partials/site-nav.hbs

@@ -14,16 +14,16 @@
     <div class="site-nav-right">
         <div class="social-links">
             {{#if @blog.facebook}}
-                <a class="social-link social-link-fb" href="{{facebook_url @blog.facebook}}" target="_blank">{{> "icons/facebook"}}</a>
+                <a class="social-link social-link-fb" href="{{facebook_url @blog.facebook}}" target="_blank" rel="noopener">{{> "icons/facebook"}}</a>
             {{/if}}
             {{#if @blog.twitter}}
-                <a class="social-link social-link-tw" href="{{twitter_url @blog.twitter}}" target="_blank">{{> "icons/twitter"}}</a>
+                <a class="social-link social-link-tw" href="{{twitter_url @blog.twitter}}" target="_blank" rel="noopener">{{> "icons/twitter"}}</a>
             {{/if}}
         </div>
         {{#if @labs.subscribers}}
             <a class="subscribe-button" href="#subscribe">Subscribe</a>
         {{else}}
-            <a class="rss-button" href="http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/" target="_blank">{{> "icons/rss"}}</a>
+            <a class="rss-button" href="http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/" target="_blank" rel="noopener">{{> "icons/rss"}}</a>
         {{/if}}
     </div>
 </nav>