Skip to content
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.

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

some chat dark colors #19318

Merged
merged 2 commits into from Sep 7, 2019

Conversation

@chrisnojima
Copy link
Contributor

commented Sep 6, 2019

This updates some chat views and fixes some issues w/ the storybook

  • fix auto dark flip in storybook
  • fix popup handling in stories
  • fix the 'multiColors' aka in master blackOrWhite was using this.black in colors and this.white in darkColors but this.white in darkColors is black, so its really blackOrBlack, which isn't what we want. Also some colors didn't match the names which shouldn't be the case. If the color is right the name is wrong
WIP

@chrisnojima chrisnojima requested review from adamjspooner and keybase/react-hackers Sep 6, 2019

@@ -375,7 +375,7 @@ const styles = Styles.styleSheetCreate(
},
}),
cancelEditingText: {
color: Styles.globalColors.blackOrBlack,
color: Styles.globalColors.whiteOrBlack,

This comment has been minimized.

Copy link
@chrisnojima

chrisnojima Sep 6, 2019

Author Contributor

fixes this problem on master

document.body && document.body.addEventListener('click', this._handleClick)
document.body && document.body.addEventListener('scroll', this._handleScroll, true)
const node = document.body
if (!__STORYBOOK__ && node) {

This comment has been minimized.

Copy link
@chrisnojima

chrisnojima Sep 6, 2019

Author Contributor

don't do this at all in stories, messes up clicks in popups
also the scroll thing did nothing

@@ -56,13 +38,13 @@ const RootWrapper = ({children}) => {
_autoSwap = autoSwap
}, [darkMode, autoSwap])

useInterval(
Kb.useInterval(

This comment has been minimized.

Copy link
@chrisnojima

chrisnojima Sep 6, 2019

Author Contributor

using the common one now

() => {
const next = !darkMode
setDarkMode(next)

This comment has been minimized.

Copy link
@chrisnojima

chrisnojima Sep 6, 2019

Author Contributor

the order here is important, else using the auto flip only half works

@@ -132,14 +132,14 @@ export const colors = {
export const darkColors: {[P in keyof typeof colors]: string | undefined} = {
black: 'rgba(255, 255, 255, 0.85)',
get blackOrBlack() {
return this.black
return colors.black

This comment has been minimized.

Copy link
@chrisnojima

chrisnojima Sep 6, 2019

Author Contributor

here the intention is black in light mode and black in dark mode. in colors its safe to refer to this.whatever as the name is accurate. but in darkMode this.whatever likely doesn't refer to the right color

@@ -191,7 +191,7 @@ export const darkColors: {[P in keyof typeof colors]: string | undefined} = {
greenLight: '#B7EED9',
greenLighter: '#E8FAF6',
get greenOrGreenLighter() {
return this.green

This comment has been minimized.

Copy link
@chrisnojima

chrisnojima Sep 6, 2019

Author Contributor

this is a color change: cc: @adamjspooner

},
get whiteOrGreenDark() {
return this.white
return colors.greenDark

This comment has been minimized.

Copy link
@chrisnojima

chrisnojima Sep 6, 2019

Author Contributor

this is a color change: cc: @adamjspooner

@mmaxim
mmaxim approved these changes Sep 7, 2019
WIP

@chrisnojima chrisnojima merged commit 38a2606 into master Sep 7, 2019

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/jenkins/pr-head This commit looks good
Details

@chrisnojima chrisnojima deleted the nojima/HOTPOT-chat-dark branch Sep 7, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.