Merge pull request #404 from alphagov/bump-template

Bump govuk_template to latest version
alphagov · May 21, 2014 · 42bfefc · 42bfefc
2 parents 0f8a271 + e594b1c
commit 42bfefc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -27,6 +27,6 @@ gem 'govuk_frontend_toolkit', '0.43.2'
 if ENV['GOVUK_TEMPLATE_DEV']
   gem 'govuk_template', :path => "../govuk_template"
 else
-  gem 'govuk_template', '0.6.4'
+  gem 'govuk_template', '0.8.0'
 end
 gem 'gds-api-adapters', '7.18.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -61,7 +61,7 @@ GEM
     govuk_frontend_toolkit (0.43.2)
       rails (>= 3.1.0)
       sass (>= 3.2.0)
-    govuk_template (0.6.4)
+    govuk_template (0.8.0)
       rails (>= 3.1)
     hike (1.2.3)
     i18n (0.6.9)
@@ -180,7 +180,7 @@ DEPENDENCIES
   exception_notification
   gds-api-adapters (= 7.18.0)
   govuk_frontend_toolkit (= 0.43.2)
-  govuk_template (= 0.6.4)
+  govuk_template (= 0.8.0)
   jasmine (= 1.1.2)
   logstasher (= 0.4.8)
   mocha (= 0.13.3)

diff --git a/app/assets/stylesheets/_footer.scss b/app/assets/stylesheets/_footer.scss
@@ -5,7 +5,7 @@
     @extend %contain-floats;
 
     @include media(tablet){
-      padding: 0 0 30px;
+      padding: 0 $gutter-half $gutter;
     }
 
     .footer-explore,

diff --git a/app/assets/stylesheets/_header.scss b/app/assets/stylesheets/_header.scss
@@ -243,7 +243,6 @@
   }
 
   ol {
-    border-top: 10px solid $mainstream-brand;
     max-width: 960px;
     margin: 0 30px;
     padding: 0.75em 0;

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -3,6 +3,7 @@
 @import "_conditionals";
 @import "_css3";
 @import "_device-pixels";
+@import "_measurements";
 @import "_typography";
 
 /* local styleguide includes */

diff --git a/app/assets/stylesheets/header-footer-only.scss b/app/assets/stylesheets/header-footer-only.scss
@@ -3,6 +3,7 @@
 @import "_conditionals";
 @import "_css3";
 @import "_device-pixels";
+@import "_measurements";
 @import "_typography";
 @import "design-patterns/_buttons";