Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

Moving to bootstrap 4 #1021

Merged
merged 3 commits into from
Apr 10, 2018
Merged

Moving to bootstrap 4 #1021

merged 3 commits into from
Apr 10, 2018

Conversation

paganotoni
Copy link
Member

solves #1014

@markbates markbates added this to the 0.11.1 milestone Apr 10, 2018
markbates
markbates suggested changes Apr 10, 2018
View reviewed changes
Copy link
Member

@markbates markbates left a comment

Choose a reason for hiding this comment

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

When reviewing this PR I think I found an issue. It looks like we're importing the Bootstrap CSS twice.

https://github.com/gobuffalo/buffalo/pull/1021/files#diff-431e2f25341023a80a4d77be77777da3R5
https://github.com/gobuffalo/buffalo/pull/1021/files#diff-5465b6808a8fe2c782a2aa842d58b255R11

Am I right? If so, we should probably fix it. :)

@paganotoni
Copy link
Member Author

Unless those conditions are not working correctly I think it's ok.

One of those is for webpack :
https://github.com/gobuffalo/buffalo/pull/1021/files#diff-431e2f25341023a80a4d77be77777da3R5

And the other one is when the app doesn't use webpack.
https://github.com/gobuffalo/buffalo/pull/1021/files#diff-5465b6808a8fe2c782a2aa842d58b255R11

@markbates
Copy link
Member

@paganotoni lol! of course! never mind. :)

@markbates markbates merged commit 9eaf8f9 into development Apr 10, 2018
@markbates markbates deleted the task/moving-to-bootstrap4 branch April 10, 2018 21:47
@paganotoni paganotoni mentioned this pull request Apr 11, 2018
Closed
stanislas-m pushed a commit that referenced this pull request May 12, 2018
@paganotoni @stanislas-m
Moving to bootstrap 4 (#1021)
2ab4654 
* moving to bootstrap 4

* fixed generated show page
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@markbates markbates markbates approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.12.0
Development

Successfully merging this pull request may close these issues.
2 participants
@paganotoni @markbates