Skip to content

Set the documentation build to use viridis as the default colormap #2889

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

Merged
DPeterK merged 1 commit into from
Oct 31, 2017
Merged

Set the documentation build to use viridis as the default colormap #2889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,10 @@ script:
# affect any downstream functionality but causes the build to fail
# spuriously. The echo-backtick workaround gets around this error,
# which should be investigated further in the future.
- if [[ $TEST_TARGET == 'doctest' ]]; then
- >
Copy link
Member

@DPeterK DPeterK Oct 31, 2017

Choose a reason for hiding this comment

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

What does this add that we didn't have before?

Copy link
Member Author

@pelson pelson Oct 31, 2017

Choose a reason for hiding this comment

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

Tells yaml to go into multi-line mode, and prevents travis from going crazy from the newly added pipe line. Without it, travis can't even read the config file.

Copy link
Member

@QuLogic QuLogic Oct 31, 2017

Choose a reason for hiding this comment

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

Previously, everything was concatenated into one line, so theoretically, you could also drop the semicolons on every line here as well.

Copy link
Member Author

@pelson pelson Nov 1, 2017

Choose a reason for hiding this comment

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

Good to know. I'm tempted to do this once a few of the changes to the travis.yml have been merged.

if [[ $TEST_TARGET == 'doctest' ]]; then
cd $INSTALL_DIR/docs/iris;
echo 'image.cmap: viridis' > matplotlibrc;
echo `make clean html`;
make doctest;
fi
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/src/_templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
// Only use first 5 images
for (var i = 0; i < 5; i++) {
var img = images[i];
$ss.append('<a href="'+img[2]+'"><img src="'+img[1]+'" class="slideshowImage"/></a>');
$ss.append('<a href="'+img[2]+'" style="background-color: white;" ><img src="'+img[1]+'" class="slideshowImage"/></a>');
Copy link
Member

@DPeterK DPeterK Oct 31, 2017

Choose a reason for hiding this comment

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

While I understand what this is doing I don't understand why it's needed – I haven't seen a problem with the slideshow that should require such a CSS change...

Copy link
Member Author

@pelson pelson Oct 31, 2017

Choose a reason for hiding this comment

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

bad_background

I'm on Chrome for OSX 61.0.3163.100.

Visiting https://scitools-docs.github.io/iris/master/index.html.

Copy link
Member

@DPeterK DPeterK Oct 31, 2017

Choose a reason for hiding this comment

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

Ah – note the difference to http://scitools.org.uk/iris/docs/latest/index.html (where the above black bars never appear, so I'll not add an image!).

}

$ss.cycle({
Expand Down