typography-theme-moraga
Advanced tools
Comparing version 0.11.7 to 0.12.0
@@ -24,2 +24,3 @@ 'use strict'; | ||
var theme = { | ||
title: 'Moraga', | ||
baseFontSize: '18px', | ||
@@ -29,4 +30,10 @@ baseLineHeight: '28px', | ||
name: 'Source Sans Pro', | ||
styles: ['300', '300i', '400', '400i', '600'] | ||
styles: ['200', '400', '400i', '700'] | ||
}], | ||
modularScales: [{ | ||
scale: 2.5 | ||
}, { | ||
scale: 2, | ||
maxWidth: '768px' | ||
}], | ||
headerFontFamily: ['Source Sans Pro', 'sans-serif'], | ||
@@ -36,7 +43,7 @@ bodyFontFamily: ['Source Sans Pro', 'sans-serif'], | ||
bodyGray: 30, | ||
headerWeight: '600', | ||
bodyWeight: 300, | ||
boldWeight: 400, | ||
headerWeight: '200', | ||
bodyWeight: 400, | ||
boldWeight: 700, | ||
overrideStyles: function overrideStyles(_ref, options) { | ||
var adjustFontSizeTo = _ref.adjustFontSizeTo; | ||
var adjustFontSizeToMSValue = _ref.adjustFontSizeToMSValue; | ||
var rhythm = _ref.rhythm; | ||
@@ -62,3 +69,3 @@ | ||
}, | ||
blockquote: _extends({}, adjustFontSizeTo('20px'), { | ||
blockquote: _extends({}, adjustFontSizeToMSValue(1 / 5), { | ||
color: (0, _grayPercentage2.default)(40), | ||
@@ -76,3 +83,3 @@ paddingLeft: rhythm(3 / 4), | ||
}, | ||
table: _extends({}, adjustFontSizeTo('16px')) | ||
table: _extends({}, adjustFontSizeToMSValue(-1 / 5)) | ||
}); | ||
@@ -79,0 +86,0 @@ |
{ | ||
"name": "typography-theme-moraga", | ||
"description": "A theme for Typography.js", | ||
"version": "0.11.7", | ||
"version": "0.12.0", | ||
"author": "Kyle Mathews <mathews.kyle@gmail.com>", | ||
@@ -6,0 +6,0 @@ "main": "./dist/index.js", |
@@ -8,2 +8,3 @@ // @flow | ||
const theme: OptionsType = { | ||
title: 'Moraga', | ||
baseFontSize: '18px', | ||
@@ -15,10 +16,18 @@ baseLineHeight: '28px', | ||
styles: [ | ||
'300', | ||
'300i', | ||
'200', | ||
'400', | ||
'400i', | ||
'600', | ||
'700', | ||
], | ||
}, | ||
], | ||
modularScales: [ | ||
{ | ||
scale: 2.5, | ||
}, | ||
{ | ||
scale: 2, | ||
maxWidth: '768px', | ||
}, | ||
], | ||
headerFontFamily: ['Source Sans Pro', 'sans-serif'], | ||
@@ -28,6 +37,6 @@ bodyFontFamily: ['Source Sans Pro', 'sans-serif'], | ||
bodyGray: 30, | ||
headerWeight: '600', | ||
bodyWeight: 300, | ||
boldWeight: 400, | ||
overrideStyles: ({ adjustFontSizeTo, rhythm }, options) => { | ||
headerWeight: '200', | ||
bodyWeight: 400, | ||
boldWeight: 700, | ||
overrideStyles: ({ adjustFontSizeToMSValue, rhythm }, options) => { | ||
const vr = verticalRhythm({ | ||
@@ -52,3 +61,3 @@ baseFontSize: '16px', | ||
blockquote: { | ||
...adjustFontSizeTo('20px'), | ||
...adjustFontSizeToMSValue(1/5), | ||
color: gray(40), | ||
@@ -70,3 +79,3 @@ paddingLeft: rhythm(3/4), | ||
table: { | ||
...adjustFontSizeTo('16px'), | ||
...adjustFontSizeToMSValue(-1/5), | ||
}, | ||
@@ -73,0 +82,0 @@ }, |
Sorry, the diff of this file is not supported yet
62460
151