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

fix(class): avoid duplicate definition of fill #4929

Merged
merged 1 commit into from Oct 11, 2023
Merged

fix(class): avoid duplicate definition of fill #4929

merged 1 commit into from Oct 11, 2023

Conversation

Mister-Hope
Copy link
Contributor

📑 Summary

Brief description about the content of your PR.

Resolves #

📏 Design Decisions

Describe the way your implementation works or what design decisions you made if applicable.

📋 Tasks

Make sure you

@netlify
Copy link

netlify bot commented Oct 9, 2023

Deploy Preview for mermaid-js ready!

Name Link
🔨 Latest commit 444e81a
🔍 Latest deploy log https://app.netlify.com/sites/mermaid-js/deploys/65236edb657c830007fdf097
😎 Deploy Preview https://deploy-preview-4929--mermaid-js.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@Mister-Hope
Copy link
Contributor Author

Mister-Hope commented Oct 9, 2023

Also I noticed that there are a lot of theme variables, like attributeBackgroundColorOdd and attributeBackgroundColorEven (for er chart), can only be found at source code.

I would suggesting adding theme in docs, if any core team agrees, I can add them in another pr to make sure they are available at docs.

The only question is that shall I add them at the bottom of chart page, or inside config section about themeVariables

@codecov
Copy link

codecov bot commented Oct 9, 2023

Codecov Report

Merging #4929 (444e81a) into develop (12a4707) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #4929   +/-   ##
========================================
  Coverage    79.97%   79.97%           
========================================
  Files          164      164           
  Lines        13623    13623           
  Branches       693      693           
========================================
  Hits         10895    10895           
  Misses        2579     2579           
  Partials       149      149           
Flag Coverage Δ
e2e 85.26% <ø> (ø)
unit 43.29% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
packages/mermaid/src/diagrams/class/styles.js 100.00% <ø> (ø)

@huynhicode
Copy link
Member

Also I noticed that there are a lot of theme variables, like attributeBackgroundColorOdd and attributeBackgroundColorEven (for er chart), can only be found at source code.

I would suggesting adding theme in docs, if any core team agrees, I can add them in another pr to make sure they are available at docs.

The only question is that shall I add them at the bottom of chart page, or inside config section about themeVariables

Thanks @Mister-Hope

Perhaps you can add them in these two places:

@sidharthv96 sidharthv96 added this pull request to the merge queue Oct 11, 2023
Merged via the queue into mermaid-js:develop with commit 380aa94 Oct 11, 2023
18 checks passed
@mermaid-bot
Copy link

mermaid-bot bot commented Oct 11, 2023

@Mister-Hope, Thank you for the contribution!
You are now eligible for a year of Premium account on MermaidChart.
Sign up with your GitHub account to activate.

fuxingloh pushed a commit to fuxingloh/contented that referenced this pull request Nov 3, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [mermaid](https://togithub.com/mermaid-js/mermaid) | [`10.5.1` ->
`10.6.0`](https://renovatebot.com/diffs/npm/mermaid/10.5.1/10.6.0) |
[![age](https://developer.mend.io/api/mc/badges/age/npm/mermaid/10.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/mermaid/10.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/mermaid/10.5.1/10.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/mermaid/10.5.1/10.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>mermaid-js/mermaid (mermaid)</summary>

###
[`v10.6.0`](https://togithub.com/mermaid-js/mermaid/releases/tag/v10.6.0):
10.6.0

[Compare
Source](https://togithub.com/mermaid-js/mermaid/compare/v10.5.1...v10.6.0)

#### What's Changed

- Add new chart xychart by
[@&#8203;subhash-halder](https://togithub.com/subhash-halder) in
[mermaid-js/mermaid#4413

#### Fix

- bug/4849\_center_axis_labels by
[@&#8203;dreathed](https://togithub.com/dreathed) in
[mermaid-js/mermaid#4860
- Better handling of large flowcharts and long edges
[@&#8203;knsv](https://togithub.com/knsv)

#### Docs

- Add new Atlassian integrations by
[@&#8203;janjonas](https://togithub.com/janjonas) in
[mermaid-js/mermaid#4862
- docs: fix typo by
[@&#8203;dennis0324](https://togithub.com/dennis0324) in
[mermaid-js/mermaid#4887
- Update notes on orientation in GitGraph documentation by
[@&#8203;guypursey](https://togithub.com/guypursey) in
[mermaid-js/mermaid#4897
- Enhancment: twitter logo in doc by
[@&#8203;chaursiyasanjeet](https://togithub.com/chaursiyasanjeet) in
[mermaid-js/mermaid#4925
- Update link for the Mermaid integration in JetBrains IDEs by
[@&#8203;FirstTimeInForever](https://togithub.com/FirstTimeInForever) in
[mermaid-js/mermaid#4883

#### Chores

- Wait for `marker_unique_id.html` E2E test to render before taking a
screenshot by [@&#8203;aloi](https://togithub.com/aloi)

sklink[mermaid-js/mermaid#4847
- Wait for `theme-directives.html` E2E test to render before taking a
screenshot by [@&#8203;aloisklink](https://togithub.com/aloisklink) in
[mermaid-js/mermaid#4846
- chore(deps): update all patch dependencies (patch) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4851
- chore(dev-deps): update `@typescript-eslint/*` plugins to v6 (major)
by [@&#8203;aloisklink](https://togithub.com/aloisklink) in
[mermaid-js/mermaid#4857
- chore: shorten `flow-huge.spec.js` test case using `.repeat` by
[@&#8203;Yokozuna59](https://togithub.com/Yokozuna59) in
[mermaid-js/mermaid#4859
- Publish Live Editor previews for the `develop` & `next` branches by
[@&#8203;sidharthv96](https://togithub.com/sidharthv96) in
[mermaid-js/mermaid#4841
- chore(deps): update all minor dependencies (minor) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4870
- chore(deps): update all patch dependencies (patch) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4869
- Commented out broken test by
[@&#8203;nirname](https://togithub.com/nirname) in
[mermaid-js/mermaid#4913
- chore(deps): update all patch dependencies (patch) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4891
- fix(class): avoid duplicate definition of fill by
[@&#8203;Mister-Hope](https://togithub.com/Mister-Hope) in
[mermaid-js/mermaid#4929
- chore(deps): update all minor dependencies (minor) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4892
- making consitent config imports from diagramAPI by
[@&#8203;dreathed](https://togithub.com/dreathed) in
[mermaid-js/mermaid#4889
- fix(typos): Fix minor typos in the source code by
[@&#8203;mribeirodantas](https://togithub.com/mribeirodantas) in
[mermaid-js/mermaid#4928
- chore(deps): update all patch dependencies (patch) by
[@&#8203;renovate](https://togithub.com/renovate) in
[mermaid-js/mermaid#4945
- Bump [@&#8203;babel/traverse](https://togithub.com/babel/traverse)
from 7.22.10 to 7.23.2 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[mermaid-js/mermaid#4951
- Replace rehype-mermaidjs with rehype-mermaid by
[@&#8203;remcohaszing](https://togithub.com/remcohaszing) in
[mermaid-js/mermaid#4970

#### New Contributors

- [@&#8203;dreathed](https://togithub.com/dreathed) made their first
contribution in
[mermaid-js/mermaid#4860
- [@&#8203;janjonas](https://togithub.com/janjonas) made their first
contribution in
[mermaid-js/mermaid#4862
- [@&#8203;dennis0324](https://togithub.com/dennis0324) made their first
contribution in
[mermaid-js/mermaid#4887
- [@&#8203;FirstTimeInForever](https://togithub.com/FirstTimeInForever)
made their first contribution in
[mermaid-js/mermaid#4883
- [@&#8203;guypursey](https://togithub.com/guypursey) made their first
contribution in
[mermaid-js/mermaid#4897
- [@&#8203;chaursiyasanjeet](https://togithub.com/chaursiyasanjeet) made
their first contribution in
[mermaid-js/mermaid#4925
- [@&#8203;mribeirodantas](https://togithub.com/mribeirodantas) made
their first contribution in
[mermaid-js/mermaid#4928

**Full Changelog**:
mermaid-js/mermaid@v10.5.1...v10.6.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/levaintech/contented).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMS41IiwidXBkYXRlZEluVmVyIjoiMzcuMzEuNSIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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.

None yet

3 participants