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

Switch to using govuk_admin_template #105

Merged
merged 24 commits into from May 30, 2014
Merged

Switch to using govuk_admin_template #105

merged 24 commits into from May 30, 2014

Conversation

@fofr
Copy link
Contributor

@fofr fofr commented May 28, 2014

  • Upgrade from Bootstrap 2 to Bootstrap 3
  • Minor feature changes agreed with Lisa:
    • Remove the beta flag
    • Move bookmarked needs and browser tools to main navigation
    • Remove the feedback email from the bottom, which wasn't being used
  • Delete styles now available within the gem
  • Upgrade formtastic and formtastic bootstrap
  • Update Bootstrap html for alerts, buttons, icons, breadcrumbs, forms, grids
  • Functionality should be exactly the same

screen shot 2014-05-28 at 16 51 19

Paul Hayes added 21 commits May 23, 2014
* Move markup into content blocks
* The admin gem doesn’t yet deal with beta labels
* There isn’t yet a customisable footer, the feedback link isn’t
present yet, delete the failing test
* Reference gem styles from application.scss
* Create a new maslow_theme file for maslow specific variables
* Default (grey) buttons need two classes in Bootstrap 3
* Glyphicons can be any size or colour
* Simplifies CSS
Bootstrap 3 breadcrumbs don't need dividers
* Bootstrap 3 forms use new markup, we get this for free by upgrading
the form gems
* span classes are replaced with grid classes like “col-md-8”
* Custom controls weren’t updated with formtastic upgrade
* Used bootstrap input groups to tidy up remove buttons
* Use glyphicons when removing criteria
* Fix grid layouts and handle vertical spacing
* Breadcrumbs were being wrapped in <nav> twice
* Remove from random position on index page
* Highlight the main nav items when selected
* Tighter margins than page-header
* Extra ‘ was breaking the markup
* Remove unnecessary line break at foot of page
* Use bookmarklet style from admin gem
* Use `table-header` style provided by admin gem
* Simplify CSS, use margin helpers and bootstrap classes to achieve the
same styling
Paul Hayes
* Default alerts now need an alert class and a type, eg alert-warning
Paul Hayes
* Create another style guide controller within Maslow so it knows to
skip the authorisation checks
@bishboria
Copy link
Contributor

@bishboria bishboria commented May 29, 2014

Seems there is a problem with the modal forms for 'Close as a duplicate' and 'Out of scope' (need to be an admin to see the latter)

Paul Hayes added 3 commits May 30, 2014
* Needs a couple of new containers, modal-dialog and modal-content
* No longer needs the hide class on the container
* Add a modal-title class to the modal’s title
* Stop extending the grid, this includes % based widths, floats and
padding not suitable to form inputs
* Created a couple of new classes for specific widths
* Include formtastic-bootstrap and chosen CSS before maslow styles
(previously being included later which meant they needed higher
specificity)
* Override chosen styles to look like bootstrap input — box-shadow,
background, padding and border, using variables where possible
* Wrap in bootstrap grid to constrain width
* Tweak form-md-8 width to match a full-width input placed within a
col-md-8 grid
bishboria added a commit that referenced this pull request May 30, 2014
Switch to using govuk_admin_template
@bishboria bishboria merged commit 44c88a6 into master May 30, 2014
1 check passed
1 check passed
default "Build #64 succeeded on Jenkins"
Details
@bishboria bishboria deleted the with-admin-gem branch May 30, 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.