Skip to content

Commit

Permalink
Make application CSS/JS extend header_footer_only CSS/JS
Browse files Browse the repository at this point in the history
All of the CSS/JS modules included in the application 'layout' are
also included in header_footer_only - and only those modules - so
this makes application share exactly those modules by importing
header footer only.

This helps avoid bugs like #458

Also by treating each layout as an extension of an existing layout,
layering new features on top, then we can easily add new kinds
of layout in the future.
  • Loading branch information
David Singleton committed Sep 16, 2014
1 parent 98cf059 commit bf460d9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
9 changes: 2 additions & 7 deletions app/assets/javascripts/application.js
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
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";

0 comments on commit bf460d9

Please sign in to comment.