Merge branch 'himkp-master-patch-41115' into 'master'

Move hljs import to theme file

See merge request gitlab-org/gitlab!84705

app/assets/stylesheets/framework/highlight.scss

-@import '../highlight/hljs';
-
 .file-content.code {
   border: 0;
   box-shadow: none;

app/assets/stylesheets/highlight/themes/dark.scss

 /* https://github.com/MozMorris/tomorrow-pygments */
 
 @import '../common';
+@import '../hljs';
 
 /*
 * Dark syntax colors