Update frontend-related gems #1940

Merged
merged 5 commits into from Jan 8, 2015
View
@@ -12,7 +12,7 @@ gem 'validates_email_format_of'
gem 'friendly_id', '4.0.9'
gem 'babosa'
gem 'nokogiri'
-gem 'slimmer', '4.3.1'
+gem 'slimmer', '6.0.0'
gem 'plek', '1.10.0'
gem 'isbn_validation'
gem 'gds-sso', '~> 10.0'
@@ -24,7 +24,7 @@ gem 'bootstrap-kaminari-views'
gem 'gds-api-adapters', '17.2.0'
gem 'whenever', '0.9.4', require: false
gem 'mini_magick'
-gem 'shared_mustache', '~> 0.0.2'
+gem 'shared_mustache', '~> 0.1.3'
gem 'rails-i18n'
gem 'globalize3', github: 'globalize/globalize', ref: 'ab69160ad'
gem 'link_header'
@@ -56,9 +56,9 @@ group :assets do
if ENV['FRONTEND_TOOLKIT_DEV']
gem 'govuk_frontend_toolkit', path: '../govuk_frontend_toolkit_gem'
else
- gem 'govuk_frontend_toolkit', '2.0.1'
+ gem 'govuk_frontend_toolkit', '3.1.0'
end
- gem 'sass', '3.2.8'
+ gem 'sass', '3.4.9'
gem 'sass-rails'
gem 'uglifier'
end
View
@@ -151,7 +151,7 @@ GEM
kramdown (~> 1.4.1)
nokogiri (~> 1.5.10)
sanitize (~> 2.1.0)
- govuk_frontend_toolkit (2.0.1)
+ govuk_frontend_toolkit (3.1.0)
rails (>= 3.1.0)
sass (>= 3.2.0)
hashery (2.1.1)
@@ -304,12 +304,12 @@ GEM
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
- sass (3.2.8)
+ sass (3.4.9)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- shared_mustache (0.0.2)
+ shared_mustache (0.1.3)
execjs (>= 1.2.4)
mustache (~> 0.99.4)
sidekiq (3.3.0)
@@ -327,12 +327,12 @@ GEM
simplecov-html (0.8.0)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- slimmer (4.3.1)
+ slimmer (6.0.0)
activesupport
json
nokogiri (~> 1.5.0)
null_logger
- plek (>= 0.1.8)
+ plek (>= 1.1.0)
rack (>= 1.3.5)
rest-client
slop (3.6.0)
@@ -366,9 +366,9 @@ GEM
typhoeus (0.6.9)
ethon (>= 0.7.1)
tzinfo (0.3.42)
- uglifier (2.1.1)
+ uglifier (2.6.1)
execjs (>= 0.3.0)
- multi_json (~> 1.0, >= 1.0.2)
+ json (>= 1.8.0)
unicorn (4.6.2)
kgio (~> 2.6)
rack
@@ -413,7 +413,7 @@ DEPENDENCIES
gds-sso (~> 10.0)
globalize3!
govspeak (~> 3.2.0)
- govuk_frontend_toolkit (= 2.0.1)
+ govuk_frontend_toolkit (= 3.1.0)
invalid_utf8_rejector (~> 0.0.1)
isbn_validation
jbuilder
@@ -443,14 +443,14 @@ DEPENDENCIES
rubocop
ruby-prof
rummageable (= 1.2.0)
- sass (= 3.2.8)
+ sass (= 3.4.9)
sass-rails
- shared_mustache (~> 0.0.2)
+ shared_mustache (~> 0.1.3)
sidekiq (~> 3.3.0)
sidekiq-logging-json (= 0.0.14)
simplecov
simplecov-rcov
- slimmer (= 4.3.1)
+ slimmer (= 6.0.0)
statsd-ruby (~> 1.2.1)
strong_parameters
test-queue
@@ -17,7 +17,7 @@ if(typeof window.GOVUK === 'undefined'){ window.GOVUK = {}; }
formType: '',
renderTable: function(data) {
- $('.js-filter-results').mustache('documents-_filter_table', data);
+ $('.js-filter-results').mustache('documents/_filter_table', data);
},
showStatisticsNotice: function() {
$(".filter-results-summary").empty();
@@ -506,6 +506,7 @@ img.organisation-logo-custom {
// Non-cornforming Medium
.organisation-logo-no-identity-medium {
+ border-left: 0;
@include media(tablet){
font-size: 18px;
line-height: 20px;
@@ -356,14 +356,6 @@
.js-back-to-content-stop {
clear: both;
}
- p.report-a-problem-toggle a {
- @include core-16;
- color: $secondary-text-colour;
- text-decoration: underline;
- }
- .report-a-problem-container {
- margin-left: 0;
- }
@include right-to-left {
direction: rtl;
@@ -18,17 +18,3 @@
}
}
}
-
-p.report-a-problem-toggle {
- clear: both;
- padding: $gutter-half;
- direction: ltr;
- @include media(tablet) {
- padding: $gutter;
- }
-
- a {
- color: $secondary-text-colour;
- text-decoration: underline;
- }
-}
@@ -2,7 +2,6 @@
<main id="content" role="main" class="whitehall-content">
<div id="page" class="<%= content_for?(:page_class) ? yield(:page_class) : '' %>" >
<%= yield %>
- <div id="report-a-problem"></div>
</div>
</main>
<% end %>
@@ -16,8 +16,6 @@
<div id="page" class="<%= content_for?(:page_class) ? yield(:page_class) : '' %>" >
<%= yield %>
<%= render_mustache_templates if Rails.env.development? %>
-
- <div id="report-a-problem"></div>
</div>
</main>
<% end %>
@@ -2,7 +2,6 @@
<main id="content" role="main" class="whitehall-content">
<div id="page" class="<%= content_for?(:page_class) ? yield(:page_class) : '' %>" >
<%= yield %>
- <div id="report-a-problem"></div>
</div>
</main>
<% end %>