Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:heyjul3s/artifak into chore/docs…
Browse files Browse the repository at this point in the history
…-pkg-update
  • Loading branch information
heyjul3s committed Jan 13, 2021
2 parents 5b41a15 + fc5864d commit a15fb64
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 13 deletions.
4 changes: 2 additions & 2 deletions docs/components/Nav/Mobile/NavSlides/Slider/Slider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ export function Slider({
animate={{ x: `${-100 * viewIndex}%` }}
transition={{
x: {
duration: 0.15,
stiffness: 10,
duration: 0.4,
stiffness: 2000,
damping: 400
},
...slideContainerTransition
Expand Down
5 changes: 3 additions & 2 deletions docs/components/Nav/Mobile/NavSlides/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export const NavLink = styled(AnchorLink)<{
width: auto;
font-size: 1.25rem;
margin-bottom: 1em;
cursor: pointer;
${({ theme }) => `
color: ${theme.colors.white};
Expand All @@ -47,10 +48,10 @@ export const CloseButtonContainer = styled(motion.div)`
position: absolute;
width: 30px;
height: 30px;
background: white;
border: 1px solid white;
border-radius: 50%;
top: 1em;
right: 1em;
left: calc(50vw - 30px);
padding: 0.5em;
z-index: 1;
`;
1 change: 1 addition & 0 deletions docs/components/Nav/Mobile/Navbar/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const NavCategoryButton = styled.button`
outline: none;
appearance: none;
background: transparent;
cursor: pointer;
${({ theme }) => `
color: ${theme.colors.primary};
Expand Down
25 changes: 16 additions & 9 deletions docs/components/Nav/Mobile/icons/CloseIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,31 @@ export function CloseIcon() {
y="0px"
viewBox="0 0 100 100"
>
<style type="text/css">
{`
.st0{fill:#FFFFFF;stroke:#F15E22;stroke-width:3.2323;stroke-miterlimit:10;}
`}
</style>
<g>
<g>
<path
className="st0"
d="M87.8,97.1c-2.5,0-5-0.9-6.9-2.8L5.4,18.8C1.7,15,1.7,8.9,5.4,5.1c3.8-3.8,9.9-3.8,13.7,0l75.5,75.5
c3.8,3.8,3.8,9.9,0,13.7C92.7,96.2,90.3,97.1,87.8,97.1z"
c3.8,3.8,3.8,9.9,0,13.7C92.7,96.2,90.3,97.1,87.8,97.1z"
style={{
fill: 'transparent',
stroke: '#fff',
strokeLinecap: 'round',
strokeLinejoin: 'round',
strokeWidth: '3.2px'
}}
/>
</g>
<g>
<path
className="st0"
d="M12.3,97.1c-2.5,0-5-0.9-6.9-2.8c-3.8-3.8-3.8-9.9,0-13.7L80.9,5.1c3.8-3.8,9.9-3.8,13.7,0
c3.8,3.8,3.8,9.9,0,13.7L19.2,94.3C17.3,96.2,14.8,97.1,12.3,97.1z"
c3.8,3.8,3.8,9.9,0,13.7L19.2,94.3C17.3,96.2,14.8,97.1,12.3,97.1z"
style={{
fill: 'transparent',
stroke: '#fff',
strokeLinecap: 'round',
strokeLinejoin: 'round',
strokeWidth: '3.2px'
}}
/>
</g>
</g>
Expand Down

0 comments on commit a15fb64

Please sign in to comment.