Commit 5b839c58 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'tz-print-css-move' into 'master'

Moves all print styles into application.scss as performance guides say that is faster

See merge request gitlab-org/gitlab!35234
parents 86e7816e 41febf4c
...@@ -46,3 +46,8 @@ ...@@ -46,3 +46,8 @@
// Gitlab UI util classes // Gitlab UI util classes
@import "@gitlab/ui/src/scss/utilities"; @import "@gitlab/ui/src/scss/utilities";
/* print styles */
@media print {
@import "print";
}
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
= stylesheet_link_tag "application_dark", media: "all" = stylesheet_link_tag "application_dark", media: "all"
- else - else
= stylesheet_link_tag "application", media: "all" = stylesheet_link_tag "application", media: "all"
= stylesheet_link_tag "print", media: "print"
= stylesheet_link_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations'] = 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 'performance_bar' if performance_bar_enabled?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment