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.

Sign up for GitHub

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

Jump to bottom

PD-1475 / 3.0 / Pd 1475 additional css styling for the docs bot (by DjP-iX) #3097

Merged
merged 5 commits into from
Oct 2, 2024
Merged

PD-1475 / 3.0 / Pd 1475 additional css styling for the docs bot (by DjP-iX) #3097

merged 5 commits into from
Oct 2, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Oct 1, 2024

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

git reset --hard HEAD~1
git cherry-pick -x 2d94fb234f74cd68fcc86e83146fa992b3790d76
git cherry-pick -x 976fe6288941cc9079206df61dcea77c4ddb53c4
git cherry-pick -x c65514b753bb66a16e04e5965743398bcf596b5d
git cherry-pick -x d1dc430e3ab015e19a19a0f8ae8cf84a2a483d90
git cherry-pick -x 6656ec5c26022e893959aa471ad75aa49d3fdd00

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

git reset --hard HEAD~1
git cherry-pick -x d4f89c6802c577568a491f7db616d56dfee41341

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: #3090
Jira URL: https://ixsystems.atlassian.net/browse/PD-1475

DjP-iX added 4 commits October 1, 2024 15:04
@DjP-iX
PD-1475 / 25.04 / Pd 1475 additional css styling for the docs bot (#3090
9b228c4 
)

* Update menu-filetree.html

* Update menu.html

* Update search-form.html

* Update site-header.html

* Update menu-filetree.html

(cherry picked from commit d4f89c6)
@DjP-iX
Merge branch 'PD-1475-3.0' of https://github.com/truenas/documentation …
2a847b9 
…into PD-1475-3.0
@DjP-iX
Update en.yaml
04459c9
@DjP-iX
Update menu.html
0740c73
@DjP-iX DjP-iX marked this pull request as ready for review October 1, 2024 19:06
@DjP-iX DjP-iX requested a review from a team as a code owner October 1, 2024 19:06
@micjohnson777 micjohnson777 merged commit b2a9ce4 into 3.0 Oct 2, 2024
3 checks passed
@micjohnson777 micjohnson777 deleted the PD-1475-3.0 branch October 2, 2024 19:13
@bugclerk
Copy link
Contributor Author

bugclerk commented Oct 2, 2024

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 Oct 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@micjohnson777 micjohnson777 micjohnson777 approved these changes

Assignees

@DjP-iX DjP-iX

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bugclerk @micjohnson777 @DjP-iX