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

PD-1610 / 24.10 / Pd 1610 update docs hub and security hub header footer styling to match parent true nas com (by DjP-iX) #3413

Merged
merged 6 commits into from
Jan 7, 2025

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Jan 6, 2025

Automatic cherry-pick failed. Please resolve conflicts by running:

git cherry-pick -x 8a2ab3436d937a0835aef8725170fe6c0e2b20b7
git cherry-pick -x 95152b1c6beb847c83d07459a01a2bc458a5eeb6
git cherry-pick -x 1c0f57096fa4575d4d90fb31a1ccbfd596b3cf6a
git cherry-pick -x 2e425b2ad41f493c3becf6626ea35d9f10f7c0de
git cherry-pick -x be75f2a4f90078c0bc522de6df85c488dc40e082
git cherry-pick -x 79fc57374aac65f7b1eae4a4cd71401e71657bac
git cherry-pick -x 09778a5d4d8f10eb2bc15396cb476f48c142bd3a
git cherry-pick -x c2526954852bbe87b29011663066e15a0ee7a637
git cherry-pick -x e668dec77eaff01131fd70d54e44009f8352a57e
git cherry-pick -x a98fa405c5433260068efc984a80131f62d8e7cb
git cherry-pick -x 5e50513428e3dff6773f7f33953ead6e336833e0
git cherry-pick -x 824be9c9882a17063b2944622130421bf986beae
git cherry-pick -x cace440164c0ec621c5fd987d04bd1c493149750
git cherry-pick -x 96ba333fe398199fc6544a896b3c365416115032
git cherry-pick -x 8d261214322ac2951455e695a934bc3f0ef3dc65
git cherry-pick -x 339bcb33d79e19333f10475eaa476304d194515e
git cherry-pick -x dae41b2eb1382d04a3b2599d05aa6743bb15915a
git cherry-pick -x 9dae25dfb6ae756fcfb4d86fed5784c8bb5b90b5
git cherry-pick -x 68218d2bd8d058ff83b0f5410d7354811c5289ac
git cherry-pick -x 65b3ae8324fe5a18f529d8b934f96ab8257aa4ea
git cherry-pick -x 381034aa6aa74a1c37de5be467761cbfc8ee5ad5
git cherry-pick -x 89956b2e502887e90b3ff723807413479eea8c35
git cherry-pick -x 21f944dce8fd4a9a74438a8b06642627e249d4be
git cherry-pick -x 98177b1ef5b02f7be5f1efae4367d86bc0beeb08
git cherry-pick -x 7df689bad8256b2974364ce8e35e2fe78da478b1
git cherry-pick -x e4625d1ac56d7d42be0a4f92aa59ce37a5a3b0a6
git cherry-pick -x 1fbc359260b47128a6a48951d4486ab53241156c

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~4
git cherry-pick -x 1bb5fd6adb68b18aad6476bcab61d46bad2f0e2e

To test:

Checkout and run a local build. Ctrl+F5 to clear browser cache on localhost:1313. Compare the header on the local build to truenas.com.

Thanks for contributing to TrueNAS documentation! By opening a Pull Request, you're acknowledging that your changes will be distributed under the Creative Commons 4.0 license.

Original PR: #3403
Jira URL: https://ixsystems.atlassian.net/browse/PD-1610

DjP-iX added 4 commits January 6, 2025 20:42
(cherry picked from commit 2bd25e6)
(cherry picked from commit 28fb071)
(cherry picked from commit c464007)
DjP-iX added 2 commits January 7, 2025 11:06
…ter styling to match parent true nas com (#3403)

* Update config.toml

* Update site-header.html

* Update custom.css

* Create TN_Open_Enterprise_Storage_White_Version.png

* Update _index.md

* Update ComponentNaming.md

* Update site-header.html

* Update custom.css

* Create tc-full.png

* Create chat.svg

* Create full-rgb.png

* Create Truenas_icon.png

* Create custom class for H3 headers in top bar

Add color value for all four items
Define a bold font-weight to better match the parent truenas.com style.

* Update site-footer.html

* Update custom.css

* Create truenas-logo-mark.png

* Update site-footer.html

* Update custom.css

* Update site-header.html

* Update custom.css

* Update toc-panel.html

* Update custom.css

* Update site-footer.html

* Update site-footer.html

* Update site-footer.html

* Update custom.css

---------

Co-authored-by: Tim Moore <[email protected]>
(cherry picked from commit 1bb5fd6)
@DjP-iX DjP-iX marked this pull request as ready for review January 7, 2025 16:08
@DjP-iX DjP-iX requested a review from a team as a code owner January 7, 2025 16:08
@Mrt134 Mrt134 added the Review (TM) A technical writer is reviewing the PR. label Jan 7, 2025
Copy link
Collaborator

@Mrt134 Mrt134 left a comment

Choose a reason for hiding this comment

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

Local build test looked good - approved!

@Mrt134 Mrt134 merged commit c0b79e1 into 24.10 Jan 7, 2025
3 checks passed
@Mrt134 Mrt134 deleted the PD-1610-24.10 branch January 7, 2025 20:05
@bugclerk
Copy link
Contributor Author

bugclerk commented Jan 7, 2025

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Jan 7, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Review (TM) A technical writer is reviewing the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants