diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/views/layouts/_head.html.haml | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/views/layouts/_head.html.haml')
-rw-r--r-- | app/views/layouts/_head.html.haml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index d1311f17b72..b869298e99d 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -49,14 +49,17 @@ = favicon_link_tag favicon, id: 'favicon', data: { original_href: favicon }, type: 'image/png' + = render 'layouts/startup_css' - if user_application_theme == 'gl-dark' - = stylesheet_link_tag "application_dark", media: "all" + = stylesheet_link_tag_defer "application_dark" - else - = stylesheet_link_tag "application", media: "all" + = stylesheet_link_tag_defer "application" = stylesheet_link_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations'] - = stylesheet_link_tag 'performance_bar' if performance_bar_enabled? + = stylesheet_link_tag_defer 'performance_bar' if performance_bar_enabled? - = stylesheet_link_tag "highlight/themes/#{user_color_scheme}", media: "all" + = stylesheet_link_tag_defer "highlight/themes/#{user_color_scheme}" + + = render 'layouts/startup_css_activation' = Gon::Base.render_data(nonce: content_security_policy_nonce) @@ -70,6 +73,7 @@ = yield :page_specific_javascripts = webpack_controller_bundle_tags + = webpack_bundle_tag "chrome_84_icon_fix" if browser.chrome?([">=84", "<85"]) || browser.edge?([">=84", "<85"]) = yield :project_javascripts |