Merge branch 'master' into release-10.7.0

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

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

@@ -89,6 +89,7 @@
 
     &:last-child {
       z-index: 1;
+      border-right: 0;
     }
 
     // stylelint-disable selector-max-type

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', () => (

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"
   }
 }

modules/primer-utilities/lib/details.scss

@@ -5,7 +5,7 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 99;
+  z-index: 80;
   display: block;
   cursor: default;
   content: " ";
@@ -13,5 +13,6 @@
 }
 
 .details-overlay-dark[open] > summary::before {
+  z-index: 99;
   background: $black-fade-50;
 }

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/",

modules/primer/package.json

@@ -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",

script/release-candidate

@@ -91,12 +91,14 @@ const increment = (version, by, preid) => {
 
 const updateDependants = (pkg, pkgs) => {
   return pkgs.filter(other => {
-    return depFields.some(field => {
+    let changed = false
+    depFields.forEach(field => {
       if (other[field] && (pkg.name in other[field])) {
         other[field][pkg.name] = pkg.version
-        return true
+        changed = true
       }
     })
+    return changed
   })
 }
 

tools/primer-module-build/package.json

@@ -43,7 +43,7 @@
     "postcss": "^5.2.5"
   },
   "devDependencies": {
-    "primer-utilities": "4.9.0",
+    "primer-utilities": "4.11.1",
     "tempy": "^0.2.1"
   }
 }

tools/stylelint-config-primer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-config-primer",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "description": "Sharable stylelint config used by GitHub's CSS",
   "homepage": "http://primer.github.io/",
   "author": "GitHub, Inc.",
@@ -19,7 +19,7 @@
     "stylelint-no-unsupported-browser-features": "^1.0.0",
     "stylelint-order": "^0.4.4",
     "stylelint-scss": "^1.4.1",
-    "stylelint-selector-no-utility": "1.8.7"
+    "stylelint-selector-no-utility": "1.8.8"
   },
   "devDependencies": {
     "eslint": "^3.19.0",

tools/stylelint-selector-no-utility/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-selector-no-utility",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "description": "Stylelint rule that doesn't allow the styling of utility classes in CSS",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,7 @@
   "license": "MIT",
   "repository": "https://github.com/primer/primer/tree/master/tools/stylelint-selector-no-utility",
   "dependencies": {
-    "primer-utilities": "4.11.0",
+    "primer-utilities": "4.11.1",
     "stylelint": "^7.13.0"
   },
   "devDependencies": {