From c18c928151f32b576c61eb0059267877dcf93776 Mon Sep 17 00:00:00 2001 From: Sam Mularczyk Date: Fri, 11 Mar 2016 15:44:30 +1100 Subject: [PATCH 01/16] updated readme.md --- README.md | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/README.md b/README.md index 09ae00a..aefbca1 100644 --- a/README.md +++ b/README.md @@ -10,25 +10,6 @@ Execute typographic structure with ease Download manually or install with Bower (recommended): ```bower install megatype --save-dev``` -You can add a load path to your build process of choice (gulp example shown): -```js -// gulpfile.babel.js - -import gulp-sass from "gulp-sass"; - -gulp.task('styles', () => { - return gulp.src(“app/styles/screen.scss”) - .pipe(gulp-sass({ - outputStyle: 'expanded', - precision: 6, - includePaths: [ - './node_modules/megatype' - ] - }) - .pipe(gulp.dest('dist')); -}); -``` - And import into your styles with: ```scss @import "megatype"; @@ -131,7 +112,7 @@ $monospace: ( cap-height: 0.68 ) !default; ``` -To set the correct `cap-height` you will need to tweak this in the browser until your typefece sits nicely on the baseline. +To set the correct `cap-height`, you will need to tweak this value and check in your browser until your typeface sits nicely on the baseline. **Tip:** Setting `$debug-allow` and `$debug-baseline` variables to `true` will display a visual representation of the baseline on your typeset elements. From 9f8d8d1670b807a70238768fe858be459c8a867d Mon Sep 17 00:00:00 2001 From: Sam Mularczyk Date: Fri, 11 Mar 2016 15:47:07 +1100 Subject: [PATCH 02/16] why we made this --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index aefbca1..8559ffa 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,8 @@ $debug-allow: true; **Note:** Background gradients are used for some debugging elements. As background gradients suffer from pixel rounding issues, they may become out of sync with some configurations at long distances (on long typeset pages, for example). This is expected behaviour. +###Why did we make this? +Web typography, as we see it, is broken. For a full explanation on why Megatype exists, [read our blog post!](http://www.studiothick.com/essays/web-typography-is-broken) ###Extras A few extra goodies. From 8e41c97300b3023c8b71e104a73d976c67b8635c Mon Sep 17 00:00:00 2001 From: Matt Sawkill Date: Sat, 12 Mar 2016 09:31:40 +1100 Subject: [PATCH 03/16] proof README --- README.md | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 8559ffa..7f57bdd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -![Megatype](http://studiothick.github.io/megatype/favicons/apple-touch-icon-144x144.png) +![MegaType](http://studiothick.github.io/megatype/favicons/apple-touch-icon-144x144.png) -# Megatype +# MegaType Execute typographic structure with ease [![Build Status](https://travis-ci.org/StudioThick/megatype.svg?branch=master)](https://travis-ci.org/StudioThick/megatype) @@ -20,7 +20,7 @@ MegaType provides typesetting tools, and some breakpoint mixins. ###Config -Copy `_config.scss` into your code base and override the `!default` settings where required, leaving unmodified values commented out. +Copy `_config.scss` into your codebase and override the `!default` settings where required, leaving unmodified values commented out. First, set up your breakpoint map (defaults shown) and your baseline snap & scaling preferences: ```scss // config.scss @@ -85,7 +85,7 @@ For containers, you may also wish to to apply `max` widths from your config: @include set-container; } ``` - + Next we need to provide some information about each font we want to typeset. Modify the ones provided, or add your own: ```scss // Set cap height to set to the baseline. @@ -113,13 +113,13 @@ $monospace: ( ) !default; ``` To set the correct `cap-height`, you will need to tweak this value and check in your browser until your typeface sits nicely on the baseline. - + **Tip:** Setting `$debug-allow` and `$debug-baseline` variables to `true` will display a visual representation of the baseline on your typeset elements. ###Setting type -With our rootsize initialised and our typographic config all set up, we can start setting type. +With our rootsize initialised and our typographic config all set up, we can start setting type. First, provide the typeface variable, and then provide `$fontsize`, `$lineheight`, `$leader` and `$trailer` in `px`, `rem`, or baseline units. One baseline unit is equivalent to the `rootsize` for that media query. @@ -141,8 +141,8 @@ p { @include typeset($sans, 16px, 2rem, 0, 2); } ``` -The `$fontsize`, `$leader` and `$trailer` are output in `rem`, whereas the lineheight is output as a unitless number. -`$leader` is calculated alongside an offset to put our type on the baseline, and output as a `top` value. This is then added to the `$trailer`, which is output as `margin-bottom`. +The `$fontsize`, `$leader` and `$trailer` are output in `rem` units, whereas the lineheight is output as a unitless number. +`$leader` is calculated alongside an offset to put our type on the baseline, and output as a `top` value. This is then added to the `$trailer`, which is output as `margin-bottom`. ###Media queries @@ -152,7 +152,7 @@ To set type at different breakpoints, our `typeset` mixin needs to know about th ```scss p { @include typeset($sans, 16px, 24px, $leader: 0, $trailer: 2); - + // we can apply a single breakpoint, starting with breakpoint key: 1 @include min-width(1) { @include typeset($sans, 16px, 24px, $leader: 0, $trailer: 2); @@ -177,7 +177,7 @@ Both of these mixins can also accept `px` values for a custom media query shortc ###Debugging -MegaType contains extensive debugging tools to let you visualise your type and grid setup, which are on by default. +MegaType contains extensive debugging tools to let you visualise your type and grid setup, these are enabled by default. ```scss // debug baseline grid @@ -188,26 +188,27 @@ $debug-type: true; $debug-breakpoints: true; ``` -And these can be toggled on and off with one variable in `megatype.scss`: +Debugging can be toggled on and off globally with one variable in `megatype.scss`: ``` $debug-allow: true; ``` -**Note:** Background gradients are used for some debugging elements. As background gradients suffer from pixel rounding issues, they may become out of sync with some configurations at long distances (on long typeset pages, for example). This is expected behaviour. +**Note:** Background gradients are used for some debugging elements. As background gradients suffer from pixel rounding issues, they may get out of sync on some configurations with extreme dimensions (on lengthy typeset pages, for example). This is an unfortunate, but expected behaviour. ###Why did we make this? -Web typography, as we see it, is broken. For a full explanation on why Megatype exists, [read our blog post!](http://www.studiothick.com/essays/web-typography-is-broken) +Web typography, as we see it, is broken. For a full explanation on why MegaType exists, [read our blog post!](http://www.studiothick.com/essays/web-typography-is-broken) ###Extras A few extra goodies. - See `_typography.scss` for some functions that can easily return information from your typeface configs. -- An optional color palette config is included, see `_config.scss` and `_map-helpers.scss` for -- The `typeset` mixin sets some background position for easily replacing ugly default text decoration with background gradients (can be disabled with `$link-underline-support` in `_config.scss`). See `_text-link.scss` for a self-explanitory helper `text-link` mixin. +- An optional color palette config is included, see `_config.scss` and `_map-helpers.scss` for +- The `typeset` mixin sets some background position for easily replacing ugly default text decoration with background gradients (can be disabled with `$link-underline-support` in `_config.scss`). See `_text-link.scss` for a self-explanatory helper `text-link` mixin. - See `_toolset_easing.scss` for some handy functions to use in animation easing - See `_toolset_units.scss` for some handy unit conversion tools ## Roadmap - Node packages -- Tests -- Default config templates? +- More example tests +- Default config templates +- Example themes? From bcd3cf95aaceea7128ae84644f07a1071840c9e3 Mon Sep 17 00:00:00 2001 From: Matt Sawkill Date: Sat, 12 Mar 2016 10:01:40 +1100 Subject: [PATCH 04/16] link to demo --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7f57bdd..5065b5a 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,24 @@ ![MegaType](http://studiothick.github.io/megatype/favicons/apple-touch-icon-144x144.png) # MegaType -Execute typographic structure with ease +Execute typographic structure with ease. + +[The MegaType demo page](http://megatype.studiothick.com) shows how typesetting rules scale across breakpoints. [![Build Status](https://travis-ci.org/StudioThick/megatype.svg?branch=master)](https://travis-ci.org/StudioThick/megatype) ##Install Download manually or install with Bower (recommended): -```bower install megatype --save-dev``` +```bower install megatype --save-dev``` And import into your styles with: ```scss @import "megatype"; -``` +``` ##Using MegaType -MegaType provides typesetting tools, and some breakpoint mixins. - +MegaType provides typesetting tools, and some breakpoint mixins. ###Config Copy `_config.scss` into your codebase and override the `!default` settings where required, leaving unmodified values commented out. From 8cbd555c6bb4bd1686513a95a93424bd117904b7 Mon Sep 17 00:00:00 2001 From: Thomas Bredin-Grey Date: Sat, 12 Mar 2016 18:00:17 +1100 Subject: [PATCH 05/16] Added bootstrap example ref --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5065b5a..4187acc 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,9 @@ A few extra goodies. - The `typeset` mixin sets some background position for easily replacing ugly default text decoration with background gradients (can be disabled with `$link-underline-support` in `_config.scss`). See `_text-link.scss` for a self-explanatory helper `text-link` mixin. - See `_toolset_easing.scss` for some handy functions to use in animation easing - See `_toolset_units.scss` for some handy unit conversion tools + +###Bootstrap example +Looking for an example bootstrap integration? We've set up [a basic example here](https://github.com/StudioThick/megatype-bootstrap), based on the [yeoman webapp generator](https://github.com/yeoman/generator-webapp). ## Roadmap - Node packages From 81aa4abbf3e7e1f51eb1eef324f3a5d0c1a5ad9e Mon Sep 17 00:00:00 2001 From: Thomas Bredin-Grey Date: Sat, 12 Mar 2016 18:01:25 +1100 Subject: [PATCH 06/16] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4187acc..ec41eff 100644 --- a/README.md +++ b/README.md @@ -212,7 +212,8 @@ A few extra goodies. Looking for an example bootstrap integration? We've set up [a basic example here](https://github.com/StudioThick/megatype-bootstrap), based on the [yeoman webapp generator](https://github.com/yeoman/generator-webapp). ## Roadmap -- Node packages +- Megatype Susy 2 example +- Node package - More example tests - Default config templates - Example themes? From c880928f1221c8de3fbafc52bc8d202d33c28f57 Mon Sep 17 00:00:00 2001 From: Giovanni Ferron Date: Fri, 25 Mar 2016 14:00:54 +1100 Subject: [PATCH 07/16] Add licensing information --- AUTHORS.txt | 10 ++++++++++ CONTRIBUTORS.txt | 17 +++++++++++++++++ LICENSE.txt | 21 +++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 AUTHORS.txt create mode 100644 CONTRIBUTORS.txt create mode 100644 LICENSE.txt diff --git a/AUTHORS.txt b/AUTHORS.txt new file mode 100644 index 0000000..e493923 --- /dev/null +++ b/AUTHORS.txt @@ -0,0 +1,10 @@ +# This is the official list of Megatype authors for copyright purposes. +# This file is distinct from the CONTRIBUTORS files. +# See the latter for an explanation. + +# Names should be added to this file as: +# Name or Organization +# The email address is not required for organizations. + +Studio Thick Pty Ltd +Thomas Bredin-Grey diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt new file mode 100644 index 0000000..fb31e76 --- /dev/null +++ b/CONTRIBUTORS.txt @@ -0,0 +1,17 @@ +# This is the official list of people who can contribute +# (and typically have contributed) code to this repository. +# The AUTHORS file lists the copyright holders; this file +# lists people. +# +# Names should be added to this file like so: +# Name +# +# Please keep the list sorted. +# (first name; alphabetical order) + +Abhishek Suresh +Giovanni Ferron +Matt Sawkill +Nathan Thorpe +Sam Mularczyk +Tom McLean diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..892c2c9 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2016 Studio Thick Pty Ltd http://www.studiothick.com + +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. From 5c2c8ff0c34e5f5d1679be69d60f4dc6295efdc7 Mon Sep 17 00:00:00 2001 From: Giovanni Ferron Date: Fri, 25 Mar 2016 14:11:48 +1100 Subject: [PATCH 08/16] Update LICENSE. Added Thomas Bredin-Grey. --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 892c2c9..417fe11 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2016 Studio Thick Pty Ltd http://www.studiothick.com +Copyright (c) 2016 Thomas Bredin-Grey, Studio Thick Pty Ltd Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 1344f24100c54f598323963ee89635e3f68c2b59 Mon Sep 17 00:00:00 2001 From: Thomas Bredin-Grey Date: Fri, 25 Mar 2016 23:12:56 +1100 Subject: [PATCH 09/16] Update LICENSE.txt --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 417fe11..3a2f0cd 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2016 Thomas Bredin-Grey, Studio Thick Pty Ltd +Copyright (c) 2016 The MetaType Project Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 2246a86fffb61a44ab00f51711b98398e2185bc4 Mon Sep 17 00:00:00 2001 From: Matt Sawkill Date: Tue, 29 Mar 2016 11:56:27 +1100 Subject: [PATCH 10/16] SPELL THE NAME OF THE PROJECT CORRECTLY --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 3a2f0cd..270dbee 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2016 The MetaType Project Authors +Copyright (c) 2016 The MegaType Project Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 5a8ab1b67eb7000f750c650c96102024fd5f9bf7 Mon Sep 17 00:00:00 2001 From: Zac Wasielewski Date: Mon, 28 Mar 2016 22:44:08 -0400 Subject: [PATCH 11/16] Fix syntax error in @if conditional statement --- megatype/_text-link.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/megatype/_text-link.scss b/megatype/_text-link.scss index 5051f1e..4a504a4 100644 --- a/megatype/_text-link.scss +++ b/megatype/_text-link.scss @@ -10,7 +10,7 @@ @mixin text-link($color: palette(blue), $hover: $color, $hover-opacity: 0.6) { $transparency: 0.6; - @if ($color == white or $color = #fff or $color == #ffffff) { + @if ($color == white or $color == #fff or $color == #ffffff) { $transparency: 0.25; } @@ -59,4 +59,4 @@ text-decoration: none !important; } } -} \ No newline at end of file +} From 844ee3407d358f7b4b2a16442c8e494616e34461 Mon Sep 17 00:00:00 2001 From: Thomas Bredin-Grey Date: Wed, 30 Mar 2016 17:04:43 +1100 Subject: [PATCH 12/16] Update LICENSE.txt --- LICENSE.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE.txt b/LICENSE.txt index 270dbee..2136ac3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -19,3 +19,4 @@ 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. + From 38da080130e56edfc6904eb1893e97fbb36a718e Mon Sep 17 00:00:00 2001 From: Giovanni Ferron Date: Sun, 3 Apr 2016 08:48:02 +1000 Subject: [PATCH 13/16] Update package.json for nom publishing --- package.json | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index d75671f..9554024 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "megatype", "version": "1.0.1", - "private": true, + "private": false, "description": "Finesse typographic structure with ease", "main": "megatype.scss", "scripts": { "test": "gulp test" }, - "author": "", - "license": "ISC", + "author": "The MegaType Project Authors", + "license": "MIT", "devDependencies": { "autoprefixer": "^6.1.1", "babel-cli": "^6.6.5", @@ -44,5 +44,22 @@ "presets": [ "es2015" ] - } + }, + "directories": { + "test": "test" + }, + "dependencies": {}, + "repository": { + "type": "git", + "url": "git+https://github.com/StudioThick/megatype.git" + }, + "keywords": [ + "typography", + "css", + "sass" + ], + "bugs": { + "url": "https://github.com/StudioThick/megatype/issues" + }, + "homepage": "https://github.com/StudioThick/megatype#readme" } From 3a23b9d1f973cbbf54f17026f8757336b4863619 Mon Sep 17 00:00:00 2001 From: Giovanni Ferron Date: Sun, 3 Apr 2016 08:52:34 +1000 Subject: [PATCH 14/16] Update readme with Npm instructions --- README.md | 61 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 09ae00a..7288f00 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,22 @@ ![Megatype](http://studiothick.github.io/megatype/favicons/apple-touch-icon-144x144.png) # Megatype -Execute typographic structure with ease +Execute typographic structure with ease [![Build Status](https://travis-ci.org/StudioThick/megatype.svg?branch=master)](https://travis-ci.org/StudioThick/megatype) ##Install -Download manually or install with Bower (recommended): -```bower install megatype --save-dev``` +Download manually or install with Bower (recommended): + + bower install megatype --save-dev + +or Npm + + npm install megatype --save-dev + +You can add a load path to your build process of choice (gulp example shown): -You can add a load path to your build process of choice (gulp example shown): ```js // gulpfile.babel.js @@ -29,18 +35,19 @@ gulp.task('styles', () => { }); ``` -And import into your styles with: +And import into your styles with: + ```scss @import "megatype"; -``` +``` ##Using MegaType -MegaType provides typesetting tools, and some breakpoint mixins. +MegaType provides typesetting tools, and some breakpoint mixins. ###Config -Copy `_config.scss` into your code base and override the `!default` settings where required, leaving unmodified values commented out. -First, set up your breakpoint map (defaults shown) and your baseline snap & scaling preferences: +Copy `_config.scss` into your code base and override the `!default` settings where required, leaving unmodified values commented out. +First, set up your breakpoint map (defaults shown) and your baseline snap & scaling preferences: ```scss // config.scss @@ -82,30 +89,30 @@ $breakpoint-map: ( ); ``` -Breaking down the map: -- `start` is the start position of the breakpoint. Can be `px` or `em`. -- `max` is the max width of the container. Can be `px`, `em`, or `%`. -- `rootsize` is the base font size applied to the `html` element. Can be `px` or `rem`. This also controls our grid size at this breakpoint. -These values can be retrieved using the `break-get` function, eg: +Breaking down the map: +- `start` is the start position of the breakpoint. Can be `px` or `em`. +- `max` is the max width of the container. Can be `px`, `em`, or `%`. +- `rootsize` is the base font size applied to the `html` element. Can be `px` or `rem`. This also controls our grid size at this breakpoint. +These values can be retrieved using the `break-get` function, eg: ```scss .my-component { width: break-get(3, max); } ``` -To intialise the baseline, call MegaType at the top of your stylesheet: +To intialise the baseline, call MegaType at the top of your stylesheet: ```scss @include megatype; ``` -For containers, you may also wish to to apply `max` widths from your config: +For containers, you may also wish to to apply `max` widths from your config: ```scss .my-container { @include set-container; } ``` - -Next we need to provide some information about each font we want to typeset. Modify the ones provided, or add your own: + +Next we need to provide some information about each font we want to typeset. Modify the ones provided, or add your own: ```scss // Set cap height to set to the baseline. // Here are some cap-height sizes to get you started: @@ -131,14 +138,14 @@ $monospace: ( cap-height: 0.68 ) !default; ``` -To set the correct `cap-height` you will need to tweak this in the browser until your typefece sits nicely on the baseline. - -**Tip:** Setting `$debug-allow` and `$debug-baseline` variables to `true` will display a visual representation of the baseline on your typeset elements. +To set the correct `cap-height` you will need to tweak this in the browser until your typefece sits nicely on the baseline. + +**Tip:** Setting `$debug-allow` and `$debug-baseline` variables to `true` will display a visual representation of the baseline on your typeset elements. ###Setting type -With our rootsize initialised and our typographic config all set up, we can start setting type. +With our rootsize initialised and our typographic config all set up, we can start setting type. First, provide the typeface variable, and then provide `$fontsize`, `$lineheight`, `$leader` and `$trailer` in `px`, `rem`, or baseline units. One baseline unit is equivalent to the `rootsize` for that media query. @@ -160,8 +167,8 @@ p { @include typeset($sans, 16px, 2rem, 0, 2); } ``` -The `$fontsize`, `$leader` and `$trailer` are output in `rem`, whereas the lineheight is output as a unitless number. -`$leader` is calculated alongside an offset to put our type on the baseline, and output as a `top` value. This is then added to the `$trailer`, which is output as `margin-bottom`. +The `$fontsize`, `$leader` and `$trailer` are output in `rem`, whereas the lineheight is output as a unitless number. +`$leader` is calculated alongside an offset to put our type on the baseline, and output as a `top` value. This is then added to the `$trailer`, which is output as `margin-bottom`. ###Media queries @@ -171,7 +178,7 @@ To set type at different breakpoints, our `typeset` mixin needs to know about th ```scss p { @include typeset($sans, 16px, 24px, $leader: 0, $trailer: 2); - + // we can apply a single breakpoint, starting with breakpoint key: 1 @include min-width(1) { @include typeset($sans, 16px, 24px, $leader: 0, $trailer: 2); @@ -207,7 +214,7 @@ $debug-type: true; $debug-breakpoints: true; ``` -And these can be toggled on and off with one variable in `megatype.scss`: +And these can be toggled on and off with one variable in `megatype.scss`: ``` $debug-allow: true; ``` @@ -219,7 +226,7 @@ $debug-allow: true; A few extra goodies. - See `_typography.scss` for some functions that can easily return information from your typeface configs. -- An optional color palette config is included, see `_config.scss` and `_map-helpers.scss` for +- An optional color palette config is included, see `_config.scss` and `_map-helpers.scss` for - The `typeset` mixin sets some background position for easily replacing ugly default text decoration with background gradients (can be disabled with `$link-underline-support` in `_config.scss`). See `_text-link.scss` for a self-explanitory helper `text-link` mixin. - See `_toolset_easing.scss` for some handy functions to use in animation easing - See `_toolset_units.scss` for some handy unit conversion tools From 18f49eee4db72d9180c8dc1f1324f224f5417bd4 Mon Sep 17 00:00:00 2001 From: Giovanni Ferron Date: Sun, 3 Apr 2016 08:56:12 +1000 Subject: [PATCH 15/16] Update package.json version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9554024..ab61558 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "megatype", - "version": "1.0.1", + "version": "1.0.2", "private": false, "description": "Finesse typographic structure with ease", "main": "megatype.scss", From b00016e4fc0f1aa240600191299353e06441b680 Mon Sep 17 00:00:00 2001 From: Giovanni Ferron Date: Sun, 3 Apr 2016 09:24:28 +1000 Subject: [PATCH 16/16] Sync info in bower.json and package.json --- README.md | 1 - bower.json | 3 ++- package.json | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1b56a65..a882b24 100644 --- a/README.md +++ b/README.md @@ -243,7 +243,6 @@ Looking for an example bootstrap integration? We've set up [a basic example here ## Roadmap - Megatype Susy 2 example -- Node package - More example tests - Default config templates - Example themes? diff --git a/bower.json b/bower.json index fd42536..58c476b 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,7 @@ { "name": "megatype", - "description": "Finesse typographic structure with legendary technique", + "version": "1.0.2", + "description": "Execute typographic structure with ease", "main": "megatype.scss", "authors": [ "tbredin " diff --git a/package.json b/package.json index ab61558..a302089 100644 --- a/package.json +++ b/package.json @@ -54,9 +54,13 @@ "url": "git+https://github.com/StudioThick/megatype.git" }, "keywords": [ + "sass", + "susy", + "megatype", "typography", - "css", - "sass" + "baseline", + "vertical-rhythm", + "grid" ], "bugs": { "url": "https://github.com/StudioThick/megatype/issues"