-
Notifications
You must be signed in to change notification settings - Fork 100
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
Fixing CSS for Javadocs #2415
Fixing CSS for Javadocs #2415
Conversation
Looks correct to me |
This will need merged hflynn#1 before the changes make it to the builds. |
Rework the menu spacing
Sorry, completely forgot about that yesterday, I didn't get an email notification. Merged now! |
The URL to look at is http://ci.openmicroscopy.org/job/OMERO-5.0-merge-ice34/ (or any other Ice version). There it looks less broken than it used to (although the menu is still weird - occupying two rows): I'm a bit surprised to see that the parent job has the Javadoc still broken (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/javadoc/?): In general, this looks like requiring some investigation. If the strange rendering is Jenkins' fault, then this can be merged as-is. |
Problem is the two jobs are running different version of javadoc so the HTML they produce is different. Now broken with this PR: There are lots of differences in the html it has produced. This could be why the menu stopped working in the first place. |
Oh the reason for the menu layout is each page has between 2 and 4 menus depending how deep into the docs you are. |
It seems that javadoc does not have a separate version. It simply has the same version as that of the java compiler. You can get it using |
@qidane I think it's fair to expect the created Javadoc looking fine on Java 1.6 and up. Maybe there is some common, simpler CSS which would work in both cases? |
The html for the 1.6 java is not good. It looks to be invalid and missing end tags so getting the styling to work is a pain. |
Combined style for v1.6 and v1.7 of javadocs
@bpindelski Unfortunately not a simpler CSS, this is a nasty combination of the two that I tweaked to not interfere with each other. There are a couple of limitations but both I think look ok. |
@qidane All looks good now. Javadoc renders nicely. Good to merge. Question to @sbesson : I noticed that http://ci.openmicroscopy.org/job/OMERO-5.0-merge-ice35/ doesn't build the Javadocs. Is that intentional? |
--rebased-to #2453 |
@bpindelski: looking at the job, the Javadoc is produced by the build target (see http://ci.openmicroscopy.org/job/OMERO-5.0-merge-ice35/ws/src/dist/docs/api/index.html) but is not published via the Javadoc step. No intentional skip here. I re-added the Javadoc publishing step. |
@sbesson Thanks 👍 |
This should fix the formatting on http://ci.openmicroscopy.org/job/OMERO-5.0-latest-ice33/javadoc/