Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
James Nash committed Jun 19, 2020
2 parents f90f9be + 4103777 commit ca97f46
Show file tree
Hide file tree
Showing 21 changed files with 2,154 additions and 1,102 deletions.
1,385 changes: 921 additions & 464 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"author": {
"name": "Buildit | Wipro Digital",
"url": "http://buildit.wiprodigital.com/"
"url": "https://buildit.wiprodigital.com/"
},
"license": "MIT",
"scripts": {
Expand Down
38 changes: 29 additions & 9 deletions packages/eslint/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Shareable eslint configuration",
"author": {
"name": "Buildit | Wipro Digital",
"url": "http://buildit.wiprodigital.com/"
"url": "https://buildit.wiprodigital.com/"
},
"contributors": [
"Ash Blue <[email protected]>"
Expand Down
8 changes: 4 additions & 4 deletions packages/gravity-ui-nunjucks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
],
"author": {
"name": "Buildit | Wipro Digital",
"url": "http://buildit.wiprodigital.com/"
"url": "https://buildit.wiprodigital.com/"
},
"contributors": [
"Allan Corbett (http://superallan.com)",
"Allan Corbett (https://superallan.com)",
"Ana Escontrela",
"Ash Blue (https://twitter.com/AshBlueWD)",
"Ben Oakenfull",
Expand All @@ -39,11 +39,11 @@
"Daniel Wilkinson",
"Elohina Guevara (https://elohina.dev/)",
"Gregg Anderson",
"James Nash (http://cirrus.twiddles.com/)",
"James Nash (https://cirrus.twiddles.com/)",
"Jimmy McMillan",
"Lorenzo Nicora",
"Marcos Peebles",
"Matteo Pescarin (http://peach.smartart.it)",
"Matteo Pescarin (https://peach.smartart.it)",
"Priya Ranjan Singh",
"Valerio Francescangeli",
"Zane Cunningham"
Expand Down
8 changes: 4 additions & 4 deletions packages/gravity-ui-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
],
"author": {
"name": "Buildit | Wipro Digital",
"url": "http://buildit.wiprodigital.com/"
"url": "https://buildit.wiprodigital.com/"
},
"contributors": [
"Allan Corbett (http://superallan.com)",
"Allan Corbett (httpss://superallan.com)",
"Ana Escontrela",
"Ash Blue (https://twitter.com/AshBlueWD)",
"Ben Oakenfull",
Expand All @@ -70,11 +70,11 @@
"Daniel Wilkinson",
"Elohina Guevara (https://elohina.dev/)",
"Gregg Anderson",
"James Nash (http://cirrus.twiddles.com/)",
"James Nash (https://cirrus.twiddles.com/)",
"Jimmy McMillan",
"Lorenzo Nicora",
"Marcos Peebles",
"Matteo Pescarin (http://peach.smartart.it)",
"Matteo Pescarin (https://peach.smartart.it)",
"Priya Ranjan Singh",
"Valerio Francescangeli",
"Zane Cunningham"
Expand Down
3 changes: 3 additions & 0 deletions packages/gravity-ui-web/src/sass/06-utilities/_box.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.grav-u-box {
@include grav-padded-border;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
@import 'text';
@import 'padding';
@import 'margin';
@import 'box';
2 changes: 1 addition & 1 deletion packages/semantic-release/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "A premade configuration for using Lerna with Semantic Release",
"author": {
"name": "Buildit | Wipro Digital",
"url": "http://buildit.wiprodigital.com/"
"url": "https://buildit.wiprodigital.com/"
},
"contributors": [
"Ash Blue <[email protected]>"
Expand Down
55 changes: 27 additions & 28 deletions packages/semantic-release/lerna-analyzer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/semantic-release/lerna-analyzer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Light wrapper around @semantic-release/commit-analyzer to work with Lerna packages",
"author": {
"name": "Buildit | Wipro Digital",
"url": "http://buildit.wiprodigital.com/"
"url": "https://buildit.wiprodigital.com/"
},
"contributors": [
"Ash Blue <[email protected]>"
Expand Down Expand Up @@ -33,11 +33,11 @@
"url": "https://github.com/buildit/gravity-ui-sass/issues"
},
"devDependencies": {
"@types/jest": "^25.1.4",
"@types/node": "^13.9.1",
"@types/jest": "^26.0.0",
"@types/node": "^14.0.1",
"jest": "^26.0.1",
"semantic-release": "^17.0.4",
"ts-jest": "^25.2.1",
"ts-jest": "^26.0.0",
"tslint": "^6.1.0",
"typescript": "^3.8.3"
},
Expand Down
Loading

0 comments on commit ca97f46

Please sign in to comment.