Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add bower.json overrides for bootstrap (#338) #349

Merged
merged 1 commit into from
Jun 23, 2015

Conversation

jaromero
Copy link
Contributor

This addresses #338 as an alternative to ecf4928 by populating bower.json with either of these, depending on whether sass is selected or not, thus allowing us to keep bootstrap up-to-date.

"overrides":
  "bootstrap-sass": {
    "main": [
      "assets/stylesheets/_bootstrap.scss",
      "assets/fonts/bootstrap/*",
      "assets/javascripts/bootstrap.js"
    ]
  }
}
"overrides":
  "bootstrap": {
    "main": [
      "less/bootstrap.less",
      "dist/css/bootstrap.css",
      "dist/js/bootstrap.js",
      "dist/fonts/*"
    ]
  }
}

I could not figure out a way to test the actual result of the fonts task, so the test just checks whether the font paths are present in bower.json.

This should be a temporary measure until this issue is resolved and bootstrap also updates accordingly.

@silvenon
Copy link
Member

It works! Could you just update Bootstrap dependencies to ~3.3.5? (And squash it into this commit.)

Revert commit ecf4928 (Lock Bootstrap to v3.3.4)

Add bower.json overrides for bootstrap (yeoman#338)

Add test for bootstrap's bower.json overrides

Update bootstrap to v3.3.5
@jaromero jaromero force-pushed the use-overrides-with-bs-335 branch from 196e745 to c6d3bdf Compare June 23, 2015 19:28
@jaromero
Copy link
Contributor Author

Done, and done.

@silvenon
Copy link
Member

Awesome! Thanks 👍

silvenon added a commit that referenced this pull request Jun 23, 2015
Add bower.json overrides for bootstrap (#338)
@silvenon silvenon merged commit c3903f9 into yeoman:master Jun 23, 2015
@jaromero jaromero deleted the use-overrides-with-bs-335 branch June 23, 2015 20:12
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.

2 participants