Commit6300ed9

committed

chore: merge branch 'custom-scrollbar' into dev

2 parentsa2691b3 +7680cd5 commit6300ed9Copy full SHA for 6300ed9

File tree

+56

-15

lines changed

+56

-15

lines changed

Lines changed: 29 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import{createGlobalStyle}from'styled-components'`
	`1`	`+import{createGlobalStyle,css}from'styled-components'`
`2`	`2`	`import{theme,cs}from'@utils'`
`3`	`3`	`importnormalizefrom'./normalize'`
`4`	`4`
@@ -18,7 +18,7 @@ const GlobalStyle = createGlobalStyle`
`18`	`18`	`body {`
`19`	`19`	${cs.media.mobile`
`20`	`20`	`position: relative;`
`21`		-`};
	`21`	+`};
`22`	`22`	`}`
`23`	`23`	`*::-moz-selection {`
`24`	`24`	`background-color:${theme('selectionBg')} !important;`
@@ -138,6 +138,33 @@ const GlobalStyle = createGlobalStyle`
`138`	`138`	`padding: 0 1px;`
`139`	`139`	`color:${theme('searchHighlight.doramonFg')};`
`140`	`140`	`}`
	`141`	`+`
	`142`	`+${({ isMacOS})=>`
	`143`	`+isMacOS\|\|`
	`144`	+css`
	`145`	`+ ::-webkit-scrollbar {`
	`146`	`+ background: transparent;`
	`147`	`+ width: 4px;`
	`148`	`+ }`
	`149`	`+ ::-webkit-scrollbar-button {`
	`150`	`+ background: transparent;`
	`151`	`+ }`
	`152`	`+ ::-webkit-scrollbar-track {`
	`153`	`+ background: transparent;`
	`154`	`+ }`
	`155`	`+ ::-webkit-scrollbar-track-piece {`
	`156`	`+ background: transparent;`
	`157`	`+ }`
	`158`	`+ ::-webkit-scrollbar-thumb {`
	`159`	`+ background:${theme('banner.title')};`
	`160`	`+ }`
	`161`	`+ ::-webkit-scrollbar-corner {`
	`162`	`+ background: grey;`
	`163`	`+ }`
	`164`	`+ ::-webkit-resizer {`
	`165`	`+ background: grey;`
	`166`	`+ }`
	`167`	+ `};
`141`	`168`	`
`142`	`169`
`143`	`170`	`exportdefaultGlobalStyle`

Lines changed: 20 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,23 +9,32 @@ import { ThemeProvider } from 'styled-components'`
`9`	`9`	`importHelmetfrom'react-helmet'`
`10`	`10`
`11`	`11`	`import{connectStore}from'@utils'`
	`12`	`+import{usePlatform}from'@hooks'`
`12`	`13`
`13`	`14`	`// import MarkDownStyle from './MarkDownStyle'`
`14`	`15`	`importCodeSyxHighlightfrom'./CodeSyxHighlight'`
`15`	`16`	`importAntUIOverWritefrom'./AntUIOverWrite'`
`16`	`17`	`importGlobalStylefrom'./GlobalStyle'`
`17`	`18`
`18`		`-constThemeContainer=({ children,theme:{ themeData}})=>(`
`19`		`-<ThemeProvidertheme={themeData}>`
`20`		`-<React.Fragment>`
`21`		`-<Helmetmeta={[{name:'theme-color',content:themeData.mobileTab}]}/>`
`22`		`-<div>{children}</div>`
`23`		`-<CodeSyxHighlight/>`
`24`		`-<AntUIOverWrite/>`
`25`		`-<GlobalStyle/>`
`26`		`-</React.Fragment>`
`27`		`-</ThemeProvider>`
`28`		`-)`
	`19`	`+constThemeContainer=({ children,theme:{ themeData}})=>{`
	`20`	`+const{ isMacOS}=usePlatform()`
	`21`	`+`
	`22`	`+console.log('isMacOS: ',isMacOS)`
	`23`	`+`
	`24`	`+return(`
	`25`	`+<ThemeProvidertheme={themeData}>`
	`26`	`+<React.Fragment>`
	`27`	`+<Helmet`
	`28`	`+meta={[{name:'theme-color',content:themeData.mobileTab}]}`
	`29`	`+/>`
	`30`	`+<div>{children}</div>`
	`31`	`+<CodeSyxHighlight/>`
	`32`	`+<AntUIOverWrite/>`
	`33`	`+<GlobalStyleisMacOS={isMacOS}/>`
	`34`	`+</React.Fragment>`
	`35`	`+</ThemeProvider>`
	`36`	`+)`
	`37`	`+}`
`29`	`38`
`30`	`39`	`exportdefaultconnectStore(ThemeContainer)`
`31`	`40`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ const UserListerContainer = ({ userLister }) => {`
`64`	`64`
`65`	`65`	`return(`
`66`	`66`	`<Modalwidth="700px"show={show}showCloseBtnonClose={onClose}>`
`67`		`-<Wrapper>`
	`67`	`+<Wrapperid="userlist-scroller">`
`68`	`68`	`<HeaderInfo`
`69`	`69`	`type={type}`
`70`	`70`	`brief={brief}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,9 @@ export const useInit = _store => {`
`167`	`167`	`// log('effect init')`
`168`	`168`	`sub$=sr71$.data().subscribe($solver(DataSolver,ErrSolver))`
`169`	`169`
	`170`	`+/* eslint-disable no-undef */`
	`171`	`+// OverlayScrollbars(document.getElementById('userlist-scroller'), {})`
	`172`	`+`
`170`	`173`	`return()=>{`
`171`	`174`	`// log('effect uninit')`
`172`	`175`	`sr71$.stop()`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,9 @@ import styled from 'styled-components'`
`3`	`3`	`// import Img from '@components/Img'`
`4`	`4`	`import{cs}from'@utils'`
`5`	`5`
`6`		-exportconstWrapper=styled.div`
	`6`	`+exportconstWrapper=styled.div.attrs(({ id})=>({`
	`7`	`+ id,`
	`8`	+}))`
`7`	`9`	`padding: 20px;`
`8`	`10`	`
`9`	`11`	exportconstMsgWrapper=styled.div`

Comments

(0)