govuk_frontend_toolkit 1.6.0 → 1.6.1

data/app/assets/CHANGELOG.md

@@ -0,0 +1,46 @@
+# 1.6.1
+
+- Fix visited link colour to be a colour which passes contrast
+
+# 1.6.0
+
+ - abstraction of the core typography mixins into single core mixin
+ - reference to composer module added to README
+ - selection buttons added to manifest for localSpecRunner
+ - test for sass compilation
+ - fix for selection buttons
+
+# 1.5.0
+
+- polyfill for Function.prototype.bind added
+- selection-buttons script added
+- local runner added for Jasmine tests
+
+# 1.4.0
+
+- New phase banner styles
+- Removed trailing commas
+- Redrawn important icon
+
+# 1.3.0
+
+- Adds weighting to multivariant testing
+
+# 1.2.0
+
+- add three quarters variable to measurements
+- improvements to CSS3 mixins
+- set inner block mixin to use either padding or margin
+- increase button padding to match alphagov/static defaults
+
+# 1.1.0
+
+Add icons from alphagov/static
+
+# 1.0.1
+
+Fix contrast on phase banner
+
+# 1.0.0
+
+Considered stable

data/app/assets/VERSION.txt

@@ -0,0 +1 @@
+1.6.1

data/app/assets/stylesheets/_colours.scss

@@ -93,7 +93,7 @@ $white: #fff;
 $link-colour: $govuk-blue;
 $link-active-colour: #2e8aca;
 $link-hover-colour: #2e8aca;
-$link-visited-colour: #2e8aca;
+$link-visited-colour: #4c2c92;
 $button-colour: #00823b;
 $text-colour: $black;             // Standard text colour
 $secondary-text-colour: $grey-1;  // Section headers, help text etc.

data/govuk_frontend_toolkit.gemspec

@@ -4,7 +4,7 @@ require "govuk_frontend_toolkit/version"
 
 Gem::Specification.new do |s|
   s.name         = "govuk_frontend_toolkit"
-  s.version      = GovUKFrontendToolkit::VERSION
+  s.version      = GovUKFrontendToolkit.toolkit_version
   s.summary      = 'Tools for building frontend applications'
   s.authors      = ['Bradley Wright']
   s.email        = 'bradley.wright@digital.cabinet-office.gov.uk'

data/jenkins.sh

@@ -1,8 +1,34 @@
 #!/bin/sh
 set -e
-git submodule init
-git submodule update
+
+# Checkout master as we are currently have an individual commit checked out on
+# a detached tree. This means when we commit later it will be on a branch
+git checkout master
+git reset --hard origin/master
+
+# Init the submodule and checkout the revision pinned in `.gitmodules`
+git submodule update --init
+
+# The version of the toolkit defined by the pinned submodule
+PINNED_SUBMODULE_VERSION=`cat app/assets/VERSION.txt`
+
+# Force the submodule to pull the latest and checkout origin/master
+git submodule foreach git pull origin master
+
+# The version of the toolkit defined in the submodules master branch
+NEW_SUBMODULE_VERSION=`cat app/assets/VERSION.txt`
+
+# Install gem dependencies, run tests, publish gem
 rm -f Gemfile.lock
 bundle install --path "${HOME}/bundles/${JOB_NAME}"
 bundle exec rake
+
+# If the submodule has a new version string
+if [ "$PINNED_SUBMODULE_VERSION" != "$NEW_SUBMODULE_VERSION" ]; then
+  # Commit the updated submodule and push it to origin
+  git commit -am "Bump to version $PINNED_SUBMODULE_VERSION"
+  git push origin master
+fi
+
+# Publish the new gem
 bundle exec rake publish_gem

data/lib/govuk_frontend_toolkit/version.rb

@@ -1,3 +1,5 @@
 module GovUKFrontendToolkit
-  VERSION = "1.6.0"
+  def self.toolkit_version
+    File.read(File.expand_path('../../app/assets/VERSION.txt', File.dirname(__FILE__)))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19233640 !ruby/object:Gem::Requirement
+  requirement: &4863440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19233640
+  version_requirements: *4863440
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &19322160 !ruby/object:Gem::Requirement
+  requirement: &4860580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *19322160
+  version_requirements: *4860580
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &19320800 !ruby/object:Gem::Requirement
+  requirement: &4913300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *19320800
+  version_requirements: *4913300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19319600 !ruby/object:Gem::Requirement
+  requirement: &4912360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *19319600
+  version_requirements: *4912360
 description: 
 email: bradley.wright@digital.cabinet-office.gov.uk
 executables: []
@@ -75,10 +75,12 @@ files:
 - lib/govuk_frontend_toolkit/version.rb
 - app/assets/.gitignore
 - app/assets/.travis.yml
+- app/assets/CHANGELOG.md
 - app/assets/CONTRIBUTING.md
 - app/assets/Gruntfile.js
 - app/assets/LICENCE
 - app/assets/README.md
+- app/assets/VERSION.txt
 - app/assets/images/accordian-arrow-2x.png
 - app/assets/images/accordian-arrow.png
 - app/assets/images/arrow-sprite.png
@@ -252,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4285435164895981672
+      hash: -126955949964899397
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -261,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4285435164895981672
+      hash: -126955949964899397
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11