Skip to content

Commit

Permalink
Add data-inline to SASS/SCSS (close trunk-rs#158)
Browse files Browse the repository at this point in the history
Allows for compiling and then in-lining SASS and SCSS using a new
data-inline attribute in a data-trunk link tag.

Compiling SASS and SCSS without inlining is still supported.

This commit also fixes several spelling mistakes and updates
documentation to reflect the changes.

A non-squash version can be found at Bernd-L:inline-scss_no-squash,
in case you want to see individual commits or for reverting
individual changes.
  • Loading branch information
Tanja-4732 committed Apr 6, 2021
1 parent b16fec5 commit 7b7d006
Show file tree
Hide file tree
Showing 21 changed files with 147 additions and 107 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
target
dist
site/public/*
.vscode
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ This changelog follows the patterns described here: https://keepachangelog.com/e
Subheadings to categorize changes are `added, changed, deprecated, removed, fixed, security`.

## Unreleased
### added
- Closed [#158](https://github.com/thedodd/trunk/issues/158): Support for inlining SASS/SCSS after compilation using the new `data-inline` attribute

### fixed
- Fixed [#148](https://github.com/thedodd/trunk/issues/148): any changes detected under a `.git` path are now being ignored by default.
- Fixed [#163](https://github.com/thedodd/trunk/issues/163): allow using `copy-file` assets with files without a file extension.
Expand All @@ -19,7 +22,7 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe

## 0.9.1
### fixed
- Fixed a bug releated to the watch system, which would cause build loops if there was an error on the initial build.
- Fixed a bug related to the watch system, which would cause build loops if there was an error on the initial build.

## 0.9.0
### added
Expand All @@ -31,7 +34,7 @@ Added support for proxying WebSockets. This was a long-standing feature request.

### fixed
- Closed [#81](https://github.com/thedodd/trunk/issues/81): this is no longer needed as we now have support for WebSockets. HTTP2 is still outstanding, but that will not be a blocker for use from the web.
- Closed [#95](https://github.com/thedodd/trunk/issues/95): fixed via a few small changes to precendce in routing.
- Closed [#95](https://github.com/thedodd/trunk/issues/95): fixed via a few small changes to precedence in routing.
- Closed [#53](https://github.com/thedodd/trunk/issues/53): we've now implemented support for proxying WebSockets.

## 0.8.3
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ We are all living beings, and what is most important is that we respect each oth
## hacking
Just a few simple items to keep in mind as you hack.

- Pull request early and often. This helps to let others know what you are working on. **Please use Github's Draft PR mechansim** if your PR is not yet ready for review.
- Pull request early and often. This helps to let others know what you are working on. **Please use Github's Draft PR mechanism** if your PR is not yet ready for review.
- Remember to update the `CHANGELOG.md` once you believe your work is nearing completion.

## linting
Expand Down
Loading

0 comments on commit 7b7d006

Please sign in to comment.