Skip to content
This repository has been archived by the owner on Apr 27, 2022. It is now read-only.

Re: #1698 icon field update and rename #62

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
11 changes: 4 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -508,6 +508,3 @@ DEPENDENCIES
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

BUNDLED WITH
1.14.6
2 changes: 1 addition & 1 deletion app/helpers/mustache_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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|
{
Expand Down