Skip to content

Commit beb1a27

Browse files
authored
Merge branch 'dev' into brocs/tooltips
2 parents 2145536 + 5ee6c2b commit beb1a27

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 10.0.1 (2017-11-14)
2+
3+
#### :bug: Bug Fix
4+
5+
* Fixing `peerDependencies` to be greater than equal to versions. Fixing version mismatch with buttons and box.
6+
17
# 10.0.0 (2017-11-13)
28

39
#### :boom: Breaking Change

modules/primer-marketing-buttons/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.0",
2+
"version": "1.0.1",
33
"name": "primer-marketing-buttons",
44
"description": "Buttons for marketing websites at GitHub",
55
"homepage": "http://primer.github.io/",
@@ -31,7 +31,7 @@
3131
"primer-support": "4.4.2"
3232
},
3333
"peerDependencies": {
34-
"primer-buttons": "2.4.1"
34+
"primer-buttons": ">=2.5.0"
3535
},
3636
"keywords": [
3737
"css",

modules/primer-marketing/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.0.0",
2+
"version": "6.0.1",
33
"name": "primer-marketing",
44
"description": "Primer marketing packages",
55
"homepage": "http://primer.github.io/",
@@ -26,7 +26,7 @@
2626
"lint": "../../script/lint-scss"
2727
},
2828
"dependencies": {
29-
"primer-marketing-buttons": "1.0.0",
29+
"primer-marketing-buttons": "1.0.1",
3030
"primer-marketing-support": "1.3.2",
3131
"primer-marketing-type": "1.4.2",
3232
"primer-marketing-utilities": "1.5.0",

modules/primer-popover/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.0.2",
2+
"version": "0.0.3",
33
"name": "primer-popover",
44
"description": "Popover for suggesting, guiding, and bringing attention to specific UI elements on a page.",
55
"homepage": "http://primer.github.io/",
@@ -26,7 +26,7 @@
2626
"primer-support": "4.4.2"
2727
},
2828
"peerDependencies": {
29-
"primer-box": "2.5.1"
29+
"primer-box": ">=2.5.0"
3030
},
3131
"keywords": [
3232
"github",

modules/primer-product/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "5.5.0",
2+
"version": "5.5.1",
33
"name": "primer-product",
44
"description": "Primer's product modules",
55
"homepage": "http://primer.github.io/",
@@ -32,7 +32,7 @@
3232
"primer-branch-name": "1.0.0",
3333
"primer-labels": "1.5.2",
3434
"primer-markdown": "3.7.2",
35-
"primer-popover": "0.0.2",
35+
"primer-popover": "0.0.3",
3636
"primer-subhead": "1.0.0",
3737
"primer-support": "4.4.2"
3838
}

modules/primer/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "10.0.0",
2+
"version": "10.0.1",
33
"name": "primer",
44
"description": "Primer is the CSS framework that powers GitHub's front-end design. primer includes 23 packages that are grouped into 3 core meta-packages for easy install. Each package and meta-package is independently versioned and distributed via npm, so it's easy to include all or part of Primer within your own project.",
55
"homepage": "http://primer.github.io/",
@@ -40,16 +40,16 @@
4040
"primer-labels": "1.5.2",
4141
"primer-layout": "1.4.2",
4242
"primer-markdown": "3.7.2",
43-
"primer-marketing": "6.0.0",
44-
"primer-marketing-buttons": "1.0.0",
43+
"primer-marketing": "6.0.1",
44+
"primer-marketing-buttons": "1.0.1",
4545
"primer-marketing-support": "1.3.2",
4646
"primer-marketing-type": "1.4.2",
4747
"primer-marketing-utilities": "1.5.0",
4848
"primer-navigation": "1.5.0",
4949
"primer-page-headers": "1.4.2",
5050
"primer-page-sections": "1.4.2",
51-
"primer-popover": "0.0.2",
52-
"primer-product": "5.5.0",
51+
"primer-popover": "0.0.3",
52+
"primer-product": "5.5.1",
5353
"primer-subhead": "1.0.0",
5454
"primer-support": "4.4.2",
5555
"primer-table-object": "1.4.2",

0 commit comments

Comments
 (0)