TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-26 12:21:36 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #230 from cobbspur/font

Browse Source 
closes #201 changing font - needs testing by all
This commit is contained in:
John O'Nolan 2013-07-02 02:06:14 -07:00
commit fa57d6d17c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/admin/assets/sass/modules/typeplate.scss
View File

@ -34,7 +34,7 @@ $line-height: 1.65;
$font-size: 81.2; // percentage value (16 * 112.5% = 18px) $font-size: 81.2; // percentage value (16 * 112.5% = 18px)
$font-base: 16 * ($font-size/100); // converts our percentage to a pixel value $font-base: 16 * ($font-size/100); // converts our percentage to a pixel value
$measure: $font-base * $line-height; $measure: $font-base * $line-height;
$font-family: Lato, sans-serif; $font-family: 'Open Sans', sans-serif;
$font-family-serif: serif; $font-family-serif: serif;
$font-family-mono: Inconsolata, monospace; $font-family-mono: Inconsolata, monospace;
$font-properties: $weight, $line-height, $font-size, $font-family; $font-properties: $weight, $line-height, $font-size, $font-family;

2
core/admin/views/default.hbs
View File

@ -17,7 +17,7 @@
<link rel="shortcut icon" href="/favicon.ico"> <link rel="shortcut icon" href="/favicon.ico">
<meta http-equiv="cleartype" content="on"> <meta http-equiv="cleartype" content="on">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lato:300,400,700"> <link rel="stylesheet" type='text/css' href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,700'>
<link rel="stylesheet" href="/core/admin/assets/css/screen.css"> <link rel="stylesheet" href="/core/admin/assets/css/screen.css">
<link rel="stylesheet" type="text/css" href="/core/admin/assets/lib/codemirror/codemirror.css"> <!-- TODO: Kill this - #29 --> <link rel="stylesheet" type="text/css" href="/core/admin/assets/lib/codemirror/codemirror.css"> <!-- TODO: Kill this - #29 -->
{{{block "pageStyles"}}} {{{block "pageStyles"}}}