Skip to content

Line label font merged with chart.options.font#268

Closed
stockiNail wants to merge 13 commits into
chartjs:masterfrom
pepstock-org:fix-262
Closed

Line label font merged with chart.options.font#268
stockiNail wants to merge 13 commits into
chartjs:masterfrom
pepstock-org:fix-262

Conversation

@stockiNail

Copy link
Copy Markdown
Collaborator

Fixes #262

Line label font merged with chart.options.font in order to inherit the chart options instead of Chart.defaults.font ones.

@kurkle

kurkle commented Dec 18, 2020

Copy link
Copy Markdown
Member

this too needs rebase

@stockiNail

Copy link
Copy Markdown
Collaborator Author

this too needs rebase

doing.. I need time. Wait for a while.

Conflicts:
	src/annotation.js
	src/types/box.js
	src/types/line.js
	src/types/point.js
@stockiNail

Copy link
Copy Markdown
Collaborator Author

rebased

@kurkle

kurkle commented Dec 18, 2020

Copy link
Copy Markdown
Member

Hmh. Just the sort of things I don't want to have in here. Lets wait with this one (perhaps for chartjs/Chart.js#8008)

@stockiNail

stockiNail commented Dec 18, 2020

Copy link
Copy Markdown
Collaborator Author

Hmh. Just the sort of things I don't want to have in here. Lets wait with this one (perhaps for chartjs/Chart.js#8008)

I need to remove this change from the others. I can close this one, ok for u?

@stockiNail stockiNail closed this Dec 19, 2020
@stockiNail stockiNail deleted the fix-262 branch February 2, 2021 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default font of line annotation should be merge with chart.options.font?

2 participants