Merge pull request #508 from primer/dev

Patch release 10.6.1 (for realz)
primer · Jun 19, 2018 · df7a882 · df7a882
2 parents 0a11a2d + e9fcd47
commit df7a882
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 26,057 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 10.6.1
+
+#### :bug: Bug Fix
+* [#506](https://github.com/primer/primer/pull/506) Fix white border on last avatar in AvatarStack (take two). ([@shawnbot](https://github.com/shawnbot))
+* [#501](https://github.com/primer/primer/pull/501) Set different z-index for .details-overlay. ([@muan](https://github.com/muan))
+
+#### Committers: 2
+- Shawn Allen ([shawnbot](https://github.com/shawnbot))
+- [muan](https://github.com/muan)
+
+
 # 10.6.0
 
 #### :bug: Bug Fix

diff --git a/modules/primer-avatars/lib/avatar-stack.scss b/modules/primer-avatars/lib/avatar-stack.scss
@@ -89,6 +89,7 @@
 
     &:last-child {
       z-index: 1;
+      border-right: 0;
     }
 
     // stylelint-disable selector-max-type

diff --git a/modules/primer-avatars/stories.js b/modules/primer-avatars/stories.js
@@ -60,7 +60,23 @@ storiesOf('Avatars', module)
         <img className='avatar' alt='Uncle Cat' width='20' height='20' src='https://user-images.githubusercontent.com/334891/29999089-2837c968-9009-11e7-92c1-6a7540a594d5.png'/>
       </div>
     </div>
-
+  </div>
+))
+.add('AvatarStack on blue background', () => (
+  <div className='border bg-blue-light p-4'>
+    <div className="AvatarStack flex-self-start ">
+      <div className="AvatarStack-body" aria-label="chesterbr">
+        <a className="avatar" aria-describedby="hovercard-aria-description">
+          <img height="20" width="20" alt="@github" src="https://avatars0.githubusercontent.com/github?s=60&amp;v=4" />
+        </a>
+      </div>
+    </div>
+    <div className='AvatarStack AvatarStack-two mt-2'>
+      <div className='AvatarStack-body tooltipped tooltipped-sw tooltipped-align-right-1' aria-label='two avatars'>
+        <img className='avatar' alt='Uncle Cat' width='20' height='20' src='https://user-images.githubusercontent.com/334891/29999089-2837c968-9009-11e7-92c1-6a7540a594d5.png'/>
+        <img className='avatar' alt='Uncle Cat' width='20' height='20' src='https://user-images.githubusercontent.com/334891/29999089-2837c968-9009-11e7-92c1-6a7540a594d5.png'/>
+      </div>
+    </div>
   </div>
 ))
 .add('CircleBadge--small', () => (

diff --git a/modules/primer-core/package.json b/modules/primer-core/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "6.10.0",
+  "version": "6.10.1",
   "name": "primer-core",
   "description": "Primer's core modules",
   "homepage": "http://primer.github.io/",
@@ -39,6 +39,6 @@
     "primer-table-object": "1.4.7",
     "primer-tooltips": "1.5.5",
     "primer-truncate": "1.4.7",
-    "primer-utilities": "4.11.0"
+    "primer-utilities": "4.11.1"
   }
 }
diff --git a/modules/primer-utilities/lib/details.scss b/modules/primer-utilities/lib/details.scss
@@ -5,13 +5,14 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 99;
+  z-index: 80;
   display: block;
   cursor: default;
   content: " ";
   background: transparent;
 }
 
 .details-overlay-dark[open] > summary::before {
+  z-index: 99;
   background: $black-fade-50;
 }
diff --git a/modules/primer-utilities/package.json b/modules/primer-utilities/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.11.0",
+  "version": "4.11.1",
   "name": "primer-utilities",
   "description": "Immutable, atomic CSS classes to rapidly build product",
   "homepage": "http://primer.github.io/",

diff --git a/modules/primer/package.json b/modules/primer/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "10.6.0",
+  "version": "10.6.1",
   "name": "primer",
   "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.",
   "homepage": "http://primer.github.io/",
@@ -36,7 +36,7 @@
     "primer-branch-name": "1.0.5",
     "primer-breadcrumb": "1.5.3",
     "primer-buttons": "2.5.5",
-    "primer-core": "6.10.0",
+    "primer-core": "6.10.1",
     "primer-forms": "2.1.2",
     "primer-labels": "1.5.7",
     "primer-layout": "1.4.7",
@@ -58,7 +58,7 @@
     "primer-tables": "1.4.7",
     "primer-tooltips": "1.5.5",
     "primer-truncate": "1.4.7",
-    "primer-utilities": "4.11.0"
+    "primer-utilities": "4.11.1"
   },
   "keywords": [
     "primer",