Skip to content

Commit

Permalink
Merge pull request #101 from oddbird/map-compile
Browse files Browse the repository at this point in the history
Add map-compile functions, and fix related issues
  • Loading branch information
mirisuzanne authored Jan 18, 2022
2 parents 4a19cb6 + a5754f4 commit 5aaedca
Show file tree
Hide file tree
Showing 70 changed files with 3,989 additions and 1,199 deletions.
1 change: 1 addition & 0 deletions .sassdocrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ groups:
tokens: 'QuickStart: Tokens'
token-config: 'Tokens Configuration'
token-api: 'Accessing Tokens'
token-compile: 'Compiling Token Maps'
token-inspect: 'Inspecting Tokens'
token-register: 'Function Registration'
token-internal: 'Pre-Registered Functions'
Expand Down
34 changes: 31 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,40 @@

## 4.0.0 - UNRELEASED

- BREAKING: Map `multi-merge` utility and all `add-*` functions
- BREAKING: Map `multi-merge` utility and all `add-*` functions
for adding one or more token maps (eg `add-sizes`, `add-colors`, etc)
now perform a deep merge of the token maps.
Previously a shallow merge was performed,
now perform a deep merge of the token maps.
Previously a shallow merge was performed,
[which could result in removing nested values from maps](https://github.com/oddbird/accoutrement/issues/50).

- [Tokens][token]:

- NEW: `map-compile` and `map-compile-with` functions for compiling
tokens in Accoutrement maps and formatting them for static exports.

- [Animate][animate]:

- NEW: `compile-*` functions provide an export option for respective token maps
(see: `compile-changes`, `compile-easing`, `compile-times`).

- [Color][color]:

- NEW: `compile-colors` function provides an export option for color token maps.
- NEW: `with-colors` mixin allows the overriding of the global color palette for
a section of contents.

- [Ratio][ratio]:

- NEW: `compile-ratios` function provides an export option for ratio token maps.

- [Scale][scale]:

- NEW: `compile-sizes` function provides an export option for size token maps.

- [Type][type]:

- NEW: `compile-fonts` function provides an export option for font token maps.

### 4.0.0-beta.2 - 12/03/21

This is a major update, moving over to Sass modules,
Expand Down
57 changes: 51 additions & 6 deletions docs/CHANGELOG.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,21 @@ <h3 class="nav-title">Tokens</h3>


<li class="nav-item">
<a href="token-inspect.html" data-nav="is-not-active">Inspecting Tokens</a>
<a href="token-compile.html" data-nav="is-not-active">Compiling Token<span class="widont">&nbsp;</span>Maps</a>
</li>


<li class="nav-item">
<a href="token-register.html" data-nav="is-not-active">Function Registration</a>
<a href="token-inspect.html" data-nav="is-not-active">Inspecting Tokens</a>
</li>


<li class="nav-item">
<a href="token-internal.html" data-nav="is-not-active">Pre-Registered Functions</a>
<a href="token-register.html" data-nav="is-not-active">Function Registration</a>
</li>



<li class="nav-item">
<a href="token-vars.html" data-nav="is-not-active">Tokens » Custom<span class="widont">&nbsp;</span>Properties</a>
</li>
Expand Down Expand Up @@ -385,9 +386,53 @@ <h3 class="nav-title">
<h1 id="accoutrement-changelog">Accoutrement Changelog</h1>
<h2 id="4-0-0-unreleased">4.0.0 - UNRELEASED</h2>
<ul>
<li>BREAKING: All <code>add-*</code> functions for adding one or more token maps (eg <code>add-sizes</code>, <code>add-colors</code>, etc)
now perform a deep merge of the token maps. Previously a shallow merge was performed, <a href="https://github.com/oddbird/accoutrement/issues/50">which could
result in removing nested values from previous<span class="widont">&nbsp;</span>maps</a>.</li>
<li>
<p>BREAKING: Map <code>multi-merge</code> utility and all <code>add-*</code> functions
for adding one or more token maps (eg <code>add-sizes</code>, <code>add-colors</code>, etc)
now perform a deep merge of the token maps.
Previously a shallow merge was performed,
<a href="https://github.com/oddbird/accoutrement/issues/50">which could result in removing nested values from<span class="widont">&nbsp;</span>maps</a>.</p>
</li>
<li>
<p><a href="https://www.oddbird.net/accoutrement/docs/tokens.html">Tokens</a>:</p>
<ul>
<li>NEW: <code>map-compile</code> and <code>map-compile-with</code> functions for compiling
tokens in Accoutrement maps and formatting them for static<span class="widont">&nbsp;</span>exports.</li>
</ul>
</li>
<li>
<p><a href="https://www.oddbird.net/accoutrement/docs/animate.html">Animate</a>:</p>
<ul>
<li>NEW: <code>compile-*</code> functions provide an export option for respective token maps
(see: <code>compile-changes</code>, <code>compile-easing</code>, <code>compile-times</code>).</li>
</ul>
</li>
<li>
<p><a href="https://www.oddbird.net/accoutrement/docs/color.html">Color</a>:</p>
<ul>
<li>NEW: <code>compile-colors</code> function provides an export option for color token<span class="widont">&nbsp;</span>maps.</li>
<li>NEW: <code>with-colors</code> mixin allows the overriding of the global color palette for
a section of<span class="widont">&nbsp;</span>contents.</li>
</ul>
</li>
<li>
<p><a href="https://www.oddbird.net/accoutrement/docs/ratio.html">Ratio</a>:</p>
<ul>
<li>NEW: <code>compile-ratios</code> function provides an export option for ratio token<span class="widont">&nbsp;</span>maps.</li>
</ul>
</li>
<li>
<p><a href="https://www.oddbird.net/accoutrement/docs/scale.html">Scale</a>:</p>
<ul>
<li>NEW: <code>compile-sizes</code> function provides an export option for size token<span class="widont">&nbsp;</span>maps.</li>
</ul>
</li>
<li>
<p><a href="https://www.oddbird.net/accoutrement/docs/type.html">Type</a>:</p>
<ul>
<li>NEW: <code>compile-fonts</code> function provides an export option for font token<span class="widont">&nbsp;</span>maps.</li>
</ul>
</li>
</ul>
<h3 id="4-0-0-beta-2-12-03-21">4.0.0-beta.2 - 12/03/21</h3>
<p>This is a major update, moving over to Sass modules,
Expand Down
7 changes: 4 additions & 3 deletions docs/CONTRIBUTING.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,21 @@ <h3 class="nav-title">Tokens</h3>


<li class="nav-item">
<a href="token-inspect.html" data-nav="is-not-active">Inspecting Tokens</a>
<a href="token-compile.html" data-nav="is-not-active">Compiling Token<span class="widont">&nbsp;</span>Maps</a>
</li>


<li class="nav-item">
<a href="token-register.html" data-nav="is-not-active">Function Registration</a>
<a href="token-inspect.html" data-nav="is-not-active">Inspecting Tokens</a>
</li>


<li class="nav-item">
<a href="token-internal.html" data-nav="is-not-active">Pre-Registered Functions</a>
<a href="token-register.html" data-nav="is-not-active">Function Registration</a>
</li>



<li class="nav-item">
<a href="token-vars.html" data-nav="is-not-active">Tokens » Custom<span class="widont">&nbsp;</span>Properties</a>
</li>
Expand Down
7 changes: 4 additions & 3 deletions docs/LICENSE.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,21 @@ <h3 class="nav-title">Tokens</h3>


<li class="nav-item">
<a href="token-inspect.html" data-nav="is-not-active">Inspecting Tokens</a>
<a href="token-compile.html" data-nav="is-not-active">Compiling Token<span class="widont">&nbsp;</span>Maps</a>
</li>


<li class="nav-item">
<a href="token-register.html" data-nav="is-not-active">Function Registration</a>
<a href="token-inspect.html" data-nav="is-not-active">Inspecting Tokens</a>
</li>


<li class="nav-item">
<a href="token-internal.html" data-nav="is-not-active">Pre-Registered Functions</a>
<a href="token-register.html" data-nav="is-not-active">Function Registration</a>
</li>



<li class="nav-item">
<a href="token-vars.html" data-nav="is-not-active">Tokens » Custom<span class="widont">&nbsp;</span>Properties</a>
</li>
Expand Down
7 changes: 4 additions & 3 deletions docs/animate-change-vars.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,21 @@ <h3 class="nav-title">Tokens</h3>


<li class="nav-item">
<a href="token-inspect.html" data-nav="is-not-active">Inspecting Tokens</a>
<a href="token-compile.html" data-nav="is-not-active">Compiling Token<span class="widont">&nbsp;</span>Maps</a>
</li>


<li class="nav-item">
<a href="token-register.html" data-nav="is-not-active">Function Registration</a>
<a href="token-inspect.html" data-nav="is-not-active">Inspecting Tokens</a>
</li>


<li class="nav-item">
<a href="token-internal.html" data-nav="is-not-active">Pre-Registered Functions</a>
<a href="token-register.html" data-nav="is-not-active">Function Registration</a>
</li>



<li class="nav-item">
<a href="token-vars.html" data-nav="is-not-active">Tokens » Custom<span class="widont">&nbsp;</span>Properties</a>
</li>
Expand Down
Loading

0 comments on commit 5aaedca

Please sign in to comment.