Skip to content

fix GreenButton raduis #19

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

Open
clothe09986 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix GreenButton raduis #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/library/saya/Rick/GreenButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const styles = {
textAlign: 'center',
backgroundColor: '#64703f',
border: 'none',
borderRadius: 22,
borderRadius: 50,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
Expand Down
24 changes: 12 additions & 12 deletions src/library/saya/Rick/Section.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export default (props) => {
children,
color,
lineColor,
buttonPosition,
} = props;

const classes = useStyles();
Expand All @@ -81,17 +80,18 @@ export default (props) => {
<div className={classes.firstLine} style={{ backgroundColor: lineColor }} />
</div>
<div className={classes.title}>{title}</div>
<div className={classes.subTitle}>{subTitle}</div> </div>
<div style={{width:'100%'}}>{children}</div>
{!hideButton && (
<div className={classes.button} style={{ alignSelf: buttonPosition }}>
<GreenButton
text="Learn More"
onClick={onClick}
/>
</div>
)}

<div className={classes.subTitle}>{subTitle}</div>
</div>
<div style={{ width: '100%' }}>{children}</div>
{!hideButton && (
<div className={classes.button} style={{ width: 320 }}>
<GreenButton
text="Learn More"
onClick={onClick}
/>
</div>
)}

</ImageContainer>

);
Expand Down
3 changes: 2 additions & 1 deletion src/library/saya/Rick/TechnologyProjects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class TechnologyProjects extends React.PureComponent {
<div
className={classes.root}
style={{
backgroundColor, height
backgroundColor,
height,
}}
>
<div style={{ width: 320 }}>
Expand Down
5 changes: 2 additions & 3 deletions stories/saya/Pages/NewMobile/Bottles/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ storiesOf('saya|Pages/NewMobile', module)
lineColor="#000000"
backgroundColor="#e3e3e3"
subtitleFontFamily="bold"
>
</Introduction>
/>
<img src={global} style={{ height: 280 }} />

<GreenNumberSection
Expand Down Expand Up @@ -148,7 +147,7 @@ storiesOf('saya|Pages/NewMobile', module)
<Introduction
hideTitle
height={388}
subtitle={'Performance Enhancing Process'}
subtitle="Performance Enhancing Process"
description="The resulting flakes are then transported to in-house facilities where they are batch-optimized to control color and tenacity and transformed into pellets ready to be extruded into recycled yarns designated for a specific end-use."
color="#ffffff"
lineColor="#ffffff"
Expand Down