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

Support for new Bootstrap4 alpha5 markup #660

Closed
wants to merge 6 commits into from

Conversation

darklow
Copy link

@darklow darklow commented Dec 2, 2016

I haven't checked 100% all bootstrap markup yet, but 4x main changes I mentioned in my issue #658 post are ready. Let's me know what you think. We can also discuss checkbox double label issue before closing PR.

@codecov-io
Copy link

codecov-io commented Dec 2, 2016

Current coverage is 95.28% (diff: 93.47%)

Merging #660 into dev will increase coverage by 0.01%

@@                dev       #660   diff @@
==========================================
  Files            24         24          
  Lines          2557       2588    +31   
  Methods           0          0          
  Messages          0          0          
  Branches        227        236     +9   
==========================================
+ Hits           2436       2466    +30   
  Misses           74         74          
- Partials         47         48     +1   

Powered by Codecov. Last update 18c3d43...dacdf7c

@darklow darklow changed the title Support for new Bootstrap4 alpha5 markup. Issue #658 Support for new Bootstrap4 alpha5 markup Dec 2, 2016
@darklow
Copy link
Author

darklow commented Dec 2, 2016

I do not feel confident of this conditional check that I needed to add to few templates:

<div class="form-group{% if not form_class or 'form-inline' not in form_class %} row{% endif %}">

Thing is - for inline forms we need just .form-group class, but for non-inline forms we need to use it together with .row and currently only difference is in form_class variable. Let me know if you want me to add template filter maybe or even global context variable {{ has_inline_class }}?

form-group {%if form_class|has_inline_class %}...

@darklow
Copy link
Author

darklow commented Dec 2, 2016

I will add some more markup updates in nearest time, do not accept PR yet.

@zoidyzoidzoid
Copy link
Contributor

@darklow Thanks for this PR. I'll take a look at it this week.

@auvipy
Copy link

auvipy commented Jan 22, 2017

alphha6 is released http://blog.getbootstrap.com/2017/01/06/bootstrap-4-alpha-6/ next is beta1 could you update the pr with that?

@carltongibson
Copy link
Collaborator

@darklow Any chance you could update this to latest dev? Thanks!

@carltongibson
Copy link
Collaborator

Also, can you look at #676? — it's only a one liner so could easily be handled here. (Maybe it already is?)

Thanks.

@darklow
Copy link
Author

darklow commented Mar 15, 2017

I think we should wait BS4 final, it just too much refactoring on each new alpha. In the meanwhile feel free to copy edited templates from this PR to your own template directory and adjust if needed.

@zoidyzoidzoid
Copy link
Contributor

Definitely a bunch of work to keep up with bootstrap v4 alpha/beta. And now there are conflicts. Hopefully will get to take a look at this properly in the next month or two.

@carltongibson
Copy link
Collaborator

See #732: I've asked for help finalising Bootstrap 4 support, and we'll do a new release in the autumn before Django 2.0, or sooner if we get lots of input.

BS4 is now "Beta" and should be stable enough. If this PR can be updated for that we'd be glad to have it! Ta!

@zoidyzoidzoid
Copy link
Contributor

I've put these changes into my PR: #735

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.

None yet

5 participants