swcarpentry / collaborative-lesson-development

10 Simple Rules paper on collaborative lesson development
https://arxiv.org/abs/1707.02662
Other
22 stars 6 forks source link

Fig1 as pdf + tuning it #35

Closed twitwi closed 7 years ago

twitwi commented 7 years ago

I made this PR on top of gvwilson/for-submission for my own convenience.

The core commit is https://github.com/swcarpentry/collaborative-lesson-development/commit/2dafe68acfd0216eec638c3aa538fa7f20fe621d

Which is a tentative improvements of fig1

twitwi commented 7 years ago

NB: the .png file is outdated, the paper uses the .pdf

gvwilson commented 7 years ago

There are lot of diffs now - is this worth rebasing?

raynamharris commented 7 years ago

@twitwi It looks like we both made changes to an older version of figure 1, so now your and my newest commits (https://github.com/swcarpentry/collaborative-lesson-development/pull/37) are in conflict.

In this conflict, I add some white space and I changed the image for the link to other resources. I do really the like direction sign, but let me know if you like the hyperlink image, since now the working of the rule is "link to other resources" rather than "point to other resources".

twitwi commented 7 years ago

Sorry, I didn't know you worked on the figure. I'm closing this.