Skip to content

Publish internal changes (and footer)#389

Merged
jaclyn-taroni merged 10 commits into
masterfrom
publish-internal-changes
Dec 1, 2020
Merged

Publish internal changes (and footer)#389
jaclyn-taroni merged 10 commits into
masterfrom
publish-internal-changes

Conversation

@cansavvy

@cansavvy cansavvy commented Dec 1, 2020

Copy link
Copy Markdown
Contributor

Changes Being Published

I've separated out the internal changes from the original #383 (plus a PR that has basic changes to the footer since I wasn't sure where else that should fit).

I got this branch together by checking out master, and cherry picking all these commits.

List of Commits/PR's Included

Link to html Preview

For reviewing purposes, you can take a browse through htmlpreview: http://htmlpreview.github.io/?https://github.com/AlexsLemonade/refinebio-examples/gh-pages-stages/01-getting-started/getting-started.html

cansavvy and others added 9 commits December 1, 2020 11:47
* Add some rough draft issue templates

* Incorporate cbethell review

* Get rid of `Other` labels that aren't useful
* Mechanics for CSS file and navbar add feedback URL (#303)

* Adding in some style with css

* Use css magic

* Try making the navbar blue

* Add survey link

* Make font smaller

* Need a comma

* Change to normalizePath

* normalizepath separate step references.bib

* Move references.bib to component folder

* Made ccs modifications, added logo file

Made changes to css/navbar.html
Tried to add the logo but it but it cuts out and not sure how to make it decent.

* Resolve render-notebooks.R conflict

* Remove testing html from file diff

* uncommented mobile nav

Co-authored-by: dvenprasad <dv.prasad991@gmail.com>

* Update microarray and RNAseq overview figures

- add context re figures
- change .jpg to .png for consistency

* Revert "Mechanics for CSS file and navbar add feedback URL (#303)"

This reverts commit 8b81fdd.

* update links to diagrams

* @dvenprasad updated figure spacing

* add the right updated figure

* replace section of link to figures with updated commit id

* incorporate @cansavvy's suggested changes

Co-authored-by: Candace Savonen <cansav09@gmail.com>
Co-authored-by: dvenprasad <dv.prasad991@gmail.com>
* It works!

* Add feedback url

* Mechanics for CSS file and navbar add feedback URL (#303)

* Adding in some style with css

* Use css magic

* Try making the navbar blue

* Add survey link

* Make font smaller

* Need a comma

* Change to normalizePath

* normalizepath separate step references.bib

* Move references.bib to component folder

* Made ccs modifications, added logo file

Made changes to css/navbar.html
Tried to add the logo but it but it cuts out and not sure how to make it decent.

* Resolve render-notebooks.R conflict

* Remove testing html from file diff

* uncommented mobile nav

Co-authored-by: dvenprasad <dv.prasad991@gmail.com>

* Make the footer retrieve step consistent with others

Co-authored-by: dvenprasad <dv.prasad991@gmail.com>
…t up (#313)

* Updating contributing with info about staging branch

* Mechanics for CSS file and navbar add feedback URL (#303)

* Adding in some style with css

* Use css magic

* Try making the navbar blue

* Add survey link

* Make font smaller

* Need a comma

* Change to normalizePath

* normalizepath separate step references.bib

* Move references.bib to component folder

* Made ccs modifications, added logo file

Made changes to css/navbar.html
Tried to add the logo but it but it cuts out and not sure how to make it decent.

* Resolve render-notebooks.R conflict

* Remove testing html from file diff

* uncommented mobile nav

Co-authored-by: dvenprasad <dv.prasad991@gmail.com>

* Add more details to CONTRIBUTING about cherry picks and etc

* Add bit about html preview

* Incorporate Josh comment and drop log.log

* Add bit about a hotfixes to staging PRs

* Incorporate jashapiro feedback

* Incorporate a few more bits of jashapiro feedback

* Update doctoc

* Make pull requests section H2

* Incorporate jashapiro suggestion to be make more specific branch names

* Meh, we don't need <>

* Change to use "publish" instead of "live"

* Re DocToc

* Add a bit more direction about PR base branches

* Adjust links

* Missed one link

Co-authored-by: dvenprasad <dv.prasad991@gmail.com>
* Add basic templates

* make it live PR template

* Add html preview

* Add one more "other" template

* Minor edit

* Polish up some things. Add "PR stage"

* Minor edits

* Implement cbethell review
* Get rid of headers and try a "main PR" thing.

* Rearrange order

* Links don't work per se

* Try href strategy?

* Update .github/PULL_REQUEST_TEMPLATE.md

Co-authored-by: Chante Bethell  <43576623+cbethell@users.noreply.github.com>

Co-authored-by: Chante Bethell  <43576623+cbethell@users.noreply.github.com>
* Updating contributing with info about staging branch

* Mechanics for CSS file and navbar add feedback URL (#303)

* Adding in some style with css

* Use css magic

* Try making the navbar blue

* Add survey link

* Make font smaller

* Need a comma

* Change to normalizePath

* normalizepath separate step references.bib

* Move references.bib to component folder

* Made ccs modifications, added logo file

Made changes to css/navbar.html
Tried to add the logo but it but it cuts out and not sure how to make it decent.

* Resolve render-notebooks.R conflict

* Remove testing html from file diff

* uncommented mobile nav

Co-authored-by: dvenprasad <dv.prasad991@gmail.com>

* Add more details to CONTRIBUTING about cherry picks and etc

* Add bit about html preview

* Incorporate Josh comment and drop log.log

* Add bit about a hotfixes to staging PRs

* Incorporate jashapiro feedback

* Incorporate a few more bits of jashapiro feedback

* Add the PR diagrams

* Add diagrams and some words about them to CONTRIBUTING.md

* Couple minor edits

* Update doctoc

* Make pull requests section H2

* Incorporate jashapiro suggestion to be make more specific branch names

* Meh, we don't need <>

* Change to use "publish" instead of "live"

* Update diagrams to say "publish"

* re doctoc

* Some polishing of wording

* Make robot emoji a png so it renders

* Update commit ids

* A little more words

* Make headlnes more parallel

* Couple little updates

* A couple more polishing items

* Turn ⚠️ into ❌ in diagrams

* Update all img commit ids

* Address comments from @cbethell 's review

* One little wording update

Co-authored-by: dvenprasad <dv.prasad991@gmail.com>
* Make the "Other" PR template the default

* Use jashapiro's wording suggestions
@cansavvy cansavvy marked this pull request as ready for review December 1, 2020 16:59
@cansavvy cansavvy changed the title Publish internal changes Publish internal changes (and footer) Dec 1, 2020
@cansavvy cansavvy mentioned this pull request Dec 1, 2020
2 tasks
@cansavvy cansavvy requested a review from jashapiro December 1, 2020 16:59

@jashapiro jashapiro left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me. The only question I have is what is 01-getting-started/getting-started.html.zip doing there? It seems to still be in the current staging branch, but why?

@cansavvy

cansavvy commented Dec 1, 2020

Copy link
Copy Markdown
Contributor Author

At some point when I was trying to give people previews on html stuff it snuck in there. Will remove it.

@jashapiro jashapiro left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍🏼

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants