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

Upgrade to Bootstrap 3.3 #320

Merged
merged 3 commits into from Dec 4, 2014
Merged

Upgrade to Bootstrap 3.3 #320

merged 3 commits into from Dec 4, 2014

Conversation

@fofr
Copy link
Contributor

@fofr fofr commented Nov 28, 2014

  • Bump admin gem to pick up Bootstrap 3.3 (see alphagov/govuk_admin_template#53)
  • Also update important note styles to the abstracted version now provided by gem

For testing, everything on this branch should look and behave as it did before.

@benilovj
Copy link
Contributor

@benilovj benilovj commented Dec 4, 2014

@fofr this needs a rebase

fofr added 3 commits Nov 27, 2014
* Important note styles abstracted and moved to admin gem
* Remove old styles and update class names
The divider isn’t necessary when the filters and table have borders.
@fofr fofr force-pushed the upgrade-bootstrap branch from 1388d0b to 8fcf800 Dec 4, 2014
@fofr
Copy link
Contributor Author

@fofr fofr commented Dec 4, 2014

@benilovj Rebased

@benilovj
Copy link
Contributor

@benilovj benilovj commented Dec 4, 2014

Looks good 👍

benilovj added a commit that referenced this pull request Dec 4, 2014
@benilovj benilovj merged commit 826fd67 into master Dec 4, 2014
1 check passed
1 check passed
default "Build #505 succeeded on Jenkins"
Details
@benilovj benilovj deleted the upgrade-bootstrap branch Dec 4, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.