Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
hiulit committed Apr 1, 2019
2 parents c1de0ae + 28be6a6 commit 0eba28d
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 12 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,19 @@

* Up to date

## v6.0.4 (March 26th 2018)
## v6.0.5 (April 1st 2019)

### Fixed

* Better documentation. Now it clearly states that `sgl-html()` is **mandatory** for all the other mixins to work.

## v6.0.4 (March 26th 2019)

### Added

* `main` attribute to `package.json` so it's easier to import **Sassy Gridlover** when using bundlers [#21](https://github.com/hiulit/Sassy-Gridlover/issues/21)

## v6.0.3 (March 6th 2018)
## v6.0.3 (March 6th 2019)

### Fixed

Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,16 @@ By default, all the mixins (except `sgl-html`) will output `em`. But you can als

### `sgl-html()`

This mixin is **mandatory** for the all the other mixins to work.

To use on `<html>`.

Outputs `font-size` and `line-height` **always** in `px`.

```scss
@mixin sgl-html($font-size: $sgl-base-font-size)
html {
@include sgl-html($font-size: $sgl-base-font-size);
}
```

#### Parameters
Expand All @@ -98,7 +102,9 @@ To use on `<body>`.
Outputs `font-size` and `line-height`.

```scss
@mixin sgl-body($line-height-step: 0, $unit: $sgl-base-unit)
body {
@include sgl-body($line-height-step: 0, $unit: $sgl-base-unit);
}
```

#### Parameters
Expand All @@ -115,7 +121,7 @@ To use on headings `<h1> - <h6>`.
Outputs `font-size`, `line-height`, `margin-top` and `margin-bottom`.

```scss
@mixin sgl-heading($font-size-step, $line-height-step, $margin-top-step, $margin-bottom-step, $unit: $sgl-base-unit, $base-value: $sgl-base-font-size)
@include sgl-heading($font-size-step, $line-height-step, $margin-top-step, $margin-bottom-step, $unit: $sgl-base-unit, $base-value: $sgl-base-font-size)
```

#### Parameters
Expand All @@ -136,7 +142,7 @@ To use on `<p>`, `<ul>`, `<ol>`, `<pre>`, `<table>`, `<blockquote>`, etc.
Outputs `margin-bottom` and `margin-top`.

```scss
@mixin sgl-margins($margin-top-step, $margin-bottom-step, $unit: $sgl-base-unit, $base-value: $sgl-base-font-size)
@include sgl-margins($margin-top-step, $margin-bottom-step, $unit: $sgl-base-unit, $base-value: $sgl-base-font-size)
```

#### Parameters
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sassy-gridlover",
"description": "Super easy to use Sass mixins to establish a typographic system with modular scale and vertical rhythm. Based on the Gridlover app.",
"version": "6.0.4",
"version": "6.0.5",
"main": [
"sassy-gridlover/_sassy-gridlover.scss"
],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "Sassy-Gridlover",
"name": "sassy-gridlover",
"version": "6.0.4",
"version": "6.0.5",
"description": "Super easy to use Sass mixins to establish a typographic system with modular scale and vertical rhythm. Based on the Gridlover app.",
"main": "sassy-gridlover/_sassy-gridlover.scss",
"keywords": [
Expand Down
Loading

0 comments on commit 0eba28d

Please sign in to comment.