Skip to content

Commit ae05aec

Browse files
authored
Merge pull request #267 from hardeeparekh/play
Fix: Ensure Consistent Button Hover Effects on Landing Page (#262)
2 parents 081f02d + 1ea4ac3 commit ae05aec

File tree

2 files changed

+26
-11
lines changed

2 files changed

+26
-11
lines changed

site/src/Resources.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ const ResourcesSection = () => {
137137
);
138138
};
139139

140-
export default ResourcesSection;
140+
export default ResourcesSection;

site/src/reusecore/Button/btn.style.js

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ const ButtonStyle = styled.button`
1717
position: relative;
1818
color: ${props => props.theme.white };
1919
background-color: #00B39F;
20-
// z-index: 999;
20+
z-index: 999;
2121
&:hover,
2222
&:focus {
2323
color: white;
2424
background: ${props => props.theme.activeColor};
25-
box-shadow: 0 2px 10px ${props => props.theme.DarkTheme ? "rgb(255 255 255 / 40%)" : "rgb(0 0 0 / 40%)"};
25+
box-shadow: 0 2px 10px ${props => props.theme.whiteFourToBlackFour};
2626
}
2727
&:active{
28-
box-shadow: 0 2px 10px ${props => props.theme.DarkTheme ? "rgb(0 0 0 / 40%)" : "rgb(255 255 255 / 40%)"};
28+
box-shadow: 0 2px 10px ${props => props.theme.blackFourToWhiteFour};
2929
transform: scale(0.98);
3030
}
3131
.icon-left{
@@ -35,33 +35,48 @@ const ButtonStyle = styled.button`
3535
margin-left: 8px;
3636
}
3737
38-
${props => props.primary && css`
39-
color: ${props => props.theme.black};
38+
${props => props.$outlined && css`
39+
background: transparent;
40+
border: 2px solid ${props => props.theme.whiteToBlack};
41+
color: ${props => props.theme.whiteToBlack};
42+
&:hover{
43+
box-shadow: 0 2px 10px ${props.theme.whiteFourToBlackFour};
44+
}
45+
&:active{
46+
background: ${props => props.theme.lightGrey};
47+
box-shadow: 0 2px 10px ${props.theme.blackFourToWhiteFour};
48+
transform: scale(0.98);
49+
}
50+
`}
51+
52+
53+
${props => props.$primary && css`
54+
color: ${props => props.theme.white};
4055
background: ${props => props.theme.highlightColor};
4156
4257
&:hover{
4358
color: ${props.theme.black};
4459
background: ${props.theme.highlightColor};
45-
box-shadow: 0 2px 10px ${props.theme.DarkTheme ? "rgb(255 255 255 / 40%)" : "rgb(0 0 0 / 40%)"};
60+
box-shadow: 0 2px 10px ${props.theme.whiteFourToBlackFour};
4661
}
4762
&:active{
4863
background: ${props => props.theme.saffronColor};
49-
box-shadow: 0 2px 10px ${props.theme.DarkTheme ? "rgb(0 0 0 / 40%)" : "rgb(255 255 255 / 40%)"};
64+
box-shadow: 0 2px 10px ${props.theme.blackFourToWhiteFour};
5065
transform: scale(0.98);
5166
}
5267
5368
`}
54-
${props => props.secondary && css`
69+
${props => props.$secondary && css`
5570
color: white;
5671
background: ${props.theme.secondaryColor};
5772
&:hover{
5873
background: ${props.theme.caribbeanGreenColor};
59-
box-shadow: 0 2px 10px ${props.theme.DarkTheme ? "rgb(255 255 255 / 40%)" : "rgb(0 0 0 / 40%)"};
74+
box-shadow: 0 2px 10px ${props.theme.whiteFourToBlackFour};
6075
}
6176
&:active{
6277
color: #326d62;
6378
background: ${props.theme.secondaryColor};
64-
box-shadow: 0 2px 10px ${props.theme.DarkTheme ? "rgb(0 0 0 / 40%)" : "rgb(255 255 255 / 40%)"};
79+
box-shadow: 0 2px 10px ${props.theme.blackFourToWhiteFour};
6580
transform: scale(0.98);
6681
}
6782
`}

0 commit comments

Comments
 (0)