search

pi-hole / web

Pi-hole Dashboard for stats and more
https://pi-hole.net
Other
2.01k stars 557 forks source link

Resolve merge conflicts development-v6 > devel #3105

Closed yubiuser closed 1 month ago

yubiuser commented 1 month ago

What does this PR aim to accomplish?:

Resolve merge conflicts development-v6 > devel

By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.
yubiuser commented 1 month ago

This PR would add the LCARS-Picard to v6. It has not adaped yet. for cleanness we could keep it in this PR and remove it in devel once it was merged. Or the author could adapt/fix(?) it once it's in devel

PromoFaux commented 1 month ago

We could disable the theme for the time being until such time as it is ready to be adapted? Not 100% sure what would need to be fixed as I've only ever just whatever the default theme is!

paging @MichalSvatos

rdwebdesign commented 1 month ago

There was a PR (https://github.com/pi-hole/web/pull/3031) to add the theme to v6, but it was automatically closed due to unresolved merge conflicts.

Note: The also theme needs to be added to FTL repo. The PR https://github.com/pi-hole/FTL/pull/1971 was also closed with unresolved merge conflicts.

yubiuser commented 1 month ago

I removed the LCARS picard theme. It can be re-added anytime.

PromoFaux commented 1 month ago

Cool, happy to merge this as-is. @rdwebdesign, if you have the time could you take a look over the two closed PRs for the theme and see if anything needs doing?

rdwebdesign commented 1 month ago

@PromoFaux

There are 2 closed PRs related to the new theme: