Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hiulit
hiulit committed Mar 5, 2019
2 parents 943bc1d + 36707c9 commit 0198290
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## Unreleased

* Up to date

## v6.0.3 (March 6th 2018)

### Fixed

* Warning error in `!global` variables when using Dart Sass.

## v6.0.2 (December 18th 2018)

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
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.2",
"version": "6.0.3",
"main": [
"sassy-gridlover/_sassy-gridlover.scss"
],
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "Sassy-Gridlover",
"name": "sassy-gridlover",
"version": "6.0.2",
"version": "6.0.3",
"description": "Super easy to use Sass mixins to establish a typographic system with modular scale and vertical rhythm. Based on the Gridlover app.",
"keywords": [
"typography",
Expand Down
6 changes: 3 additions & 3 deletions sassdoc/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Sassy-Gridlover - v6.0.2</title><link rel="stylesheet" href="assets/css/main.css"><link href="https://fonts.googleapis.com/css?family=Open+Sans:400,500,700" rel="stylesheet" type="text/css"><meta name="viewport" content="width=device-width"><meta content="IE=edge, chrome=1" http-equiv="X-UA-Compatible"><!-- Open Graph tags --><meta property="og:title" content="Sassy-Gridlover - SassDoc"><meta property="og:type" content="website"><meta property="og:description" content="<p>Super easy to use Sass mixins to establish a typographic system with modular scale and vertical rhythm. Based on the Gridlover app.</p>
"><!-- Thanks to Sass-lang.com for the icons --><link href="assets/images/favicon.png" rel="shortcut icon"></head><body><aside class="sidebar" role="nav"><div class="sidebar__header"><h1 class="sidebar__title"><a href="https://github.com/hiulit/Sassy-Gridlover">Sassy-Gridlover - v6.0.2</a></h1></div><div class="sidebar__body"><button type="button" class="btn-toggle js-btn-toggle" data-alt="Open all">Close all</button><p class="sidebar__item sidebar__item--heading" data-slug="undefined"><a href="#undefined">General</a></p><div><p class="sidebar__item sidebar__item--sub-heading" data-slug="undefined-variable"><a href="#undefined-variable">variables</a></p><ul class="list-unstyled"><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-base-font-size" data-type="variable"><a href="#undefined-variable-sgl-base-font-size">sgl-base-font-size</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-base-line-height" data-type="variable"><a href="#undefined-variable-sgl-base-line-height">sgl-base-line-height</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-base-unit" data-type="variable"><a href="#undefined-variable-sgl-base-unit">sgl-base-unit</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-scale-factor" data-type="variable"><a href="#undefined-variable-sgl-scale-factor">sgl-scale-factor</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-debug-mode" data-type="variable"><a href="#undefined-variable-sgl-debug-mode">sgl-debug-mode</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-debug-mode-max-width" data-type="variable"><a href="#undefined-variable-sgl-debug-mode-max-width">sgl-debug-mode-max-width</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-extras" data-type="variable"><a href="#undefined-variable-sgl-extras">sgl-extras</a></li></ul><p class="sidebar__item sidebar__item--sub-heading" data-slug="undefined-mixin"><a href="#undefined-mixin">mixins</a></p><ul class="list-unstyled"><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-html" data-type="mixin"><a href="#undefined-mixin-sgl-html">sgl-html</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-body" data-type="mixin"><a href="#undefined-mixin-sgl-body">sgl-body</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-heading" data-type="mixin"><a href="#undefined-mixin-sgl-heading">sgl-heading</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-margins" data-type="mixin"><a href="#undefined-mixin-sgl-margins">sgl-margins</a></li></ul></div></div></aside><article class="main" role="main"><header class="header" role="banner"><div class="container"><div class="sassdoc__searchbar searchbar"><label for="js-search-input" class="visually-hidden">Search</label><div class="searchbar__form" id="js-search"><input name="search" type="search" class="searchbar__field" autocomplete="off" autofocus id="js-search-input" placeholder="Search"><ul class="searchbar__suggestions" id="js-search-suggestions"></ul></div></div></div></header><section class="main__section"><h1 class="main__heading" id="undefined"><div class="container">General</div></h1><section class="main__sub-section" id="undefined-variable"><h2 class="main__heading--secondary"><div class="container">variables</div></h2><section class="main__item container item" id="undefined-variable-sgl-base-font-size"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-base-font-size">sgl-base-font-size</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-base-font-size: 18 !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Base font size.</p></div><h3 class="item__sub-heading">Type</h3><p><code>Number</code></p></section><section class="main__item container item" id="undefined-variable-sgl-base-line-height"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-base-line-height">sgl-base-line-height</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-base-line-height: 1.3 !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Base line height.</p></div><h3 class="item__sub-heading">Type</h3><p><code>Number</code></p><h3 class="item__sub-heading">Used by</h3><ul class="list-unstyled"><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-html"><code>sgl-html</code></a></li><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-body"><code>sgl-body</code></a></li><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-heading"><code>sgl-heading</code></a></li><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-margins"><code>sgl-margins</code></a></li></ul></section><section class="main__item container item" id="undefined-variable-sgl-base-unit"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-base-unit">sgl-base-unit</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-base-unit: &quot;em&quot; !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Base unit (<code>px</code>, <code>em</code>, <code>rem</code>, <code>pxrem</code>).</p></div><h3 class="item__sub-heading">Type</h3><p><code>String</code></p></section><section class="main__item container item" id="undefined-variable-sgl-scale-factor"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-scale-factor">sgl-scale-factor</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-scale-factor: $GOLDEN_SECTION !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Scale factor.</p></div><h3 class="item__sub-heading">Type</h3><p><code>Number</code></p><h3 class="item__sub-heading">Used by</h3><ul class="list-unstyled"><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-heading"><code>sgl-heading</code></a></li></ul></section><section class="main__item container item" id="undefined-variable-sgl-debug-mode"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-debug-mode">sgl-debug-mode</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-debug-mode: false !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Enables/disables <strong>debug mode</strong>.</p><p>Outputs background lines imitating a notebook&#39;s sheet.</p><p>Declare it in your own <code>_variables.scss</code>, <code>_config.scss</code> or the like. Basically, <strong>it must be declared before the</strong> <code>@import &quot;sassy-gridlover&quot;</code>.</p></div><h3 class="item__sub-heading">Type</h3><p><code>Boolean</code></p><h3 class="item__sub-heading">Example</h3><div class="item__example example"><pre class="example__code language-scss"><code>$sgl-debug-mode: true;</code></pre></div><div class="item__example example"><pre class="example__code language-css"><code>html {
<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Sassy-Gridlover - v6.0.3</title><link rel="stylesheet" href="assets/css/main.css"><link href="https://fonts.googleapis.com/css?family=Open+Sans:400,500,700" rel="stylesheet" type="text/css"><meta name="viewport" content="width=device-width"><meta content="IE=edge, chrome=1" http-equiv="X-UA-Compatible"><!-- Open Graph tags --><meta property="og:title" content="Sassy-Gridlover - SassDoc"><meta property="og:type" content="website"><meta property="og:description" content="<p>Super easy to use Sass mixins to establish a typographic system with modular scale and vertical rhythm. Based on the Gridlover app.</p>
"><!-- Thanks to Sass-lang.com for the icons --><link href="assets/images/favicon.png" rel="shortcut icon"></head><body><aside class="sidebar" role="nav"><div class="sidebar__header"><h1 class="sidebar__title"><a href="https://github.com/hiulit/Sassy-Gridlover">Sassy-Gridlover - v6.0.3</a></h1></div><div class="sidebar__body"><button type="button" class="btn-toggle js-btn-toggle" data-alt="Open all">Close all</button><p class="sidebar__item sidebar__item--heading" data-slug="undefined"><a href="#undefined">General</a></p><div><p class="sidebar__item sidebar__item--sub-heading" data-slug="undefined-variable"><a href="#undefined-variable">variables</a></p><ul class="list-unstyled"><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-base-font-size" data-type="variable"><a href="#undefined-variable-sgl-base-font-size">sgl-base-font-size</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-base-line-height" data-type="variable"><a href="#undefined-variable-sgl-base-line-height">sgl-base-line-height</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-base-unit" data-type="variable"><a href="#undefined-variable-sgl-base-unit">sgl-base-unit</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-scale-factor" data-type="variable"><a href="#undefined-variable-sgl-scale-factor">sgl-scale-factor</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-debug-mode" data-type="variable"><a href="#undefined-variable-sgl-debug-mode">sgl-debug-mode</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-debug-mode-max-width" data-type="variable"><a href="#undefined-variable-sgl-debug-mode-max-width">sgl-debug-mode-max-width</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-extras" data-type="variable"><a href="#undefined-variable-sgl-extras">sgl-extras</a></li></ul><p class="sidebar__item sidebar__item--sub-heading" data-slug="undefined-mixin"><a href="#undefined-mixin">mixins</a></p><ul class="list-unstyled"><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-html" data-type="mixin"><a href="#undefined-mixin-sgl-html">sgl-html</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-body" data-type="mixin"><a href="#undefined-mixin-sgl-body">sgl-body</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-heading" data-type="mixin"><a href="#undefined-mixin-sgl-heading">sgl-heading</a></li><li class="sidebar__item sassdoc__item" data-group="undefined" data-name="sgl-margins" data-type="mixin"><a href="#undefined-mixin-sgl-margins">sgl-margins</a></li></ul></div></div></aside><article class="main" role="main"><header class="header" role="banner"><div class="container"><div class="sassdoc__searchbar searchbar"><label for="js-search-input" class="visually-hidden">Search</label><div class="searchbar__form" id="js-search"><input name="search" type="search" class="searchbar__field" autocomplete="off" autofocus id="js-search-input" placeholder="Search"><ul class="searchbar__suggestions" id="js-search-suggestions"></ul></div></div></div></header><section class="main__section"><h1 class="main__heading" id="undefined"><div class="container">General</div></h1><section class="main__sub-section" id="undefined-variable"><h2 class="main__heading--secondary"><div class="container">variables</div></h2><section class="main__item container item" id="undefined-variable-sgl-base-font-size"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-base-font-size">sgl-base-font-size</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-base-font-size: 18 !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Base font size.</p></div><h3 class="item__sub-heading">Type</h3><p><code>Number</code></p></section><section class="main__item container item" id="undefined-variable-sgl-base-line-height"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-base-line-height">sgl-base-line-height</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-base-line-height: 1.3 !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Base line height.</p></div><h3 class="item__sub-heading">Type</h3><p><code>Number</code></p><h3 class="item__sub-heading">Used by</h3><ul class="list-unstyled"><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-html"><code>sgl-html</code></a></li><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-body"><code>sgl-body</code></a></li><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-heading"><code>sgl-heading</code></a></li><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-margins"><code>sgl-margins</code></a></li></ul></section><section class="main__item container item" id="undefined-variable-sgl-base-unit"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-base-unit">sgl-base-unit</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-base-unit: &quot;em&quot; !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Base unit (<code>px</code>, <code>em</code>, <code>rem</code>, <code>pxrem</code>).</p></div><h3 class="item__sub-heading">Type</h3><p><code>String</code></p></section><section class="main__item container item" id="undefined-variable-sgl-scale-factor"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-scale-factor">sgl-scale-factor</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-scale-factor: $GOLDEN_SECTION !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Scale factor.</p></div><h3 class="item__sub-heading">Type</h3><p><code>Number</code></p><h3 class="item__sub-heading">Used by</h3><ul class="list-unstyled"><li><span class="item__cross-type">[mixin]</span> <a href="#undefined-mixin-sgl-heading"><code>sgl-heading</code></a></li></ul></section><section class="main__item container item" id="undefined-variable-sgl-debug-mode"><h3 class="item__heading"><a class="item__name" href="#variable-sgl-debug-mode">sgl-debug-mode</a></h3><div class="item__code-wrapper"><pre class="item__code language-scss"><code>$sgl-debug-mode: false !default;</code></pre></div><h3 class="item__sub-heading">Description</h3><div class="item__description"><p>Enables/disables <strong>debug mode</strong>.</p><p>Outputs background lines imitating a notebook&#39;s sheet.</p><p>Declare it in your own <code>_variables.scss</code>, <code>_config.scss</code> or the like. Basically, <strong>it must be declared before the</strong> <code>@import &quot;sassy-gridlover&quot;</code>.</p></div><h3 class="item__sub-heading">Type</h3><p><code>Boolean</code></p><h3 class="item__sub-heading">Example</h3><div class="item__example example"><pre class="example__code language-scss"><code>$sgl-debug-mode: true;</code></pre></div><div class="item__example example"><pre class="example__code language-css"><code>html {
background-image: linear-gradient(rgba(0, 170, 255, 0.3) 1px, transparent 1px);
background-position: left top;
background-size: 19px 19px;
Expand Down Expand Up @@ -260,4 +260,4 @@
margin-bottom: 0px;
margin-top: 0rem;
margin-bottom: 0rem;
}</code></pre></div><h3 class="item__sub-heading">Requires</h3><ul class="list-unstyled"><li class="item__description item__description--inline"><span class="item__cross-type">[variable]</span> <a href="#undefined-variable-sgl-base-line-height"><code>sgl-base-line-height</code></a></li><li class="item__description item__description--inline"><span class="item__cross-type">[variable]</span> <a href="#undefined-variable-sgl-debug-mode"><code>sgl-debug-mode</code></a></li></ul></section></section></section><footer class="footer" role="contentinfo"><div class="container"><div class="footer__project-info project-info"><!-- Name and URL --> <a class="project-info__name" href="https://github.com/hiulit/Sassy-Gridlover">Sassy-Gridlover</a><!-- Version --> <span class="project-info__version">- v6.0.2</span><!-- License --> <span class="project-info__license">, under MIT</span></div><a class="footer__watermark" href="http://sassdoc.com"><img src="assets/images/logo_light_inline.svg" alt="SassDoc Logo"></a></div></footer></article><script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script><script>window.jQuery || document.write('<script src="assets/js/vendor/jquery.min.js"><\/script>')</script><script src="assets/js/main.min.js"></script></body></html>
}</code></pre></div><h3 class="item__sub-heading">Requires</h3><ul class="list-unstyled"><li class="item__description item__description--inline"><span class="item__cross-type">[variable]</span> <a href="#undefined-variable-sgl-base-line-height"><code>sgl-base-line-height</code></a></li><li class="item__description item__description--inline"><span class="item__cross-type">[variable]</span> <a href="#undefined-variable-sgl-debug-mode"><code>sgl-debug-mode</code></a></li></ul></section></section></section><footer class="footer" role="contentinfo"><div class="container"><div class="footer__project-info project-info"><!-- Name and URL --> <a class="project-info__name" href="https://github.com/hiulit/Sassy-Gridlover">Sassy-Gridlover</a><!-- Version --> <span class="project-info__version">- v6.0.3</span><!-- License --> <span class="project-info__license">, under MIT</span></div><a class="footer__watermark" href="http://sassdoc.com"><img src="assets/images/logo_light_inline.svg" alt="SassDoc Logo"></a></div></footer></article><script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script><script>window.jQuery || document.write('<script src="assets/js/vendor/jquery.min.js"><\/script>')</script><script src="assets/js/main.min.js"></script></body></html>
2 changes: 2 additions & 0 deletions sassy-gridlover/_sassy-gridlover.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
@import "debug-mode";
@import "extras";

$sgl-root-font-size: null;

/// To use on `<html>`.
///
/// Outputs `font-size` and `line-height` **always** in `px`.
Expand Down

0 comments on commit 0198290

Please sign in to comment.