Commita2c2142

committed

refactor(Footer): update ScribeButton style & desc text

1 parent5ff311c commita2c2142Copy full SHA for a2c2142

File tree

+27

-11

lines changed

+27

-11

lines changed

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,18 +3,28 @@ import T from 'prop-types'`
`3`	`3`
`4`	`4`	`import{Wrapper,RedWrapper}from'./styles/button'`
`5`	`5`
`6`		`-constButton=({ children, ghost, type, onClick, size})=>{`
	`6`	`+constButton=({ children, ghost, type, onClick, size, className})=>{`
`7`	`7`	`switch(type){`
`8`	`8`	`case'red':{`
`9`	`9`	`return(`
`10`		`-<RedWrapperghost={ghost}onClick={onClick}size={size}>`
	`10`	`+<RedWrapper`
	`11`	`+ghost={ghost}`
	`12`	`+onClick={onClick}`
	`13`	`+size={size}`
	`14`	`+className={className}`
	`15`	`+>`
`11`	`16`	`{children}`
`12`	`17`	`</RedWrapper>`
`13`	`18`	`)`
`14`	`19`	`}`
`15`	`20`	`default:{`
`16`	`21`	`return(`
`17`		`-<Wrapperghost={ghost}onClick={onClick}size={size}>`
	`22`	`+<Wrapper`
	`23`	`+ghost={ghost}`
	`24`	`+onClick={onClick}`
	`25`	`+size={size}`
	`26`	`+className={className}`
	`27`	`+>`
`18`	`28`	`{children}`
`19`	`29`	`</Wrapper>`
`20`	`30`	`)`
`@@ -28,6 +38,7 @@ Button.propTypes = {`
`28`	`38`	`type:T.oneOf(['primary','red','ghost']),`
`29`	`39`	`size:T.oneOf(['default','small']),`
`30`	`40`	`onClick:T.func,`
	`41`	`+className:T.string,`
`31`	`42`	`}`
`32`	`43`
`33`	`44`	`Button.defaultProps={`
`@@ -37,6 +48,7 @@ Button.defaultProps = {`
`37`	`48`	`size:'default',`
`38`	`49`	`// eslint-disable-next-line no-console`
`39`	`50`	`onClick:console.log,`
	`51`	`+className:'',`
`40`	`52`	`}`
`41`	`53`
`42`	`54`	`exportdefaultButton`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`importReactfrom'react'`
`2`	`2`
`3`		`-import{Button}from'@/components/Buttons'`
`4`	`3`	`importSocialListfrom'../SocialList'`
`5`	`4`	`import{`
`6`	`5`	`Wrapper,`
`@@ -17,11 +16,9 @@ const ContactBar = () => {`
`17`	`16`	`<InnerWrapper>`
`18`	`17`	`<SubscribeWrapper>`
`19`	`18`	`<SubscribeInput/>`
`20`		`-<SubscribeBtn>`
`21`		`-<Button>订阅</Button>`
`22`		`-</SubscribeBtn>`
	`19`	`+<SubscribeBtn>订阅</SubscribeBtn>`
`23`	`20`	`<SubscribeText>`
`24`		`-订阅后会不定期发送社区动态，包括开发，内容等等`
	`21`	`+订阅后会不定期推送社区开发及运营动态，欢迎订阅（可随时取消）。`
`25`	`22`	`</SubscribeText>`
`26`	`23`	`</SubscribeWrapper>`
`27`	`24`	`<SocialList/>`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`importstyledfrom'styled-components'`
`2`	`2`
	`3`	`+import{Button}from'@/components/Buttons'`
`3`	`4`	`importInputfrom'@/components/Input'`
`4`	`5`
`5`	`6`	`import{theme,cs}from'@/utils'`
@@ -19,14 +20,20 @@ export const SubscribeWrapper = styled.div`
`19`	`20`	`${cs.flex('align-center')};`
`20`	`21`	`
`21`	`22`	exportconstSubscribeInput=styled(Input)``
`22`		-exportconstSubscribeBtn=styled.div`
	`23`	+exportconstSubscribeBtn=styled(Button)`
`23`	`24`	`margin-left: 15px;`
`24`	`25`	`margin-right: 18px;`
	`26`	`+ filter: saturate(0.7);`
	`27`	`+`
	`28`	`+${SubscribeWrapper}:hover & {`
	`29`	`+ filter: saturate(1);`
	`30`	`+ }`
	`31`	`+ transition: all 0.25s;`
`25`	`32`	`
`26`	`33`	exportconstSubscribeText=styled.div`
`27`	`34`	`font-size: 11px;`
`28`		`- color:${theme('footer.text')};`
`29`		`- width:140px;`
	`35`	`+ color:${theme('footer.hover')};`
	`36`	`+ width:200px;`
`30`	`37`	`line-height: 1.9;`
`31`	`38`	`opacity: 0;`
`32`	`39`

Comments

(0)