diff options
Diffstat (limited to 'app/views/layouts/_head.html.haml')
| -rw-r--r-- | app/views/layouts/_head.html.haml | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 2ac926a7fc3..ea2f452b9e2 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -18,7 +18,13 @@ = favicon_link_tag favicon, id: 'favicon', data: { original_href: favicon }, type: 'image/png' - = render 'layouts/startup_css', { startup_filename: local_assigns.fetch(:startup_filename, nil) } + - if startup_css_enabled? + = render 'layouts/startup_css', { startup_filename: local_assigns.fetch(:startup_filename, nil) } + - else + - diffs_colors = user_diffs_colors + = stylesheet_link_tag "themes/#{user_application_theme_css_filename}" if user_application_theme_css_filename + = render 'layouts/diffs_colors_css', diffs_colors if diffs_colors.present? || request.path == profile_preferences_path + - if user_application_theme == 'gl-dark' %meta{ name: 'color-scheme', content: 'dark light' } = stylesheet_link_tag_defer "application_dark" @@ -31,16 +37,22 @@ = stylesheet_link_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations'] = stylesheet_link_tag "test_environment", media: "all" if Rails.env.test? + = stylesheet_link_tag_defer "fonts" if use_new_fonts? + = stylesheet_link_tag_defer "highlight/themes/#{user_color_scheme}" - = render 'layouts/startup_css_activation' + - if startup_css_enabled? + = render 'layouts/startup_css_activation' = stylesheet_link_tag 'performance_bar' if performance_bar_enabled? = Gon::Base.render_data(nonce: content_security_policy_nonce) = render_if_exists 'layouts/header/translations' - = webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled + - if Feature.enabled?(:enable_new_sentry_clientside_integration, current_user) && Gitlab::CurrentSettings.sentry_enabled + = webpack_bundle_tag 'sentry' + - elsif Gitlab.config.sentry.enabled + = webpack_bundle_tag 'legacy_sentry' = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? = yield :page_specific_javascripts |