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

Doxygen style #26

Merged
merged 13 commits into from
Oct 18, 2023
Merged

Doxygen style #26

merged 13 commits into from
Oct 18, 2023

Conversation

wmamills
Copy link
Collaborator

This is the Doxygen Style work and the updates to the Sphinx theme to match.
I suggest we accept this as a baseline and we can tweak later (before end of October or later depending on how things go.)
I think this is better than what we had and is pretty close.

I will make an issue for the remain style issues as I see them.

(This PR won't style open-amp as that repo has not accepted the style enable PR yet)

Copy link
Collaborator

@arnopo arnopo left a comment

Choose a reason for hiding this comment

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

LGTM with a question

<script type="text/javascript">
$(function() {
toggleButton = document.createElement('doxygen-awesome-dark-mode-toggle')
toggleButton.title = "Toggle Light/Dark Mode"
Copy link
Collaborator

Choose a reason for hiding this comment

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

I can not see the button in https://openamp--26.org.readthedocs.build/en/26/ page
But perhaps need to be merged to see it?

@wmamills
Copy link
Collaborator Author

wmamills commented Oct 13, 2023

@arnopo The light dark button is only for the Doxygen right now, not the Sphinx.
And the open-amp doxygen is not styled right now because the support PR has not been merged.
So in the this PR you will only see it on the libmetal docs.
I checked and it is there.
https://openamp--26.org.readthedocs.build/en/26/doxygen/libmetal/index.htm

I am working on one more fix. Put the correct version number on the Doxygen page.

@wmamills
Copy link
Collaborator Author

wmamills commented Oct 13, 2023

Ok added one more patch to this PR.
After it renders you should see the correct version name in libmetal
Confirmed. However you probably need to refresh the page. The browser tends to keep that in the cache.

When I created the list of remaining issues (Issue #27 ) that one stuck out as it was not just cosmetic but was functionally incorrect. I have adjusted Issue #27 to remove this issue. Besides I had stuggled all day with west manifests and was looking for an easy "win" :)

Add the logo and other appearance images from the project website.

Signed-off-by: Bill Mills <[email protected]>
Make an exact copy of these files so it is easy to see what changed in the
next commit.

Signed-off-by: Bill Mills <[email protected]>
The logo svg files from the project website have a ton of white space.
Edit new files and modify the viewBox=".." attribute to trim it.
The new SVGs are 650 x 650 units with the logo centered.

Signed-off-by: Bill Mills <[email protected]>
We will use doxygen-awesome-css to help style the Doxygen content.
Import it as a submodule and set it to v2.2.1 (from 2023-06-01)

Signed-off-by: Bill Mills <[email protected]>
Import these files as is from Zephyr.
From the main Zephyr repo from dir:
    doc/_doxygen/

Signed-off-by: Bill Mills <[email protected]>
Rename the files from zephyr -> openamp.

Signed-off-by: Bill Mills <[email protected]>
Adjust the files we copied from Zephyr to match our project.
* Adjust Logo size and Logo area
* Use the dark triangle background for the project site for the Logo area
* Use a dark color for the nav area always (light and dark themes)
* Adjust project specific js file name in header
* Remove footer script and add simpler toggle activation to header
* Make nav color match Sphinx
* Make --primary-color the red accent from Sphinx
* Take swag at other colors so they don't clash too much
* Hide the TOC sync button as it just confused people (me)

Signed-off-by: Bill Mills <[email protected]>
These Doxyfile settings will override / add to the ones in the
submodules.

* Use TOC tree on Left side (sidebar only style)
* Style with doxygen-awesome-css
* Style with openamp defs for awesome

Signed-off-by: Bill Mills <[email protected]>
This layout file is the built-in default for doxygen 1.9.1
It can be generated via the command:
$ doxygen -l

Check it in as is and then configure to use it.
There should be no difference in the output yet
(assuming that you are using doxygen 1.9.1 or similar).

Don't blame me for the trailing white space.
This is how stock doxygen had it.

Signed-off-by: Bill Mills <[email protected]>
In the navigation side bar, add a link to the main OpenAMP docs level.

I would really like this to go _before_ the library title but I don't
see a way to easily do that right now.

Signed-off-by: Bill Mills <[email protected]>
In the Sphinx docs the logo is a clickable link to the top level.
Make this true for the Doxygen content also.

Right now the Doxygen logo does not provide hover feedback like the
Sphinx level does.  I assume this can be fixed with more CSS tweaks.

Signed-off-by: Bill Mills <[email protected]>
* Use same Logo and background
* Make it look similar when narrow (fix menu color)
* Make version more visible.
* Give some red accents in the nav bar
* Make the RTD version header red

Signed-off-by: Bill Mills <[email protected]>
Use the Read the Docs  assigned version name for Doxygen.
Also for both Doxygen and Sphinx use an intentionally different
version name by default.

Signed-off-by: Bill Mills <[email protected]>
@wmamills
Copy link
Collaborator Author

@nathalie-ckc @tammyleino Can I get a 2nd approval from one of you?
Again I would like to get this in as the baseline and we can take further improvements

Now that all the supporting PRs are in I have rebased and pushed again.
The doc's built above are basicly what we will have.
Here is the link just to make it easy:
https://openamp--26.org.readthedocs.build/en/26/

Issue #27 has the todo list.
Issue #28 has one todo item that is bigger.

Feel free to add more issues or edit #27 to add small items.

Copy link
Collaborator

@nathalie-ckc nathalie-ckc left a comment

Choose a reason for hiding this comment

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

Approving based on clicking through the preview at https://openamp--26.org.readthedocs.build/en/26/

@wmamills wmamills merged commit 6624802 into OpenAMP:main Oct 18, 2023
1 check passed
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.

4 participants