diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
| commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
| tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/stylesheets/application.scss | |
| parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
| download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/stylesheets/application.scss')
| -rw-r--r-- | app/assets/stylesheets/application.scss | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 41fb62c28e6..f5393ef47d6 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -18,8 +18,8 @@ // GitLab UI framework @import 'framework'; -// Font icons -@import 'font-awesome'; +// Custom Fontawesome icons +@import 'fontawesome_custom'; // Page specific styles (issues, projects etc): @import 'pages/**/*'; @@ -51,3 +51,7 @@ @media print { @import 'print'; } + +/* Rules for overriding cloaking in startup-general.scss */ +@import 'startup/cloaking'; +@include cloak-startup-scss(block); |