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 Bootstrap to 2.3.2 #1669

Merged
merged 8 commits into from Aug 20, 2014
Merged

Upgrade Bootstrap to 2.3.2 #1669

merged 8 commits into from Aug 20, 2014

Conversation

@fofr
Copy link
Contributor

@fofr fofr commented Aug 15, 2014

  • Move from Bootstrap 2.0.3 to the latest version of Bootstrap 2, 2.3.2
  • Use a gem to provide assets as well as Bootstrap mixins and variables
  • Remove old bootstrap assets
  • Customise Bootstrap by downsizing the default font size and padding to match what was there before
  • Simplify govspeak styles and add styles to cope with new h3 default margins and font-size
  • Remove list-inline patch, it comes with Bootstrap 2.3.2

When reviewing this PR, I highly recommend running the branch on a VM and doing many like-for-like comparisons with preview. Everything should look and behave the same. With the exception that page headers are slightly larger now.

screen shot 2014-08-15 at 15 47 07

fofr added 7 commits Aug 14, 2014
* Delete old Bootstrap js and css assets
* Use Bootstrap SASS gem to load assets and to give access to SASS
variables and mixins
* Bootstrap changelog: https://github.com/twbs/bootstrap/releases
* Doesn’t address oversized headers
* Remove font-size declaration, was compiling to invalid CSS
* The background is already white
* The width doesn’t need to be constrained
* The pre styles aren’t being used, and it’s grey by default
* Remove the link cursor styles and add an href to the links themselves
(Bootstrap 2.3.2 defaults a target to the value of a link’s href)
* Bootstrap 2.3.2 has larger headings, scale them back for govspeak so
the aesthetics stay the same
* 2.0.3 missed the `inline` feature so it was patched in, this patch
can be removed now
* Large buttons are a bit bigger, this more specific version needs to
match that
* Link to guidance about 2.3.2, especially the fluid grid
@vinayvinay
Copy link
Contributor

@vinayvinay vinayvinay commented Aug 18, 2014

@fofr: not sure if you intended to increase the margin below links on the Dashboard:
screen shot 2014-08-18 at 12 00 34

@vinayvinay
Copy link
Contributor

@vinayvinay vinayvinay commented Aug 18, 2014

@fofr: rest all looks good, i did a like-for-like comparison with Preview for 5-6 different views. 👍

* Bootstrap 2.3.2 adds a default margin to h3s
* In this case it’s undesirable, styles now match 2.0.3
@fofr
Copy link
Contributor Author

@fofr fofr commented Aug 19, 2014

@vinayvinay Margins fixed in c0d3404

@bishboria
Copy link
Contributor

@bishboria bishboria commented Aug 19, 2014

@vinayvinay @fofr checked it, 👍

fofr added a commit that referenced this pull request Aug 20, 2014
Upgrade Bootstrap to 2.3.2
@fofr fofr merged commit ece5e82 into master Aug 20, 2014
1 check passed
1 check passed
default Build #3888 succeeded on Jenkins
Details
@fofr fofr deleted the bootstrap-upgrade branch Aug 20, 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

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