Merge pull request #801 from alphagov/bump-template-toolkit

Bump template and toolkit
alphagov · Jun 6, 2016 · 9cac7cb · 9cac7cb
2 parents 9f90b3f + d8a1e6a
commit 9cac7cb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/Gemfile b/Gemfile
@@ -40,11 +40,11 @@ group :development, :test do
 end
 
 gem 'plek', '1.11.0'
-gem 'govuk_frontend_toolkit', '~> 4.10.0'
+gem 'govuk_frontend_toolkit', '~> 4.12.0'
 
 if ENV['GOVUK_TEMPLATE_DEV']
   gem 'govuk_template', :path => "../govuk_template"
 else
-  gem 'govuk_template', '0.17.0'
+  gem 'govuk_template', '0.17.3'
 end
 gem 'gds-api-adapters', '26.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -85,10 +85,10 @@ GEM
     govuk-lint (0.6.1)
       rubocop (~> 0.35.0)
       scss_lint (~> 0.44.0)
-    govuk_frontend_toolkit (4.10.0)
+    govuk_frontend_toolkit (4.12.0)
       rails (>= 3.1.0)
       sass (>= 3.2.0)
-    govuk_template (0.17.0)
+    govuk_template (0.17.3)
       rails (>= 3.1)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
@@ -256,8 +256,8 @@ DEPENDENCIES
   gds-api-adapters (= 26.7.0)
   govuk-content-schema-test-helpers (~> 1.4)
   govuk-lint (~> 0.6.0)
-  govuk_frontend_toolkit (~> 4.10.0)
-  govuk_template (= 0.17.0)
+  govuk_frontend_toolkit (~> 4.12.0)
+  govuk_template (= 0.17.3)
   image_optim (= 0.17.1)
   jasmine-rails (~> 0.10.6)
   logstasher (= 0.4.8)

diff --git a/app/assets/stylesheets/helpers/_buttons.scss b/app/assets/stylesheets/helpers/_buttons.scss
@@ -12,6 +12,10 @@
 
 .button,
 .button.medium {
+  /*
+   * TODO: Remove button padding override, upstream (govuk_frontend_toolkit 4.12.0)
+   * has included better improvements to padding.
+   */
   padding: 0.3em 0.6em 0.2em 0.6em;
 }
 
@@ -75,7 +79,7 @@
 /* get started buttons */
 .get-started {
   margin:1.5em 0 0 0;
-  
+
   .destination {
     @include core-14;
     color: $text-colour;
@@ -98,7 +102,7 @@ input{
     min-width: 8em;
     margin: 0 0.5em;
     padding: 0.25em;
-  
+
     @include ie-lte(7) {
       width:8em;
     }
@@ -117,4 +121,3 @@ input{
     }
   }
 }
-
diff --git a/app/assets/stylesheets/helpers/_footer.scss b/app/assets/stylesheets/helpers/_footer.scss
@@ -6,14 +6,15 @@
 
   .footer-categories {
     @extend %contain-floats;
+    @extend %grid-row;
 
-    @include media(tablet){
-      padding: 0 $gutter-half $gutter;
+    @include media(tablet) {
+      padding-bottom: $gutter;
     }
 
     .footer-explore,
     .footer-inside-government {
-      @include media(tablet){
+      @include media(tablet) {
         float: left;
         width: 66.66%;
         padding-bottom: 60px;
@@ -36,40 +37,40 @@
       border: 1px solid $border-colour;
       border-width: 1px 0 0 0;
 
-      @include media(tablet){
+      @include media(tablet) {
         margin-bottom: 0;
       }
     }
-  
+
     ul {
       @include core-16;
       list-style: none;
       padding: 0;
       margin: 0;
 
-      @include media(tablet){
+      @include media(tablet) {
         float: left;
         margin: 15px 0 0 0;
         width: 50%;
       }
 
-    
+
       li {
         display: block;
         margin-bottom: 5px;
 
         padding: 10px 0 0;
         margin: 0 15px 5px;
 
-        @include media(tablet){
+        @include media(tablet) {
           padding: 20px 0 0;
           margin: 0 15px;
         }
       }
     }
 
     .footer-inside-government {
-      @include media(tablet){
+      @include media(tablet) {
         float: left;
         width: 33.33%;