diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b9f6f0ec..11d25caa 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -51,7 +51,7 @@ Our central development branch is master. Coding is done on feature branches bas 3. Once the code is pushed, create a pull request: - - On your Github fork, select your branch and click “New pull request”. Select “master” as the base branch and your branch in the “compare” dropdown. + - On your GitHub fork, select your branch and click “New pull request”. Select “master” as the base branch and your branch in the “compare” dropdown. If the code is mergeable (you get a message saying “Able to merge”), go ahead and create the pull request. - Check back after some time to see if the Travis checks have passed, if not you should click on “Details” link on your PR thread at the right of “The Travis CI build failed”, which will take you to the dashboard for your PR. You will see what failed / stalled, and will need to resolve them. - If your checks have passed, your PR will be assigned a reviewer who will review your code and provide comments. Please address each review comment by pushing new commits to the same branch (the PR will automatically update, so you don’t need to submit a new one). Once you are done, comment below each review comment marking it as “Done”. Feel free to use the thread to have a discussion about comments that you don’t understand completely or don’t agree with. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0da31fa7..e2b4c6db 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,4 +2,4 @@ IMPORTANT NOTES (please read, then delete): * The PR title should start with "Fix #bugnum: " (if applicable), followed by a clear one-line present-tense summary of the changes introduced in the PR. For example: "Fix #bugnum: Introduce the first version of the collection editor.". -* Please make sure to mention "#bugnum" somewhere in the description of the PR. This enables Github to link the PR to the corresponding bug. \ No newline at end of file +* Please make sure to mention "#bugnum" somewhere in the description of the PR. This enables GitHub to link the PR to the corresponding bug. \ No newline at end of file diff --git a/frontend/src/components/home/homeBody/HomeShowcase.js b/frontend/src/components/home/homeBody/HomeShowcase.js index 33fbf745..edef550e 100644 --- a/frontend/src/components/home/homeBody/HomeShowcase.js +++ b/frontend/src/components/home/homeBody/HomeShowcase.js @@ -42,12 +42,8 @@ class HomeShowcase extends React.Component {
- - + +