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 #288

Merged
merged 7 commits into from May 28, 2014
Merged

Switch to using govuk_admin_template #288

merged 7 commits into from May 28, 2014

Conversation

@fofr
Copy link
Contributor

@fofr fofr commented May 23, 2014

  • Use styles, templates and JavaScript provided by gem
  • Delete styles, templates and JavaScript that have been ported
  • Rename GOVUK to GOVUKAdmin in JavaScript to match gem
  • Remove bootstrap and jquery-rails dependencies, now served through gem
  • Create a new transition_theme stylesheet for variables not appropriate for gem
  • Put tag styles into their own component stylesheet
  • Mount gem's /style-guide route
@jamiecobbett
Copy link
Contributor

@jamiecobbett jamiecobbett commented May 23, 2014

LGTM. Needs rebasing to be mergeable.

@fofr
Copy link
Contributor Author

@fofr fofr commented May 23, 2014

Rebased.

Paul Hayes added 7 commits May 14, 2014
* Delete styles now coming from gem
  * Put back some styles not appropriate for gem
* Setup content blocks for main template
* Remove bootstrap from gemfile
* Remove from base and put into separate stylesheet
* Delete modules and framework files and specs that have been moved to
gem
* Rename GOVUK to GOVUKAdmin for existing modules
* Leave non-modules as GOVUK for now
* Specify compiled gem javascript file so that bootstrap and jquery,
along with framework are available for tests
* Override select2 styles with greater specificity
* The admin gem refactor had changed source order, and added
specificity was necessary to keep the little close icon blue
jamiecobbett added a commit that referenced this pull request May 28, 2014
Switch to using govuk_admin_template
@jamiecobbett jamiecobbett merged commit af8fa8c into master May 28, 2014
1 check passed
1 check passed
@govuk-ci
default "Build #669 succeeded on Jenkins"
Details
@jamiecobbett jamiecobbett deleted the with-admin-gem branch May 28, 2014
@fofr
Copy link
Contributor Author

@fofr fofr commented May 28, 2014

💞

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants