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

Load stylesheets in the same order as when they were in the head #503

Merged
merged 1 commit into from
Aug 1, 2023

Conversation

zb140
Copy link
Contributor

@zb140 zb140 commented Jul 30, 2023

theme-park.dev


  • I have read the contributing guideline and understand that I have made the correct modifications

  • PR's are done against the develop branch.


Bug fixes

Closes #502

Description:

When the fix was made for *arr apps to load the stylesheets into the HTML body instead of the header, they accidentally started getting loaded in backwards order compared to the order they'd been loaded in before. This meant that values in theme stylesheets were being overridden by values in base stylesheets, because the base sheets were loaded after the theme.

Benefits of this PR and context:

This PR ensures that the stylesheets are loaded in the same order they were loaded in before the move out of <head>. That should help guarantee that anything that was working prior to the move will still work after.

Thinking about it, I actually think it might make more sense to load the app's base CSS, then any addons, and then the theme CSS last, but since that's a potentially breaking change I stuck with making sure they get loaded in the same order they used to.

How Has This Been Tested?

I built the sonarr mod locally with the new changes and loaded it in my LSIO sonarr container and checked that the stylesheets are getting loaded in the expected order.

Source / References:

@zb140 zb140 changed the base branch from master to develop July 30, 2023 14:42
Copy link
Collaborator

@GilbN GilbN left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@GilbN GilbN merged commit c27a1fb into themepark-dev:develop Aug 1, 2023
coolguy1771 referenced this pull request in coolguy1771/home-ops Aug 23, 2023
…3198)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [ghcr.io/onedr0p/theme-park](https://togithub.com/GilbN/theme.park) |
patch | `1.13.10` -> `1.13.11` |

---

### Release Notes

<details>
<summary>GilbN/theme.park (ghcr.io/onedr0p/theme-park)</summary>

###
[`v1.13.11`](https://togithub.com/ThemeParkTycoon/theme.park/releases/tag/1.13.11)

[Compare
Source](https://togithub.com/GilbN/theme.park/compare/1.13.10...1.13.11)

<!-- Release notes generated using configuration in .github/release.yml
at master -->

### New

- 🚀 [Add script for loading unraid themes
locally](https://togithub.com/GilbN/theme.park/pull/507/commits/d852434b45023f75382f2f757534afd1f95d7926)

### Fixes

- 💄[Add support for latest
transmission](https://togithub.com/GilbN/theme.park/pull/507/commits/8b8406f3103e76e23afecb463cf98f4cbb2367de)
- 💄[Load servarr mod stylesheets in the same order as when they were in
the
head](https://togithub.com/GilbN/theme.park/pull/507/commits/a6df7ca39d0ec32ee457ed5e2986c5040579745d)
- 💄[Update gitea themes for
1.20](https://togithub.com/GilbN/theme.park/pull/507/commits/9850f655ed61cdee7b48ee6b3dbac76fe80ea362)

### Other

- [Update mods workflow
](https://togithub.com/GilbN/theme.park/pull/507/commits/2f86f4a35ba6f28345e99b41ae7dba48ef084b5f)

#### New Contributors

- [@&#8203;zb140](https://togithub.com/zb140) made their first
contribution in
[https://github.com/GilbN/theme.park/pull/503](https://togithub.com/GilbN/theme.park/pull/503)
- [@&#8203;aceArt-GmbH](https://togithub.com/aceArt-GmbH) made their
first contribution in
[https://github.com/GilbN/theme.park/pull/506](https://togithub.com/GilbN/theme.park/pull/506)
- [@&#8203;ArchGryphon9362](https://togithub.com/ArchGryphon9362) made
their first contribution in
[https://github.com/GilbN/theme.park/pull/505](https://togithub.com/GilbN/theme.park/pull/505)

**Full Changelog**:
themepark-dev/theme.park@1.13.10...1.13.11

</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 [Renovate
Bot](https://togithub.com/renovatebot/renovate).

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

Co-authored-by: lumiere-bot <98047013+lumiere-bot[bot]@users.noreply.github.com>
szinn referenced this pull request in szinn/k8s-homelab Aug 25, 2023
…2278)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [ghcr.io/onedr0p/theme-park](https://togithub.com/GilbN/theme.park) |
patch | `1.13.10` -> `1.13.11` |

---

### Release Notes

<details>
<summary>GilbN/theme.park (ghcr.io/onedr0p/theme-park)</summary>

###
[`v1.13.11`](https://togithub.com/ThemeParkTycoon/theme.park/releases/tag/1.13.11)

[Compare
Source](https://togithub.com/GilbN/theme.park/compare/1.13.10...1.13.11)

<!-- Release notes generated using configuration in .github/release.yml
at master -->

### New

- 🚀 [Add script for loading unraid themes
locally](https://togithub.com/GilbN/theme.park/pull/507/commits/d852434b45023f75382f2f757534afd1f95d7926)

### Fixes

- 💄[Add support for latest
transmission](https://togithub.com/GilbN/theme.park/pull/507/commits/8b8406f3103e76e23afecb463cf98f4cbb2367de)
- 💄[Load servarr mod stylesheets in the same order as when they were in
the
head](https://togithub.com/GilbN/theme.park/pull/507/commits/a6df7ca39d0ec32ee457ed5e2986c5040579745d)
- 💄[Update gitea themes for
1.20](https://togithub.com/GilbN/theme.park/pull/507/commits/9850f655ed61cdee7b48ee6b3dbac76fe80ea362)

### Other

- [Update mods workflow
](https://togithub.com/GilbN/theme.park/pull/507/commits/2f86f4a35ba6f28345e99b41ae7dba48ef084b5f)

#### New Contributors

- [@&#8203;zb140](https://togithub.com/zb140) made their first
contribution in
[https://github.com/GilbN/theme.park/pull/503](https://togithub.com/GilbN/theme.park/pull/503)
- [@&#8203;aceArt-GmbH](https://togithub.com/aceArt-GmbH) made their
first contribution in
[https://github.com/GilbN/theme.park/pull/506](https://togithub.com/GilbN/theme.park/pull/506)
- [@&#8203;ArchGryphon9362](https://togithub.com/ArchGryphon9362) made
their first contribution in
[https://github.com/GilbN/theme.park/pull/505](https://togithub.com/GilbN/theme.park/pull/505)

**Full Changelog**:
themepark-dev/theme.park@1.13.10...1.13.11

</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 [Renovate
Bot](https://togithub.com/renovatebot/renovate).

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

Co-authored-by: repo-jeeves <106431701+repo-jeeves[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.

Stylesheets loaded in backwards order with docker mods
2 participants