2.0.0

LICENSE

@@ -1,18 +1,21 @@
 The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Copyright (c) 2015 Cory Simmons
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,49 +1,110 @@
-# Typographic
+<p align="center">
+  <img src="http://corysimmons.github.io/typographic/typographic-logo.svg">
+</p>
 
-Quick and dirty responsive typography for the rest of us. Written in Stylus.
+<p align="center">
+  <img src="https://img.shields.io/npm/v/typographic.svg">
+  <img src="https://img.shields.io/bower/v/typographic.svg">
+  <img src="http://img.shields.io/npm/dm/typographic.svg">
+</p>
 
-### Installation
-`npm install typographic`
+Typographic is responsive typography made easy. Pick a few font stacks, set a few settings, and you've got **beautiful** responsive typography - it's that easy.
 
-### Enable
-Place `@import 'typographic'` at the top of your `style.styl` file
 
-### Font Stacks
-- Pick from a plethora of sans and serif [font stacks](typographic/_font-stacks.styl)
-- Set your selector's `font-family` to one of the stacks variables, for instance `helvetica`
+## Installation
+- `bower install typographic`
+- `@import 'typographic'` somewhere in your Stylus stylesheet
 
-### Headers
-It's common for header and body font stacks to differ. With the `t-headers()` mixin, you can change all headers to have the same [font stack](typographic/_font-stacks.styl).
 
-### Presets and Ratios
-The [presets](typographic/_presets.styl) file is a typography reset that applies some `font-size`, `line-height`, and `margin-bottom` to common selectors. There is a `t-presets()` mixin that accepts a ratio. A ratio can be any floated number and in the [ratios](typographic/_ratios.styl) file you will see a variable list of common [modular scale](http://modularscale.com) ratios.
+## Usage
+It's as easy as setting a few variables in [typographic.styl](typographic.styl] (or letting the defaults do their thing).
 
-**To enable typographic, use the `t-presets()` mixin after `@import`ing Typographic.** Pass the `t-presets()` mixin random numbers to see how it works.
 
-### Easy Responsive Typography
-Just set your `html` selector's base `font-size`, then adjust the `font-size` with media queries.
+## Settings
+```stylus
+$ratio              = $golden
+$body-font          = $helvetica
+$body-font-weight   = 300
+$body-color         = #666
+$header-font        = $helvetica
+$header-font-weight = 500
+$header-color       = #111
+$min-font           = 10px
+$max-font           = 16px
+$min-width          = 600px
+$max-width          = 1000px
+```
+
+
+## Ratios
+The ratios are based off of the ratios used on [modular scale](http://www.modularscale.com/).
+
+```stylus
+$minor-second   = 1.067
+$major-second   = 1.125
+$minor-third    = 1.2
+$major-third    = 1.25
+$perfect-fourth = 1.333
+$aug-fourth     = 1.414
+$perfect-fifth  = 1.5
+$minor-sixth    = 1.6
+$golden         = 1.618
+$major-sixth    = 1.667
+$minor-seventh  = 1.778
+$major-seventh  = 1.875
+$octave         = 2
+$major-tenth    = 2.5
+$major-eleventh = 2.667
+$major-twelfth  = 3
+$double-octave  = 4
+```
 
-### Watch
-`stylus -u typographic -w css/style.styl`
 
-### Putting it all together
-- `npm install -g typographic`
+## Font Stacks
+Stacks are picked from A Way Back's [Revised Font Stack](http://www.awayback.com/revised-font-stack/).
+
 ```stylus
-@import 'typographic'
-
-t-presets(major-sixth)
-t-headers(helvetica)
-
-html
-  font-family: garamond
-  font-size: 12px
-  @media (min-width: 600px)
-    font-size: 14px
-  @media (min-width: 800px)
-    font-size: 16px
-  @media (min-width: 1000px)
-    font-size: 18px
+// Sans-serif
+
+$calibri       = Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif
+$candara       = Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif
+$courier       = 'Courier New', Courier, 'Lucida Sans Typewriter', 'Lucida Typewriter', monospace
+$franklin      = 'Franklin Gothic Medium', Arial, sans-serif
+$futura        = Futura, 'Trebuchet MS', Arial, sans-serif
+$geneva        = Geneva, Tahoma, Verdana, sans-serif
+$gill-sans     = 'Gill Sans', 'Gill Sans MT', Calibri, sans-serif
+$helvetica     = 'Helvetica Neue', Helvetica, Arial, sans-serif
+$lucida-grande = 'Lucida Grande', 'Lucida Sans Unicode', 'Lucida Sans', Geneva, Verdana, sans-serif
+$optima        = Optima, Segoe, 'Segoe UI', Candara, Calibri, Arial, sans-serif
+$segoe         = Segoe, 'Segoe UI', 'Helvetica Neue', Arial, sans-serif
+$tahoma        = Tahoma, Geneva, Verdana, sans-serif
+$trebuchet     = 'Trebuchet MS', 'Lucida Grande', 'Lucida Sans Unicode', 'Lucida Sans', Tahoma, sans-serif
+$verdana       = Verdana, Geneva, sans-serif
+
+
+// Serif
+
+$antiqua       = 'Book Antiqua', Palatino, 'Palatino Linotype', 'Palatino LT STD', Georgia, serif
+$baskerville   = Baskerville, 'Baskerville Old Face', 'Hoefler Text', Garamond, 'Times New Roman', serif
+$bodoni        = 'Bodoni MT', Didot, 'Didot LT STD', 'Hoefler Text', Garamond, 'Times New Roman', serif
+$cambria       = Cambria, Georgia, serif
+$caslon        = 'Big Caslon', 'Book Antiqua', 'Palatino Linotype', Georgia, serif
+$constantia    = Constantia, Palatino, 'Palatino Linotype', 'Palatino LT STD', Georgia, serif
+$didot         = Didot, 'Didot LT STD', 'Hoefler Text', Garamond, 'Times New Roman', serif
+$garamond      = Garamond, Baskerville, 'Baskerville Old Face', 'Hoefler Text', 'Times New Roman', serif
+$goudy         = 'Goudy Old Style', Garamond, 'Big Caslon', 'Times New Roman', serif
+$hoefler       = 'Hoefler Text', 'Baskerville Old Face', Garamond, 'Times New Roman', serif
+$lucida-bright = 'Lucida Bright', Georgia, serif
+$palatino      = Palatino, 'Palatino Linotype', 'Palatino LT STD', "Book Antiqua", Georgia, serif
 ```
-- `stylus -u typographic -w css/style.styl`
 
-Expand/contract the **[demo](http://corysimmons.github.io/typographic/)** to see this in action.
+
+## Browser Support
+- Full support for IE9+
+- IE8 doesn't support [calc](http://caniuse.com/#feat=calc) or [viewport units](http://caniuse.com/#feat=viewport-units) or media queries by default so you shouldn't support it (you will get `$min-font` for all viewport sizes), but if you have a stingy client, you can include these polyfills to at least have it swap between the `$max-font` and `$min-font` at your specified breakpoint.
+  - [respond.js](https://github.com/scottjehl/Respond)
+  - [calc-polyfill](https://github.com/closingtag/calc-polyfill)
+  - [vminpoly](https://github.com/saabi/vminpoly)
+
+### Credit
+[Mike Riethmuller](http://twitter.com/MikeRiethmuller) came up with the idea of using `calc` with `vw` to create scaling typography [here](http://madebymike.com.au/writing/precise-control-responsive-typography/).

bower.json

@@ -1,11 +1,11 @@
 {
   "name": "typographic",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "homepage": "https://github.com/corysimmons/typographic",
   "authors": [
-    "Cory Simmons <csimmonswork@gmail.com>"
+    "Cory Simmons <cory@launchboxhq.com>"
   ],
-  "description": "Quick and dirty responsive typography for the rest of us.",
+  "description": "Responsive typography with modular scale, font stacks, and more.",
   "main": "typographic.js",
   "moduleType": [
     "node"