From 07f7c7f56fee708f37bb9341350a7e36a648cb9f Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Thu, 25 Sep 2014 18:33:57 +0300 Subject: [PATCH] Correct broken Google webfont in editor Fixes #4162 --- PRIVACY.md | 4 ++-- core/client/assets/sass/helpers/variables.scss | 4 ++-- core/client/assets/sass/layouts/editor.scss | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/PRIVACY.md b/PRIVACY.md index f57d9d6409..d327d01584 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -18,12 +18,12 @@ This service can be disabled at any time. All of the information and code relate ## Third Party Services -Ghost uses a number of third party services for specific functionality within Ghost. +Ghost uses a number of third party services for specific functionality within Ghost. ### Google Fonts -Ghost makes use of the Open Sans and Inconsolata [Google Fonts](https://www.google.com/fonts). These are loaded into the Ghost admin area to provide a typographically stimulating experience. +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 diff --git a/core/client/assets/sass/helpers/variables.scss b/core/client/assets/sass/helpers/variables.scss index 105f5a67d9..4123e0a3d6 100644 --- a/core/client/assets/sass/helpers/variables.scss +++ b/core/client/assets/sass/helpers/variables.scss @@ -39,7 +39,7 @@ $default-transition-duration: 0.3s; $side-outlet-transition-duration: 0.4s; $font-family: 'Open Sans', sans-serif; -$font-family-mono: Inconsolata, monospace; +$font-family-mono: monospace; $at2x: 2 device-pixel-ratio; @@ -77,4 +77,4 @@ $screen-md-min: $screen-md !default; $screen-sm: 768px !default; $screen-sm-min: $screen-sm !default; -$grid-gutter-width: 30px !default; \ No newline at end of file +$grid-gutter-width: 30px !default; diff --git a/core/client/assets/sass/layouts/editor.scss b/core/client/assets/sass/layouts/editor.scss index c76d7fa977..b45f31d04b 100644 --- a/core/client/assets/sass/layouts/editor.scss +++ b/core/client/assets/sass/layouts/editor.scss @@ -194,7 +194,7 @@ bottom: 0; font-family: $font-family-mono; font-size: 1.4em; - line-height: 1.3em; + line-height: 1.56em; color: lighten($darkgrey, 10%); .CodeMirror-focused, @@ -326,8 +326,9 @@ // TODO: These should just be defaults, overridden by editor.hbs in theme dir .entry-preview-content, .content-preview-content { - font-size: 1.4em; + font-size: 1.8rem; line-height: 1.5em; + font-weight: 200; a { color: $blue;