concord-consortium / lab-interactives-site

Set of interactives built using the Lab Framework from the Concord Consortium
lab.concord.org
Other
14 stars 28 forks source link

Revert 2 rishiloyola patch 2 #23

Closed rishiloyola closed 9 years ago

ddamelin commented 9 years ago

Rishi. Thanks for doing this. I'm on vacation this week, but I will try to check in on this soon, and likely ask for a new change on another interactive.

ddamelin commented 9 years ago

The initial work looks good. In the future it would be better to name the branch something related to the work or interactive name. I'm a bit confused by the "merge pull request" commits. On your own repo you can merge branches without having to issue pull requests. To keep your branch up to date you can sync the master branch with our upstream master, then rebase your branch with your master.

For now I have some other requests for changes on this interactive, so you can keep working in this branch, and resubmit the pull request to get the new features in.

Other changes would be:

Here is a visual diagram of some of the suggested changes.

ddamelin commented 9 years ago

Looks like this change has been incorporated into the other pull request that has been merged.