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

[FW][ADD] extensions: icon_role font awesome #9053

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 29, 2024

Task: #3843168

This PR adds a custom extension for an :icon: role to allow the use of Font Awesome icons in documentation.

With the new role, icons can be called by their classname.

This is a Font Awesome :icon:`fa-step-forward` icon.
Screenshot 2024-04-02 at 11 07 01 AM

If this PR is approved, it will likely need to be manually forward ported to each version.

Forward-Port-Of: #8469

@robodoo
Copy link
Collaborator

robodoo commented Apr 29, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 29, 2024

@samueljlieber cherrypicking of pull request #8469 failed.

stdout:

Auto-merging extensions/odoo_theme/static/style.scss
CONFLICT (content): Merge conflict in extensions/odoo_theme/static/style.scss

stderr:

17:06:48.551060 git.c:463               trace: built-in: git cherry-pick 9428a84da2148315a811254fcc89527cbe9edf33
error: could not apply 9428a84da... [ADD] extensions: icon_role font awesome
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@samueljlieber samueljlieber force-pushed the 16.0-15.0-extensions-icons-sali-2tjj-fw branch from 0e7fa5a to f9063ab Compare April 29, 2024 16:23
@C3POdoo C3POdoo requested review from a team April 29, 2024 16:25
@samueljlieber
Copy link
Contributor

f9063ab resolved conflict on extensions/odoo_theme/static/style.scss.
@robodoo r+

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants