Skip to content

Reverting to how buttons were #156

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

Merged
merged 2 commits into from
Jul 8, 2019
Merged

Reverting to how buttons were #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90f326f
Reverting to how buttons were
HyrumG Jul 3, 2019
b06f1db
Merge branch 'develop' into add-button-back
HyrumG Jul 3, 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
11 changes: 0 additions & 11 deletions packages/react-scripts/template/src/components/ButtonLink.js
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions packages/react-scripts/template/src/components/ButtonLink.stories.js
View file
Open in desktop

This file was deleted.

12 changes: 8 additions & 4 deletions packages/react-scripts/template/src/components/example/FrontierDocsCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Card, CardActions, CardContent, CardActionArea } from '@fs/zion-ui'
import { Button, Card, CardActions, CardContent, CardActionArea } from '@fs/zion-ui'
import { useTranslation } from 'react-i18next'
import ButtonLink from '../ButtonLink'
import Logo from './Logo'

const FrontierDocsCard = ({ logoColor, animationDuration, handleLogoClick }) => {
Expand Down Expand Up @@ -32,9 +31,14 @@ const FrontierDocsCard = ({ logoColor, animationDuration, handleLogoClick }) =>
</CardContent>

<CardActions>
<ButtonLink href="https://www.familysearch.org/frontier/docs">
<Button
variant="text"
size="small"
color="primary"
href="https://www.familysearch.org/frontier/docs"
>
{t('getting.started.docs.link', 'Frontier Docs')}
</ButtonLink>
</Button>
</CardActions>
</Card>
)
Expand Down
23 changes: 17 additions & 6 deletions packages/react-scripts/template/src/components/example/LearnReactCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'
import { Card, CardMedia, CardActions, CardContent } from '@fs/zion-ui'
import ButtonLink from '../ButtonLink'
import { Button, Card, CardMedia, CardActions, CardContent } from '@fs/zion-ui'
import ReactImage from './reactjs.jpg'

const LearnReactCard = () => (
Expand All @@ -10,10 +9,22 @@ const LearnReactCard = () => (
<h2>Learn React</h2>
</CardContent>
<CardActions>
<ButtonLink href="https://reactjs.org/docs/getting-started.html">React Docs</ButtonLink>
<ButtonLink href="https://github.com/fs-webdev/skill-building-program/tree/master/badges-active/react">
Earn your badge
</ButtonLink>
<Button
variant="text"
size="small"
color="primary"
href="https://reactjs.org/docs/getting-started.html"
>
React Docs
</Button>
<Button
href="https://github.com/fs-webdev/skill-building-program/tree/master/badges-active/react"
variant="text"
size="small"
color="primary"
>
Earn your Badge
</Button>
</CardActions>
</Card>
)
Expand Down
16 changes: 12 additions & 4 deletions packages/react-scripts/template/src/components/example/ZionCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'
import { Card, CardMedia, CardActions, CardContent } from '@fs/zion-ui'
import ButtonLink from '../ButtonLink'
import { Button, Card, CardMedia, CardActions, CardContent } from '@fs/zion-ui'
import ZionImage from './zion.jpg'

const ZionCard = () => (
Expand All @@ -15,8 +14,17 @@ const ZionCard = () => (
<p>Zion is the place to go to find reusable components for your FamilySearch application.</p>
</CardContent>
<CardActions>
<ButtonLink href="https://beta.familysearch.org/frontier/zion">Components</ButtonLink>
<ButtonLink href="https://github.com/fs-webdev/zion">Github</ButtonLink>
<Button
variant="text"
size="small"
color="primary"
href="https://beta.familysearch.org/frontier/zion"
>
Components
</Button>
<Button variant="text" size="small" color="primary" href="https://github.com/fs-webdev/zion">
Github
</Button>
</CardActions>
</Card>
)
Expand Down