Skip to content

updating to bootstrap 3.2.0 #1873

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

Closed
wants to merge 15 commits into from
Closed

updating to bootstrap 3.2.0 #1873

wants to merge 15 commits into from

Conversation

dryan
Copy link

@dryan dryan commented Sep 14, 2014

Made the changes to get the browseable API into Bootstrap 3.

Addresses #1085

@tomchristie
Copy link
Member

Be good to get before and after screenshots of this in order to review. Also note the failing tests.

</ul>
</div>
<ul class="dropdown-menu">
<li>{% optional_logout request %}</li>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Most of the failing tests are here:

django.template.base.TemplateSyntaxError: 'optional_logout' did not receive value(s) for the argument(s): 'user'

optional_logout needs the user parameter:

{% optional_logout request user %}

If you can fix that we can see what's left.

@dryan
Copy link
Author

dryan commented Sep 15, 2014

Got the tests passing and did some additional cleanup. Screenshots below.

Root Before:
screenshot 2014-09-15 11 02 19

Root After:
screenshot 2014-09-15 11 17 29

List Before:
screenshot 2014-09-15 11 02 36

List After:
screenshot 2014-09-15 11 18 03

Form Before:
screenshot 2014-09-15 11 03 07

Form After:
screenshot 2014-09-15 11 08 27

@tomchristie
Copy link
Member

Great thanks! Looks like the forms need the horizontal style applied, otherwise nice.

@dryan
Copy link
Author

dryan commented Sep 15, 2014

they've still got form-horizontal, but that doesn't do much in BS3. I can put in the grid classes.

@tomchristie
Copy link
Member

This'd be what we want, no?... http://getbootstrap.com/css/#forms-horizontal

screen shot 2014-09-15 at 16 49 04

@dryan
Copy link
Author

dryan commented Sep 15, 2014

Ya, but in BS2 you could leave it at that basically. Now you have to add column classes to the label and inputs.

@tomchristie
Copy link
Member

Want to sling up a screenshot of the latest form styling?
Do you think this is good to go now?

@carltongibson
Copy link
Collaborator

@tomchristie — I'll have a look at this today.

@carltongibson
Copy link
Collaborator

I've had a look and would say there are a couple of alignment issues still to fix.

The main "HTML Form" looks good to go:
screenshot 2014-09-19 15 46 59

BUT the "Raw" form is misaligned:

screenshot 2014-09-19 15 45 56

The log in form also needs so love:

screenshot 2014-09-19 15 46 06

Beyond that, @dryan is there anything you see as still to do?

@jpadilla
Copy link
Member

@dryan I'm able to pick this up if you need help.

@tomchristie
Copy link
Member

The bootstrap 3 update is addressed in v3.
Somewhat considering dropping this 2.x one, as it'll add a bunch of extra merge work for little benefit.

@jpadilla
Copy link
Member

@tomchristie dropping this one definitely makes sense if it's already done on v3.

@dryan
Copy link
Author

dryan commented Oct 20, 2014

@tomchristie yes if this is coming on v3, no need to worry about it here.

@dryan dryan closed this Oct 20, 2014
@tomchristie tomchristie modified the milestones: 3.0 Release, 2.4.4 Release Nov 3, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants