From a99f9db5203d3232f3d610c0ae58bd632b456533 Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Fri, 17 Sep 2021 14:15:01 +0200 Subject: [PATCH] Small CSS fixes [SCI-6017][SCI-6019] (#3548) --- app/assets/stylesheets/global_activities.scss | 4 ++-- app/assets/stylesheets/reports_print.scss | 6 ++++++ .../elements/_my_module_result_asset_element.html.erb | 2 +- app/views/reports/elements/_step_asset_element.html.erb | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss index 2487dd209..6a9989d38 100644 --- a/app/assets/stylesheets/global_activities.scss +++ b/app/assets/stylesheets/global_activities.scss @@ -210,7 +210,7 @@ padding: 5px 0 5px 40px; &:hover { - background-color: $brand-focus-light; + background-color: $color-concrete; border-radius: 5px; } @@ -363,7 +363,7 @@ width: calc(50% - 25px); &.selected { - background: $brand-light-blue; + background: $color-alto; opacity: 1; } diff --git a/app/assets/stylesheets/reports_print.scss b/app/assets/stylesheets/reports_print.scss index 32f41d3ae..8b54d3e0f 100644 --- a/app/assets/stylesheets/reports_print.scss +++ b/app/assets/stylesheets/reports_print.scss @@ -212,4 +212,10 @@ div.print-report { } } } + + .export-all-link { + em { + color: $brand-primary !important; + } + } } diff --git a/app/views/reports/elements/_my_module_result_asset_element.html.erb b/app/views/reports/elements/_my_module_result_asset_element.html.erb index c7eea00d1..06856844e 100644 --- a/app/views/reports/elements/_my_module_result_asset_element.html.erb +++ b/app/views/reports/elements/_my_module_result_asset_element.html.erb @@ -20,7 +20,7 @@ <% else %> <% file_link = @obj_filenames.dig(:assets, asset.id, :file) %> <% end %> - + <%= t("projects.reports.elements.result_asset.file_name", file: file_link&.split('/')&.last) %> <% else %> diff --git a/app/views/reports/elements/_step_asset_element.html.erb b/app/views/reports/elements/_step_asset_element.html.erb index b02759a6f..2cf779726 100644 --- a/app/views/reports/elements/_step_asset_element.html.erb +++ b/app/views/reports/elements/_step_asset_element.html.erb @@ -13,7 +13,7 @@ <% else %> <% file_link = @obj_filenames.dig(:assets, asset.id, :file) %> <% end %> - + <%= t('projects.reports.elements.step_asset.file_name', file: file_link&.split('/')&.last) %> <% else %>