diff --git a/app/assets/stylesheets/shared/assets.scss b/app/assets/stylesheets/shared/assets.scss index 03de7109b..3e58a4b5b 100644 --- a/app/assets/stylesheets/shared/assets.scss +++ b/app/assets/stylesheets/shared/assets.scss @@ -170,8 +170,8 @@ max-width: 100%; } - .fas { - font-size: 10em; + .sn-icon { + font-size: 10em !important; } } diff --git a/app/controllers/gene_sequence_assets_controller.rb b/app/controllers/gene_sequence_assets_controller.rb index 294cc6e11..5562a50d6 100644 --- a/app/controllers/gene_sequence_assets_controller.rb +++ b/app/controllers/gene_sequence_assets_controller.rb @@ -68,6 +68,8 @@ class GeneSequenceAssetsController < ApplicationController def save_asset! ActiveRecord::Base.transaction do + view_mode = @asset.view_mode if @asset + ensure_asset! @asset.file.purge @@ -88,7 +90,7 @@ class GeneSequenceAssetsController < ApplicationController file.blob.metadata['asset_type'] = 'gene_sequence' file.blob.metadata['name'] = params[:sequence_name] file.save! - @asset.view_mode ||= @parent.assets_view_mode + @asset.view_mode = view_mode || @parent.assets_view_mode @asset.save! end end diff --git a/app/helpers/file_icons_helper.rb b/app/helpers/file_icons_helper.rb index b6460e8c1..b119d078b 100644 --- a/app/helpers/file_icons_helper.rb +++ b/app/helpers/file_icons_helper.rb @@ -19,13 +19,17 @@ module FileIconsHelper elsif Constants::FILE_PRESENTATION_FORMATS.include?(file_ext) 'sn-icon-file-powerpoint' elsif %w(pdf).include?(file_ext) - 'sn-icon-pdf' + 'sn-icon-file-pdf' elsif %w(txt csv tab tex).include?(file_ext) 'sn-icon-result-text' elsif Constants::WHITELISTED_IMAGE_TYPES.include?(file_ext) 'sn-icon-result-image' + elsif asset.file.attached? && asset.file.metadata['asset_type'] == 'marvinjs' + 'sn-icon-marvinjs' + elsif asset.file.attached? && asset.file.metadata['asset_type'] == 'gene_sequence' + 'sn-icon-sequence-editor' else - 'fa-paperclip' + 'sn-icon-attachment' end end diff --git a/app/javascript/vue/shared/content/attachments/inline.vue b/app/javascript/vue/shared/content/attachments/inline.vue index d6de2db09..2f69db3a2 100644 --- a/app/javascript/vue/shared/content/attachments/inline.vue +++ b/app/javascript/vue/shared/content/attachments/inline.vue @@ -59,7 +59,7 @@