From 03df741edc4eba634c239bd037bbcd4b0fb5864c Mon Sep 17 00:00:00 2001 From: andyjmaclean Date: Wed, 12 Apr 2017 09:56:16 +0200 Subject: [PATCH] Re: #1698 icon field update and rename --- Gemfile | 4 ++-- Gemfile.lock | 11 ++++------- app/helpers/mustache_helper.rb | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 61de23c5..bcca9739 100644 --- a/Gemfile +++ b/Gemfile @@ -11,10 +11,10 @@ gem 'country_select' gem 'delayed_job_active_record' gem 'dragonfly-s3_data_store' gem 'dragonfly-swift_data_store', github: 'europeana/dragonfly-swift-data-store', tag: 'v0.1.0' -gem 'europeana-styleguide', github: 'europeana/europeana-styleguide-ruby', ref: 'e74cf01' +gem 'europeana-styleguide', github: 'europeana/europeana-styleguide-ruby', ref: '5e6e367' gem 'jbuilder', '~> 2.0' gem 'jquery-rails' -gem 'nokogiri', '>= 1.7.1' # Forced update for security issues +gem 'nokogiri', '>= 1.6.8' # Forced update for security issues gem 'pg', '~> 0.15' gem 'puma', '~> 2.13' gem 'rack-plastic' diff --git a/Gemfile.lock b/Gemfile.lock index 0a0e8e59..86611aa0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,8 +9,8 @@ GIT GIT remote: git://github.com/europeana/europeana-styleguide-ruby.git - revision: e74cf01139ed3230c8c14bd6f0fa63d264ca7da5 - ref: e74cf01 + revision: 5e6e367d6f10a33efae8a037a60d0a2585cfba44 + ref: 5e6e367 specs: europeana-styleguide (0.2.0) activesupport (~> 4.0) @@ -262,7 +262,7 @@ GEM mini_portile2 (2.1.0) minitest (5.10.1) multi_json (1.12.1) - mustache (1.0.3) + mustache (1.0.5) netrc (0.11.0) newrelic_rpm (3.15.1.316) nokogiri (1.7.1) @@ -483,7 +483,7 @@ DEPENDENCIES jquery-rails localeapp (~> 1.0) newrelic_rpm - nokogiri (>= 1.7.1) + nokogiri (>= 1.6.8) pg (~> 0.15) phantomjs poltergeist @@ -508,6 +508,3 @@ DEPENDENCIES turbolinks uglifier (>= 1.3.0) web-console (~> 2.0) - -BUNDLED WITH - 1.14.6 diff --git a/app/helpers/mustache_helper.rb b/app/helpers/mustache_helper.rb index 7df2693c..b868408c 100644 --- a/app/helpers/mustache_helper.rb +++ b/app/helpers/mustache_helper.rb @@ -66,7 +66,7 @@ def utility_nav { url: '#', text: t('site.settings.language.label'), - icon: 'language', + icon_class: 'svg-icon-language', submenu: { items: page_object.alternatives.map do |alt| {