Skip to content

Commit

Permalink
Merge branch 'publisher-staging' into publisher-production
Browse files Browse the repository at this point in the history
  • Loading branch information
tristen committed May 21, 2024
2 parents b6e66d9 + 756f3ed commit 67ebcde
Show file tree
Hide file tree
Showing 11 changed files with 2,236 additions and 2,004 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
18
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 1.8.1

- [fix] Minor icon inconsistencies.

## 1.8.0

- [add] Add `speaker` icon.
Expand Down
4,188 changes: 2,208 additions & 1,980 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mapbox/assembly",
"version": "1.8.0",
"version": "1.8.1",
"description": "A CSS framework",
"main": "index.js",
"files": [
Expand Down Expand Up @@ -33,10 +33,6 @@
"test:svgs": "tape test/test-icons.tape.js | tap-spec",
"test": "npm run lint && npm run test:svgs && npm run test:jest && npm run build:assembly"
},
"engines": {
"node": ">=14",
"npm": ">=6"
},
"repository": {
"type": "git",
"url": "git+https://github.com/mapbox/assembly.git"
Expand Down Expand Up @@ -127,4 +123,4 @@
"git add"
]
}
}
}
7 changes: 4 additions & 3 deletions src/svgs/battery.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/svgs/charger.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/svgs/folder-move.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/svgs/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/svgs/model.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions src/svgs/slot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions src/svgs/speaker.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 67ebcde

Please sign in to comment.