Skip to content
This repository was archived by the owner on Jan 21, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions source/assets/LogoFandomPoweredByWikiaTwoLines/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions source/assets/LogoFandomPoweredByWikiaTwoLines/index.js

This file was deleted.

1 change: 0 additions & 1 deletion source/assets/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export { default as AvatarIconTiny } from './AvatarIconTiny';
export { default as AvatarIconUser } from './AvatarIconUser';
export { default as AvatarIcon } from './AvatarIcon';
export { default as LogoFandomHeart } from './LogoFandomHeart';
export { default as LogoFandomPoweredByWikiaTwoLines } from './LogoFandomPoweredByWikiaTwoLines';
export { default as LogoFandomWhite } from './LogoFandomWhite';
export { default as LogoFandom } from './LogoFandom';
export { default as LogoWikiaOrgWhite } from './LogoWikiaOrgWhite';
Expand Down
6 changes: 3 additions & 3 deletions source/components/Avatar/__snapshots__/index.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`Avatar renders when incorrect badgePermission is set 1`] = `
badge="someIncorrectBadgePermission"
>
<div
className="wds-avatar"
className="wds-avatar is-default"
>
<AvatarImage
alt="User avatar"
Expand Down Expand Up @@ -34,7 +34,7 @@ exports[`Avatar renders with badge 1`] = `
badge="admin"
>
<div
className="wds-avatar"
className="wds-avatar is-default"
>
<AvatarImage
alt="User avatar"
Expand Down Expand Up @@ -70,7 +70,7 @@ exports[`Avatar renders with default props 1`] = `
alt="User avatar"
>
<div
className="wds-avatar"
className="wds-avatar is-default"
>
<AvatarImage
alt="User avatar"
Expand Down
2 changes: 1 addition & 1 deletion source/components/Avatar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Avatar = ({
src,
title,
}) => (
<div className={classNames('wds-avatar', className)} title={title}>
<div className={classNames('wds-avatar', (!src ? 'is-default' : ''), className)} title={title}>
{getAvatarImage(href, alt, src)}
{badge && <Badge badge={badge} />}
</div>
Expand Down
5 changes: 0 additions & 5 deletions source/components/Avatar/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,4 @@
@import "~design-system/dist/scss/wds-components/_avatar.scss";
.wds-avatar {
@include wds-avatar(48px, $wds-fandom-color-middle-gray, $wds-fandom-color-middle-gray);

// svg is necessary here to differentiate between img (for user's avatar image) and svg (default avatar)
svg.wds-avatar__image {
padding: 2px;
}
}
4 changes: 4 additions & 0 deletions source/icons/IconExternalLink/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

```js
<IconExternalLink height="30" />
```
2 changes: 2 additions & 0 deletions source/icons/IconExternalLink/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// This file is generated automatically via extract-assets-from-ds.js
export default from 'design-system/dist/svg/wds-icons-external-link.svg';
1 change: 1 addition & 0 deletions source/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export { default as IconEmbed } from './IconEmbed';
export { default as IconErrorSmall } from './IconErrorSmall';
export { default as IconError } from './IconError';
export { default as IconExploreTiny } from './IconExploreTiny';
export { default as IconExternalLink } from './IconExternalLink';
export { default as IconEyeCrossedSmall } from './IconEyeCrossedSmall';
export { default as IconEyeCrossed } from './IconEyeCrossed';
export { default as IconEyeSmall } from './IconEyeSmall';
Expand Down
2 changes: 1 addition & 1 deletion source/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"concurrently": "^4.1.0",
"coveralls": "^3.0.2",
"date-fns": "^1.29.0",
"design-system": "git://github.com/Wikia/design-system.git#14.2.0",
"design-system": "git://github.com/Wikia/design-system.git#17.0.0",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.7.0",
"enzyme-redux": "^0.2.1",
Expand Down
Loading