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

fix(feature-card): don't provide FeatureCard's href to ResourceC… #518

Merged
merged 11 commits into from
Nov 19, 2019
Merged

fix(feature-card): don't provide FeatureCard's href to ResourceC… #518

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a5addb3
fix(resource-card): if no href provided, render as a div
jendowns Nov 13, 2019
800d822
fix(feature-card): do not pass href to inner resourcecard, update foc…
jendowns Nov 13, 2019
d8eadc7
Merge branch 'master' into feature-card-anchors
jendowns Nov 13, 2019
fb37d9a
Merge branch 'master' into feature-card-anchors
jendowns Nov 15, 2019
8529988
Merge branch 'master' into feature-card-anchors
vpicone Nov 19, 2019
b42c01b
fix(feature-card): update focus outline
jendowns Nov 19, 2019
baf3a65
Merge branch 'feature-card-anchors' of github.com:jendowns/gatsby-the…
jendowns Nov 19, 2019
58b4260
Merge branch 'master' into feature-card-anchors
jendowns Nov 19, 2019
7e72ba7
Merge branch 'master' into feature-card-anchors
vpicone Nov 19, 2019
3844605
fix: use different focus style target
vpicone Nov 19, 2019
f3e7961
Merge branch 'master' into feature-card-anchors
vpicone Nov 19, 2019
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
5 changes: 3 additions & 2 deletions packages/gatsby-theme-carbon/src/components/FeatureCard/FeatureCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ export default class FeatureCard extends React.Component {
<div
className={`${prefix}--feature-card__img ${prefix}--aspect-ratio--1x1`}
>
<div className={`${prefix}--aspect-ratio--object`}>
<div
className={`${prefix}--aspect-ratio--object ${prefix}--feature-background`}
>
{children}
</div>
</div>
Expand All @@ -95,7 +97,6 @@ export default class FeatureCard extends React.Component {
title={title}
subTitle={subTitle}
aspectRatio="2:1"
href={href}
actionIcon={actionIcon}
color={color}
disabled={disabled}
Expand Down
10 changes: 10 additions & 0 deletions packages/gatsby-theme-carbon/src/components/FeatureCard/feature-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
.#{$prefix}--feature-card__img {
position: relative;
}

.#{$prefix}--feature-card:hover
.#{$prefix}--feature-card__link
.#{$prefix}--tile {
Expand All @@ -33,6 +34,15 @@
background: $carbon--gray-80; //$hover-ui for gray 90 theme
}

.#{$prefix}--feature-card__link:focus {
outline: none;

.#{$prefix}--feature-background > * {
outline: 2px solid $focus;
outline-offset: 2px;
}
}

// Display image at square aspect ratio only on mobile
.#{$prefix}--feature-card__img.#{$prefix}--aspect-ratio--1x1 {
@include carbon--breakpoint('md') {
Expand Down
9 changes: 4 additions & 5 deletions packages/gatsby-theme-carbon/src/components/ResourceCard/ResourceCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,9 @@ export default class ResourceCard extends React.Component {
[`${prefix}--aspect-ratio--4x3`]: aspectRatio === '4:3',
});

const carbonTileclassNames = classnames(
[`${prefix}--tile`],
[`${prefix}--tile--clickable`]
);
const carbonTileclassNames = classnames([`${prefix}--tile`], {
[`${prefix}--tile--clickable`]: href !== undefined,
});

const cardContent = (
<>
Expand Down Expand Up @@ -127,7 +126,7 @@ export default class ResourceCard extends React.Component {
);

let cardContainer;
if (disabled === true) {
if (disabled === true || href === undefined) {
cardContainer = <div className={carbonTileclassNames}>{cardContent}</div>;
} else if (isLink === true) {
cardContainer = (
Expand Down