From 61a8845ab5dbb4438dda138152369dbd3fa98b32 Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Thu, 18 Aug 2016 21:29:46 +0200 Subject: [PATCH] Switch to new native system font stack (#7219) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no issue Based on an increasingly popular trend and modern web typography capabilities, switch out Google Fonts for default native system fonts, tailored in a stack to suit every device. Also makes some very minor visual adjustments to suit. Nixes all references to Google Fonts, and provides a faster rendering experience and fewer http requests. 💃 Reference material: https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practical-guide/ https://medium.design/system-shock-6b1dc6d6596f#.rhqx5fmyz Dependencies: TryGhost/Ghost-Admin#211 TryGhost/Ghost-Desktop#190 --- PRIVACY.md | 7 +----- core/server/api/configuration.js | 1 - .../private-blogging/lib/views/private.hbs | 1 - .../apps/subscribers/lib/views/subscribe.hbs | 1 - core/server/mail/templates/invite-user.html | 5 ++--- core/server/mail/templates/newsletter.html | 22 +++++++++---------- core/server/views/user-error.hbs | 1 - .../integration/api/api_configuration_spec.js | 1 - core/test/unit/migration_fixture_spec.js | 2 +- 9 files changed, 15 insertions(+), 26 deletions(-) diff --git a/PRIVACY.md b/PRIVACY.md index 9ff1bed44d..bd3f0232e6 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -20,11 +20,6 @@ This service can be disabled at any time. All of the information and code relate Ghost uses a number of third party services for specific functionality within Ghost. - -### Google Fonts - -Ghost makes use of the Open Sans [Google Font](https://www.google.com/fonts), which is loaded into the Ghost admin area to provide a typographically stimulating experience. - ### Gravatar To automatically populate your profile picture, Ghost pings [Gravatar](http://gravatar.com) to see if your email address is associated with a profile there. If it is, we pull in your profile picture. If not: nothing happens. @@ -48,4 +43,4 @@ Ghost outputs basic meta tags to allow rich snippets of your content to be recog ### Default Theme -The default theme which comes with Ghost loads a copy of jQuery from the jQuery Foundation's [public CDN](https://code.jquery.com/jquery-1.11.3.min.js). The theme also contains three sharing buttons to [Twitter](http://twitter.com), [Facebook](http://facebook.com), and [Google Plus](http://plus.google.com). No resources are loaded from any services, however the buttons do allow visitors to your blog to share your content publicly on these respective networks. +The default theme which comes with Ghost loads a copy of jQuery from the jQuery Foundation's [public CDN](https://code.jquery.com/jquery-1.11.3.min.js), and makes use of the Open Sans [Google Font](https://www.google.com/fonts). The theme also contains three sharing buttons to [Twitter](http://twitter.com), [Facebook](http://facebook.com), and [Google Plus](http://plus.google.com). No resources are loaded from any services, however the buttons do allow visitors to your blog to share your content publicly on these respective networks. diff --git a/core/server/api/configuration.js b/core/server/api/configuration.js index c36695b9d2..6b2d3b9290 100644 --- a/core/server/api/configuration.js +++ b/core/server/api/configuration.js @@ -30,7 +30,6 @@ function getAboutConfig() { function getBaseConfig() { return { fileStorage: {value: (config.fileStorage !== false), type: 'bool'}, - useGoogleFonts: {value: !config.isPrivacyDisabled('useGoogleFonts'), type: 'bool'}, useGravatar: {value: !config.isPrivacyDisabled('useGravatar'), type: 'bool'}, publicAPI: labsFlag('publicAPI'), internalTags: labsFlag('internalTags'), diff --git a/core/server/apps/private-blogging/lib/views/private.hbs b/core/server/apps/private-blogging/lib/views/private.hbs index e1d4274373..d37d940b5e 100644 --- a/core/server/apps/private-blogging/lib/views/private.hbs +++ b/core/server/apps/private-blogging/lib/views/private.hbs @@ -15,7 +15,6 @@ - diff --git a/core/server/apps/subscribers/lib/views/subscribe.hbs b/core/server/apps/subscribers/lib/views/subscribe.hbs index 61fe797c76..7b963bef22 100644 --- a/core/server/apps/subscribers/lib/views/subscribe.hbs +++ b/core/server/apps/subscribers/lib/views/subscribe.hbs @@ -15,7 +15,6 @@ - diff --git a/core/server/mail/templates/invite-user.html b/core/server/mail/templates/invite-user.html index 5b6af6f6a5..f4e461788f 100644 --- a/core/server/mail/templates/invite-user.html +++ b/core/server/mail/templates/invite-user.html @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ -

Welcome

+

Welcome

{{blogName}} is using Ghost to publish things on the internet! {{invitedByName}} has invited you to join. Please click on the link below to activate your account.

Click here to activate your account

No idea what Ghost is? It's a simple, beautiful platform for running an online blog or publication. Writers, businesses and individuals from all over the world use Ghost to publish their stories and ideas. Find out more.

@@ -53,4 +53,3 @@ - diff --git a/core/server/mail/templates/newsletter.html b/core/server/mail/templates/newsletter.html index 9ff90bdd1d..ab2e625148 100644 --- a/core/server/mail/templates/newsletter.html +++ b/core/server/mail/templates/newsletter.html @@ -101,7 +101,7 @@ -

+

{{blog.title}}

@@ -140,7 +140,7 @@ -

+

{{newsletter.interval}} digest — {{newsletter.date}}

@@ -260,7 +260,7 @@

- + {{blog.post[0].title}}

@@ -301,7 +301,7 @@ -

+

{{blog.post[0].text}}

@@ -462,7 +462,7 @@

- + {{blog.post[1].title}}

@@ -474,7 +474,7 @@ -

+

{{blog.post[1].text}}

@@ -541,7 +541,7 @@

- + {{blog.post[2].title}}

@@ -553,7 +553,7 @@ -

+

{{blog.post[2].text}}

@@ -623,7 +623,7 @@

- + {{blog.post[i]['title']}}

@@ -635,7 +635,7 @@ -

+

{{blog.post[i]['text']}}

@@ -826,7 +826,7 @@ -

+

You’re receiving this email because you subscribed to {{newsletter.interval}} emails from {{blog.title}}
If you’d prefer not to receive these, you can unsubscribe instantly diff --git a/core/server/views/user-error.hbs b/core/server/views/user-error.hbs index 707afc3c38..56cfd3c8ad 100644 --- a/core/server/views/user-error.hbs +++ b/core/server/views/user-error.hbs @@ -15,7 +15,6 @@ - diff --git a/core/test/integration/api/api_configuration_spec.js b/core/test/integration/api/api_configuration_spec.js index 8448e5579d..95cedd8494 100644 --- a/core/test/integration/api/api_configuration_spec.js +++ b/core/test/integration/api/api_configuration_spec.js @@ -26,7 +26,6 @@ describe('Configuration API', function () { props.should.have.property('blogTitle').which.is.an.Object().with.properties('type', 'value'); props.should.have.property('routeKeywords').which.is.an.Object().with.properties('type', 'value'); props.should.have.property('fileStorage').which.is.an.Object().with.properties('type', 'value'); - props.should.have.property('useGoogleFonts').which.is.an.Object().with.properties('type', 'value'); props.should.have.property('useGravatar').which.is.an.Object().with.properties('type', 'value'); props.should.have.property('publicAPI').which.is.an.Object().with.properties('type', 'value'); diff --git a/core/test/unit/migration_fixture_spec.js b/core/test/unit/migration_fixture_spec.js index 2ec9ff3e18..c9cd39252d 100644 --- a/core/test/unit/migration_fixture_spec.js +++ b/core/test/unit/migration_fixture_spec.js @@ -162,7 +162,7 @@ describe('Fixtures', function () { it('tried to move jQuery AND add a privacy message if any privacy settings are on', function (done) { var notificationsAddStub = sandbox.stub(notifications, 'add').returns(Promise.resolve()); - configUtils.set({privacy: {useGoogleFonts: false}}); + configUtils.set({privacy: {useGravatar: false}}); getObjStub.get.returns(''); moveJquery({}, loggerStub).then(function () {