Skip to content

Commit

Permalink
Upgrade Ghost to v1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
chadly committed Aug 23, 2017
1 parent 3b6d82b commit b80af10
Show file tree
Hide file tree
Showing 37 changed files with 8,247 additions and 8,056 deletions.
2 changes: 1 addition & 1 deletion content/themes/casper/assets/built/screen.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content/themes/casper/assets/built/screen.css.map

Large diffs are not rendered by default.

25 changes: 21 additions & 4 deletions content/themes/casper/assets/css/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,17 @@ body {
/* 2. Layout - Page building blocks
/* ---------------------------------------------------------- */

.site-wrapper {
display: flex;
flex-direction: column;
min-height: 100vh;
}

.site-main {
z-index: 100;
flex-grow: 1;
}

/* Full width page blocks */
.outer {
position: relative;
Expand Down Expand Up @@ -149,6 +160,7 @@ body {
padding: 0;
font-size: 3.8rem;
font-weight: 700;
z-index: 10;
}

.site-logo {
Expand All @@ -162,6 +174,7 @@ body {
font-weight: 300;
letter-spacing: 0.5px;
opacity: 0.8;
z-index: 10;
}

@media (max-width: 500px) {
Expand Down Expand Up @@ -358,10 +371,6 @@ The knock-on effect of this is ugly browser-scroll bars at the bottom, so 80px o
/* 6. Post Feed
/* ---------------------------------------------------------- */

.site-main {
z-index: 100;
}

.post-feed {
position: relative;
display: flex;
Expand Down Expand Up @@ -450,6 +459,7 @@ The knock-on effect of this is ugly browser-scroll bars at the bottom, so 80px o
height: 25px;
margin-right: 5px;
border-radius: 100%;
object-fit: cover;
}

.post-card-author {
Expand Down Expand Up @@ -1449,6 +1459,10 @@ Usage (In Ghost editor):
background-color: var(--blue);
}

.progress::-moz-progress-bar {
background-color: var(--blue);
}

.progress-container {
position: absolute;
top: 0;
Expand Down Expand Up @@ -1511,10 +1525,12 @@ Usage (In Ghost editor):
height: 100px;
margin: 0 0 20px 0;
box-shadow: rgba(255,255,255,0.1) 0 0 0 6px;
z-index: 10;
}

.site-header-content .author-bio {
flex-shrink: 0;
z-index: 10;
max-width: 600px;
margin: 5px 0 10px 0;
font-size: 2rem;
Expand All @@ -1526,6 +1542,7 @@ Usage (In Ghost editor):

.site-header-content .author-meta {
flex-shrink: 0;
z-index: 10;
display: flex;
justify-content: center;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion content/themes/casper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4",
"version": "2.0.6",
"engines": {
"ghost": ">=1.2.0"
},
Expand Down

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions core/server/admin/app.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
var debug = require('ghost-ignition').debug('admin'),
config = require('../config'),
express = require('express'),

// App requires
config = require('../config'),
utils = require('../utils'),

// Middleware
// Admin only middleware
adminMiddleware = require('./middleware'),
serveStatic = require('express').static,

// Global/shared middleware?
// Global/shared middleware
cacheControl = require('../middleware/cache-control'),
urlRedirects = require('../middleware/url-redirects'),
errorHandler = require('../middleware/error-handler'),
maintenance = require('../middleware/maintenance'),
prettyURLs = require('../middleware/pretty-urls'),
serveStatic = require('express').static,
utils = require('../utils');
prettyURLs = require('../middleware/pretty-urls');

module.exports = function setupAdminApp() {
debug('Admin setup start');
Expand Down
10 changes: 5 additions & 5 deletions core/server/admin/views/default-prod.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>Ghost Admin</title>


<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Atrue%7D%2C%22ENABLE_DS_FILTER%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%221.6%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22torii%22%3A%7B%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Atrue%7D%2C%22ENABLE_DS_FILTER%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%221.7%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22torii%22%3A%7B%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />

<meta name="HandheldFriendly" content="True" />
<meta name="MobileOptimized" content="320" />
Expand All @@ -33,8 +33,8 @@
<meta name="msapplication-square310x310logo" content="assets/img/large-70a667d61d5176305f12c460e2d3c5a3.png" />


<link rel="stylesheet" href="assets/vendor.min-009927368b3fccac0109ec0e4ca32fc0.css">
<link rel="stylesheet" href="assets/ghost.min-2fe6bcb1046d8c3b263bac0d9ad0365c.css" title="light">
<link rel="stylesheet" href="assets/vendor.min-7b92076fbe9cfbda9fa83e85fe6b31c6.css">
<link rel="stylesheet" href="assets/ghost.min-ae56f3dfbe3bab31d0f38aa7a8d8795e.css" title="light">



Expand All @@ -52,8 +52,8 @@
<div id="ember-basic-dropdown-wormhole"></div>


<script src="assets/vendor.min-55c925924307d265f2573f87177a89c8.js"></script>
<script src="assets/ghost.min-ee9d445842e1f287d1215ea70e1e555f.js"></script>
<script src="assets/vendor.min-a6a7811b29e74ddc342a6f2d50fab7a9.js"></script>
<script src="assets/ghost.min-51612a5ad8c195dce62103b7ec25169f.js"></script>

</body>
</html>
10 changes: 5 additions & 5 deletions core/server/admin/views/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>Ghost Admin</title>


<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Atrue%7D%2C%22ENABLE_DS_FILTER%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%221.6%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22torii%22%3A%7B%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Atrue%7D%2C%22ENABLE_DS_FILTER%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%221.7%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22torii%22%3A%7B%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />

<meta name="HandheldFriendly" content="True" />
<meta name="MobileOptimized" content="320" />
Expand All @@ -33,8 +33,8 @@
<meta name="msapplication-square310x310logo" content="assets/img/large-70a667d61d5176305f12c460e2d3c5a3.png" />


<link rel="stylesheet" href="assets/vendor.min-009927368b3fccac0109ec0e4ca32fc0.css">
<link rel="stylesheet" href="assets/ghost.min-2fe6bcb1046d8c3b263bac0d9ad0365c.css" title="light">
<link rel="stylesheet" href="assets/vendor.min-7b92076fbe9cfbda9fa83e85fe6b31c6.css">
<link rel="stylesheet" href="assets/ghost.min-ae56f3dfbe3bab31d0f38aa7a8d8795e.css" title="light">



Expand All @@ -52,8 +52,8 @@
<div id="ember-basic-dropdown-wormhole"></div>


<script src="assets/vendor.min-55c925924307d265f2573f87177a89c8.js"></script>
<script src="assets/ghost.min-ee9d445842e1f287d1215ea70e1e555f.js"></script>
<script src="assets/vendor.min-a6a7811b29e74ddc342a6f2d50fab7a9.js"></script>
<script src="assets/ghost.min-51612a5ad8c195dce62103b7ec25169f.js"></script>

</body>
</html>
69 changes: 69 additions & 0 deletions core/server/analytics-events.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
var _ = require('lodash'),
config = require('./config'),
events = require('./events'),
Analytics = require('analytics-node'),
analytics;

module.exports.init = function () {
analytics = new Analytics(config.get('segment:key'));
var toTrack,
trackDefaults = config.get('segment:trackDefaults') || {},
prefix = config.get('segment:prefix') || '';

toTrack = [
{
event: 'post.added',
name: 'Blog Post Created'
},
{
event: 'post.published',
name: 'Blog Post Published'
},
{
event: 'page.published',
name: 'Blog Page Published'
},
{
event: 'user.added',
name: 'User Invite Sent'
},
{
event: 'user.activated',
name: 'User Invite Activated'
},
{
event: 'user.activated.edited',
name: 'User Account Updated'
},
{
event: 'subscriber.added',
name: 'New Subscriber Added'
},
{
event: 'token.added',
name: 'Access Token Added'
},
{
event: 'setup.completed',
name: 'Created Owner Account'
},
{
event: 'theme.uploaded',
name: 'Uploaded Theme'
},
{
event: 'theme.downloaded',
name: 'Downloaded Theme'
},
{
event: 'theme.deleted',
name: 'Deleted Theme'
}
];

_.each(toTrack, function (track) {
events.on(track.event, function () {
analytics.track(_.extend(trackDefaults, {event: prefix + track.name}));
});
});
};
Loading

0 comments on commit b80af10

Please sign in to comment.