This repository was archived by the owner on Mar 4, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 52
fix(Header): Adding dark and contrast styles for Header #427
Merged
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6acee82
adding dark and contrast styles for Header
bcalvery 40a62be
updating changelog with PR link
bcalvery a93478f
Merge branch 'master' into fix/header-darkthemes
bcalvery 2046145
-added variables in the docs' Header components to always be black
c1d261c
Merge remote-tracking branch 'origin/master' into fix/header-darkthemes
alinais 2faacea
adding siteVars black to header vars instead of hardcoded value
alinais 90dc28c
-revert add-a-feature.md
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
export { default as Button } from './components/Button/buttonVariables' | ||
export { default as Text } from './components/Text/textVariables' | ||
export { default as Divider } from './components/Divider/dividerVariables' | ||
export { default as Header } from './components/Header/headerVariables' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import { HeaderVariables } from '../../../teams/components/Header/headerVariables' | ||
import { Partial } from 'types/utils' | ||
|
||
export default (siteVars: any): Partial<HeaderVariables> => { | ||
return { | ||
color: siteVars.white, | ||
descriptionColor: siteVars.gray02, | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
export { default as Avatar } from './components/Avatar/avatarVariables' | ||
|
||
export { default as Button } from './components/Button/buttonVariables' | ||
|
||
export { default as Divider } from './components/Divider/dividerVariables' | ||
|
||
export { default as Header } from './components/Header/headerVariables' | ||
export { default as Text } from './components/Text/textVariables' |
9 changes: 9 additions & 0 deletions
9
src/themes/teams-high-contrast/components/Header/headerVariables.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import { HeaderVariables } from '../../../teams/components/Header/headerVariables' | ||
import { Partial } from 'types/utils' | ||
|
||
export default (siteVars: any): Partial<HeaderVariables> => { | ||
return { | ||
color: siteVars.white, | ||
descriptionColor: siteVars.white, | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
src/themes/teams/components/Header/headerDescriptionVariables.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
export default siteVariables => ({ | ||
color: 'rgba(0,0,0,.6)', | ||
color: siteVariables.gray04, | ||
}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,11 @@ | ||
export default siteVariables => ({ | ||
color: 'black', | ||
descriptionColor: undefined, | ||
}) | ||
export interface HeaderVariables { | ||
color: string | ||
descriptionColor: string | ||
} | ||
|
||
export default (siteVars: any): HeaderVariables => { | ||
return { | ||
color: 'black', | ||
descriptionColor: undefined, | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be
siteVars.black
?