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

Make application CSS/JS extend header_footer_only CSS/JS #461

Merged
merged 1 commit into from
Sep 18, 2014
Merged

Make application CSS/JS extend header_footer_only CSS/JS #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
//= require header-footer-only

//= require libs/jquery/jquery-ui-1.8.16.custom.min
//= require libs/jquery/plugins/jquery.base64
//= require libs/jquery/plugins/jquery.player.min
//= require libs/suchi/isOld.js
//= require govuk_toolkit
//= require user-satisfaction-survey
//= require core
//= require report-a-problem
//= require geo-locator
//= require jquery.history
//= require jquery.tabs
//= require mobile
//= require browser-check
//= require analytics
//= require vendor/polyfills/bind
//= require govuk/selection-buttons
13 changes: 2 additions & 11 deletions app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
/* govuk_frontend_toolkit includes */
@import "colours";
@import "conditionals";
@import "css3";
@import "device-pixels";
@import "grid_layout";
@import "measurements";
@import "typography";
@import "header-footer-only";

@import "shims";
@import "design-patterns/buttons";

/* local styleguide includes */
@import "styleguide/conditionals2";

/* styles */
@import "helpers/alpha-label";
@import "helpers/buttons";
@import "helpers/core";
@import "helpers/ancillary-pages";
@import "helpers/beta-label";
@import "helpers/footer";
@import "helpers/header";
@import "helpers/multi-step";
@import "helpers/notifications";
@import "helpers/organisations";
@import "helpers/publisher";
@import "helpers/report-a-problem";
@import "helpers/text";
@import "govuk-component/component";

@import "static-pages/error-pages";