Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix white border on last avatar in AvatarStack (take two) #506

Merged
merged 5 commits into from
Jun 19, 2018
Merged

Fix white border on last avatar in AvatarStack (take two) #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e33306e
Merge pull request #489 from primer/fix-storybook
shawnbot May 11, 2018
65273a3
Merge branch 'master' into dev
jonrohan Jun 14, 2018
40aad67
no border-right on last avatar in AvatarStack
shawnbot Jun 19, 2018
551481f
add (visual) test cases for AvatarStack on blue bg
shawnbot Jun 19, 2018
e0ef76f
fix property order
shawnbot Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/primer-avatars/lib/avatar-stack.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@

&:last-child {
z-index: 1;
border-right: 0;
}

// stylelint-disable selector-max-type
Expand Down
18 changes: 17 additions & 1 deletion modules/primer-avatars/stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => (
Expand Down