Skip to content

Commit df7a882

Browse files
authored
Merge pull request #508 from primer/dev
Patch release 10.6.1 (for realz)
2 parents 0a11a2d + e9fcd47 commit df7a882

File tree

12 files changed

+46
-26057
lines changed

12 files changed

+46
-26057
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 10.6.1
2+
3+
#### :bug: Bug Fix
4+
* [#506](https://github.com/primer/primer/pull/506) Fix white border on last avatar in AvatarStack (take two). ([@shawnbot](https://github.com/shawnbot))
5+
* [#501](https://github.com/primer/primer/pull/501) Set different z-index for .details-overlay. ([@muan](https://github.com/muan))
6+
7+
#### Committers: 2
8+
- Shawn Allen ([shawnbot](https://github.com/shawnbot))
9+
- [muan](https://github.com/muan)
10+
11+
112
# 10.6.0
213

314
#### :bug: Bug Fix

modules/primer-avatars/lib/avatar-stack.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989

9090
&:last-child {
9191
z-index: 1;
92+
border-right: 0;
9293
}
9394

9495
// stylelint-disable selector-max-type

modules/primer-avatars/stories.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,23 @@ storiesOf('Avatars', module)
6060
<img className='avatar' alt='Uncle Cat' width='20' height='20' src='https://user-images.githubusercontent.com/334891/29999089-2837c968-9009-11e7-92c1-6a7540a594d5.png'/>
6161
</div>
6262
</div>
63-
63+
</div>
64+
))
65+
.add('AvatarStack on blue background', () => (
66+
<div className='border bg-blue-light p-4'>
67+
<div className="AvatarStack flex-self-start ">
68+
<div className="AvatarStack-body" aria-label="chesterbr">
69+
<a className="avatar" aria-describedby="hovercard-aria-description">
70+
<img height="20" width="20" alt="@github" src="https://avatars0.githubusercontent.com/github?s=60&amp;v=4" />
71+
</a>
72+
</div>
73+
</div>
74+
<div className='AvatarStack AvatarStack-two mt-2'>
75+
<div className='AvatarStack-body tooltipped tooltipped-sw tooltipped-align-right-1' aria-label='two avatars'>
76+
<img className='avatar' alt='Uncle Cat' width='20' height='20' src='https://user-images.githubusercontent.com/334891/29999089-2837c968-9009-11e7-92c1-6a7540a594d5.png'/>
77+
<img className='avatar' alt='Uncle Cat' width='20' height='20' src='https://user-images.githubusercontent.com/334891/29999089-2837c968-9009-11e7-92c1-6a7540a594d5.png'/>
78+
</div>
79+
</div>
6480
</div>
6581
))
6682
.add('CircleBadge--small', () => (

modules/primer-core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.10.0",
2+
"version": "6.10.1",
33
"name": "primer-core",
44
"description": "Primer's core modules",
55
"homepage": "http://primer.github.io/",
@@ -39,6 +39,6 @@
3939
"primer-table-object": "1.4.7",
4040
"primer-tooltips": "1.5.5",
4141
"primer-truncate": "1.4.7",
42-
"primer-utilities": "4.11.0"
42+
"primer-utilities": "4.11.1"
4343
}
4444
}

modules/primer-utilities/lib/details.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
right: 0;
66
bottom: 0;
77
left: 0;
8-
z-index: 99;
8+
z-index: 80;
99
display: block;
1010
cursor: default;
1111
content: " ";
1212
background: transparent;
1313
}
1414

1515
.details-overlay-dark[open] > summary::before {
16+
z-index: 99;
1617
background: $black-fade-50;
1718
}

modules/primer-utilities/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "4.11.0",
2+
"version": "4.11.1",
33
"name": "primer-utilities",
44
"description": "Immutable, atomic CSS classes to rapidly build product",
55
"homepage": "http://primer.github.io/",

modules/primer/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "10.6.0",
2+
"version": "10.6.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/",
@@ -36,7 +36,7 @@
3636
"primer-branch-name": "1.0.5",
3737
"primer-breadcrumb": "1.5.3",
3838
"primer-buttons": "2.5.5",
39-
"primer-core": "6.10.0",
39+
"primer-core": "6.10.1",
4040
"primer-forms": "2.1.2",
4141
"primer-labels": "1.5.7",
4242
"primer-layout": "1.4.7",
@@ -58,7 +58,7 @@
5858
"primer-tables": "1.4.7",
5959
"primer-tooltips": "1.5.5",
6060
"primer-truncate": "1.4.7",
61-
"primer-utilities": "4.11.0"
61+
"primer-utilities": "4.11.1"
6262
},
6363
"keywords": [
6464
"primer",

0 commit comments

Comments
 (0)