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.

Sign up for GitHub

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

Jump to bottom

Use bootstrap CSS classes where possible #73

Merged
merged 33 commits into from
May 28, 2014
Merged

Use bootstrap CSS classes where possible #73

merged 33 commits into from
May 28, 2014

Conversation

rolandgeider
Copy link
Member

Use the bootstrap CSS classes and components where possible, removing as many external plugins and files as possible.

@rolandgeider
Use bootstrap where possible, reducing the number of CSS and JS files
639c178
@rolandgeider
Further integration of bootstrap
11788e8
@rolandgeider
Further integration of bootstrap
e602941
@rolandgeider
Further integration of bootstrap
5c933a6
@rolandgeider
Replace tabs and other navigation items from jQueryUI with bootstrap
b3640ee
@rolandgeider
Replace jqueryUI's modal dialog with bootstrap's
edf5c86
@rolandgeider
Update jqueryUI files, removing unecessary plugins
d4125fe
@rolandgeider
Set default button class
eee20e6
@rolandgeider
Update the pagination CSS classes
e5e7b34
@rolandgeider
Fix some pep8 formatting errors and the schedule test
5fec491
@rolandgeider
Align the browserID login button with the regular login form
5735faf
@rolandgeider
Fix javascript variable initialisation
c679136
@rolandgeider
Fix alignment of software version and footer padding
492e43e
@rolandgeider
Remove update of preferences about ingredients in English via AJAX
45154d8
@rolandgeider
Add custom styles for bootstrap's btn-custom
de4ed1c
@rolandgeider
Re-add warnings if there are no categories in the exercise overview
766ae03
@rolandgeider
Sort exercises by name in the overview
348e33b
@rolandgeider
Refactor the form rendering tag filters to use bootstrap CSS
3ebf411 
--HG--
rename : wger/manager/templates/mobile/tags/yaml_form_element.html => wger/manager/templates/mobile/tags/render_form_element.html
rename : wger/manager/templates/tags/yaml_form_element.html => wger/manager/templates/tags/render_form_element.html
@rolandgeider rolandgeider added this to the 1.5 milestone May 25, 2014
@rolandgeider rolandgeider self-assigned this May 25, 2014
@rolandgeider
Also check if input field is a file upload
2f82f94
@rolandgeider
Fix positioning error of contact buttons in chrome
8e4eb9a 
This isn't really right aligned anymore, but it doesn't really need to
be, it stands enough to the side
@rolandgeider
Fix link formatting on hover and focus
de444ce 
--HG--
extra : amend_source : cc49c9db232e1ad3019119a0c85978f6df6c1884
@rolandgeider
Update screenshots and sample PDFs
93287a3
@rolandgeider
Use correct CSS class for dimmed text
3a93e55
rolandgeider pushed a commit that referenced this pull request May 28, 2014
Merge pull request #73 from rolandgeider/bootstrap
6576514 
Use bootstrap CSS classes where possible
@rolandgeider rolandgeider merged commit 6576514 into master May 28, 2014
@rolandgeider rolandgeider deleted the bootstrap branch May 28, 2014 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rolandgeider rolandgeider

Labels
None yet
Projects
None yet
Milestone
1.5
Development

Successfully merging this pull request may close these issues.
1 participant
@rolandgeider