diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index 59f22f5e9..27b81918d 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -198,8 +198,8 @@ var collapseIcon = $(this).find(".collapse-step-icon"); var collapsed = $(this).hasClass("collapsed"); // Toggle collapse button - collapseIcon.toggleClass("fa-caret-square-up", !collapsed); - collapseIcon.toggleClass("fa-caret-square-down", collapsed); + collapseIcon.toggleClass("fa-chevron-up", !collapsed); + collapseIcon.toggleClass("fa-chevron-down", collapsed); }); } @@ -645,16 +645,16 @@ renderTable($(this)); }); $(document).find("span.collapse-step-icon").each(function() { - $(this).addClass("fa-caret-square-up"); - $(this).removeClass("fa-caret-square-down"); + $(this).addClass("fa-chevron-up"); + $(this).removeClass("fa-chevron-down"); }); } function expandStep(step) { $('.panel-collapse', step).collapse('show'); $(step).find("span.collapse-step-icon") - .addClass("fa-caret-square-up") - .removeClass("fa-caret-square-down"); + .addClass("fa-chevron-up") + .removeClass("fa-chevron-down"); $(step).find("div.step-result-hot-table").each(function() { renderTable($(this)); }); @@ -703,8 +703,8 @@ $("[data-action='collapse-steps']").click(function () { $('.step .panel-collapse').collapse('hide'); $(document).find("span.collapse-step-icon").each(function() { - $(this).addClass("fa-caret-square-down"); - $(this).removeClass("fa-caret-square-up"); + $(this).addClass("fa-chevron-down"); + $(this).removeClass("fa-chevron-up"); }); }); $("[data-action='expand-steps']").click(expandAllSteps); diff --git a/app/assets/stylesheets/shared_styles/constants/fonts.scss b/app/assets/stylesheets/shared_styles/constants/fonts.scss index df35e4a11..d556391e2 100644 --- a/app/assets/stylesheets/shared_styles/constants/fonts.scss +++ b/app/assets/stylesheets/shared_styles/constants/fonts.scss @@ -11,7 +11,7 @@ $font-size-h2: 18px; $font-size-h3: $font-size-base; $font-size-h4: $font-size-base; $font-size-h5: $font-size-base; -$font-size-h6: $font-size-base; +$font-size-h6: 12px; $font-fas-check: "\f00c"; $font-fas-exclamation-triangle: "\f071"; diff --git a/app/assets/stylesheets/steps.scss b/app/assets/stylesheets/steps.scss index 3a129293b..32fc129da 100644 --- a/app/assets/stylesheets/steps.scss +++ b/app/assets/stylesheets/steps.scss @@ -71,7 +71,6 @@ .step-name-link { display: flex; flex-shrink: 1; - line-height: 100%; overflow: hidden; .name-block { diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index df9a878d9..435dabb9c 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -347,6 +347,7 @@ a[data-toggle="tooltip"] { &.active { @include box-shadow(0 4px 0 $brand-primary); + line-height: 24px; margin-bottom: 4px; & > a, diff --git a/app/views/global_activities/_top_pane.html.erb b/app/views/global_activities/_top_pane.html.erb index 62cfd3a5f..c1983184b 100644 --- a/app/views/global_activities/_top_pane.html.erb +++ b/app/views/global_activities/_top_pane.html.erb @@ -1,6 +1,6 @@ -

+

<%= t('activities.index.global_activities_title') %> -

+
diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb index 4b8db00ed..921180a32 100644 --- a/app/views/shared/_secondary_navigation.html.erb +++ b/app/views/shared/_secondary_navigation.html.erb @@ -145,7 +145,7 @@ - +