Merge branch 'master' of github.com:FormidableLabs/spectacle

Author: kenwheeler

README.markdown

@@ -244,11 +244,12 @@ A simple tag for wrapping inline text that you want lightly styled in a monospac
 
 ####\<Heading /> (Base)
 
-Heading tags are special in that, when you specify a `size` prop, they generate the appropriate heading tag, and extend themselves with a style that is defined in the theme file for that heading.
+Heading tags are special in that, when you specify a `size` prop, they generate the appropriate heading tag, and extend themselves with a style that is defined in the theme file for that heading. Line height can be adjusted via a numeric `lineHeight` prop.
 
 |Name|PropType|Description|
 |---|---|---|
 |fit|React.PropTypes.boolean| When set to true, fits text to the slide's width. **Note: If you use the 'scale' transition, this won't work in Safari.** |
+|lineHeight|React.PropTypes.number| Sets the line height of your text.|
 
 ####\<Image /> (Base)
 
@@ -290,11 +291,12 @@ The `S` tag is used to add inline styling to a piece of text, such as underline
 
 ####\<Text/> (Base)
 
-The `Text` tag is used to add text to your slide.
+The `Text` tag is used to add text to your slide. Line height can be adjusted via a numeric `lineHeight` prop.
 
 |Name|PropType|Description|
 |---|---|---|
 |fit|React.PropTypes.boolean| When set to true, fits text to the slide's width. **Note: If you use the 'scale' transition, this won't work in Safari.** |
+|lineHeight|React.PropTypes.number| Sets the line height of your text.|
 
 ### Base Props