Merge pull request #217 from Det-Kongelige-Bibliotek/development

Development
kb-dk · Jun 15, 2020 · c9bd78f · c9bd78f
2 parents d8676f4 + eb23761
commit c9bd78f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -64,7 +64,6 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-
 gem 'jettywrapper'
 gem 'devise','>= 4.7.1'
 gem 'devise-guests'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    ffi (1.13.0)
+    ffi (1.13.1)
     font-awesome-rails (4.7.0.5)
       railties (>= 3.2, < 6.1)
     globalid (0.4.2)

diff --git a/app/assets/stylesheets/General/_general.scss b/app/assets/stylesheets/General/_general.scss
@@ -184,7 +184,7 @@ a.comment{
   &:before{
     font-size: large;
     display: inline;
-    font-weight: bold;
+    font-weight: normal;
   }
 }
 span.symbol{

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -24,7 +24,8 @@
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  # config.assets.js_compressor = :uglifier
+  config.assets.js_compressor   = Uglifier.new(harmony: true)
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.

diff --git a/config/locales/general.da.yml b/config/locales/general.da.yml
@@ -3,7 +3,7 @@ da:
     ie_message:
       message: 'Internet Explorer er teknologisk forældet og supporteres ikke af tekstportalen. <a target="_blank" href="/pages/about-text-portal#platforms">Læs om supporterede browsere</a>.'
     text_toolbar:
-      fullscreen: 'Se tekst i fuld skærm'
+      fullscreen: 'Fuld skærm'
       text: 'Hent PDF'
       highlight: 'Søgemarkering'
       facsimile: 'Faksimile'