This repository has been archived by the owner on Jul 19, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 363
Merged
0.11.0 #202
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
ae3802b
Add JS unit tests using Karma, Mocha, and Chai
400fb5f
Update normalize scss to v7
b656ff7
Switch to Jest for testing
213d0cd
Merge pull request #193 from Shopify/unit-tests
t-kelly e4aee69
Merge pull request #194 from Shopify/normalize-css
t-kelly b223a5b
Update settings for header section
5efc205
Fixes based on Chris' PR comments
1df3539
Add commented settings_data.json to ignore of config
9390c7c
Make sure image scales with range setting
06a421e
Merge pull request #198 from Shopify/update-settings
t-kelly a00442c
Merge pull request #201 from Shopify/add-settings-ignore
t-kelly 06540c0
version bump
NathanPJF a2f482a
resolve merge conflicts
NathanPJF a6d09a5
Merge branch 'master' into 0.11.0
NathanPJF File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,5 +21,5 @@ dependencies: | |
test: | ||
pre: | ||
- slate build | ||
override: | ||
post: | ||
- slate test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
module.exports = { | ||
globals: { | ||
slate: {} | ||
}, | ||
}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@NathanPJF what's the verdict about uncommenting these?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Verdict is: merging as comment for now and going to do a couple more tests as a new issue.