Skip to content
This repository has been archived by the owner on Jan 3, 2018. It is now read-only.

Use unified CSS files from site #140

Closed
wants to merge 1 commit into from

Conversation

jpallen
Copy link
Contributor

@jpallen jpallen commented Jan 23, 2015

This goes with jpallen/site#c40071f, and is a proof of concept that lesson can
share the same CSS as site. I haven't looked at merging slideshow.css yet
though. This commit brings the CSS here up to date with the at site (if
c40071f is merged) although doesn't address how we'll keep these in sync in
future.

This goes with jpallen/site#c40071f, and is a proof of concept that lesson can
share the same CSS as site. I haven't looked at merging slideshow.css yet
though.  This commit brings the CSS here up to date with the at site (if
c40071f is merged) although doesn't address how we'll keep these in sync in
future.
@jpallen
Copy link
Contributor Author

jpallen commented Jan 23, 2015

The PR to get these CSS changes into site are in swcarpentry/DEPRECATED-site#751

@rgaiacs
Copy link
Contributor

rgaiacs commented Jan 24, 2015

@jpallen Thanks for this pull request. Could you split this pull request in two? One with

  • _includes/header.html
  • _layouts/page.html
  • css/badge.css
  • css/bootstrap/img/glyphicons-halflings-white.png
  • css/bootstrap/img/glyphicons-halflings.png
  • css/lesson.css
  • css/local-fonts/zhcz-_WihjSQC0oHJ9TCYBsxEYwM7FgeyaSgU71cLG0.woff
  • css/swc-bootstrap.css
  • css/swc-workshop-and-lesson.css
  • css/swc.css

that needs to be merge into core and the another one with

  • 01-one.html
  • 02-two.html
  • LICENSE.html
  • discussion.html
  • index.html
  • instructors.html
  • reference.html

that needs to be merged into gh-pages. Later we will merge core into gh-pages.

@jpallen
Copy link
Contributor Author

jpallen commented Jan 24, 2015

Yes, I can split it up. Note that changing either the CSS or HTML without changing the other will leaving the styling broken. Is it ok to have each PR be a breaking change, so long as they work together?

@gvwilson
Copy link
Contributor

I think so - I'm guessing Raniere wants it to be easier to cherry-pick
the CSS changes into another repo, but that's just a guess.

jpallen added a commit to jpallen/lesson-template that referenced this pull request Jan 26, 2015
As per swcarpentry#140, but only the core CSS
changes.
jpallen added a commit to jpallen/lesson-template that referenced this pull request Jan 26, 2015
As per swcarpentry#140, but with only the HTML changes
This was referenced Jan 26, 2015
@jpallen
Copy link
Contributor Author

jpallen commented Jan 26, 2015

@r-gaia-cs I've created the separate pull requests now.

@gvwilson
Copy link
Contributor

@r-gaia-cs if this looks good to you, please merge. (We'll worry about copying the CSS into 'core' later.)

@rgaiacs
Copy link
Contributor

rgaiacs commented Jan 27, 2015

I've created the separate pull requests now.

Thanks. I'm closing this issue since I will merge #141 and #142.

@rgaiacs rgaiacs closed this Jan 27, 2015
rgaiacs pushed a commit that referenced this pull request Jan 27, 2015
As per #140, but only the core CSS
changes.
jpallen added a commit to carpentries/styles that referenced this pull request Jan 28, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants