Merge branch '229466-scope-the-fontawesome-css-to-the-icons-we-actually-use' into 'master'

Scope the fontawesome.css to the icons we actually use

Closes #229466

See merge request gitlab-org/gitlab!37922

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/**/*';

app/assets/stylesheets/fontawesome_custom.scss

+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+// stylelint-disable property-no-vendor-prefix
+// stylelint-disable at-rule-no-vendor-prefix
+// stylelint-disable stylelint-gitlab/duplicate-selectors
+// scss-lint:disable MergeableSelector
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('fontawesome-webfont.woff?v=4.7.0') format('woff');
+  font-weight: normal;
+  font-style: normal;
+}
+
+.fa {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* makes the font 33% larger relative to the icon container */
+.fa-lg {
+  font-size: 1.33333333em;
+  line-height: 0.75em;
+  vertical-align: -15%;
+}
+
+.fa-2x {
+  font-size: 2em;
+}
+
+.fa-3x {
+  font-size: 3em;
+}
+
+.fa-4x {
+  font-size: 4em;
+}
+
+.fa-5x {
+  font-size: 5em;
+}
+
+.fa-fw {
+  width: 1.28571429em;
+  text-align: center;
+}
+
+.fa.fa-pull-left {
+  margin-right: 0.3em;
+}
+
+.fa.fa-pull-right {
+  margin-left: 0.3em;
+}
+
+.fa-pull-right,
+.pull-right {
+  float: right;
+}
+
+.fa-pull-left,
+.pull-left {
+  float: left;
+}
+
+.fa-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+  animation: fa-spin 2s infinite linear;
+}
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+
+.fa-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+
+.fa-stack-1x,
+.fa-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+
+.fa-stack-1x {
+  line-height: inherit;
+}
+
+.fa-stack-2x {
+  font-size: 2em;
+}
+
+.fa-inverse {
+  color: $white;
+}
+
+.fa-question-circle::before {
+  content: '\f059';
+}
+
+.fa-chevron-down::before {
+  content: '\f078';
+}
+
+.fa-remove::before,
+.fa-close::before,
+.fa-times::before {
+  content: '\f00d';
+}
+
+.fa-caret-down::before {
+  content: '\f0d7';
+}
+
+.fa-check::before {
+  content: '\f00c';
+}
+
+.fa-search::before {
+  content: '\f002';
+}
+
+.fa-warning::before,
+.fa-exclamation-triangle::before {
+  content: '\f071';
+}
+
+.fa-external-link::before {
+  content: '\f08e';
+}
+
+.fa-spinner::before {
+  content: '\f110';
+}
+
+.fa-calendar::before {
+  content: '\f073';
+}
+
+.fa-angle-double-right::before {
+  content: '\f101';
+}
+
+.fa-trash::before {
+  content: '\f1f8';
+}
+
+.fa-angle-double-left::before {
+  content: '\f100';
+}
+
+.fa-arrow-left::before {
+  content: '\f060';
+}
+
+.fa-trash-o::before {
+  content: '\f014';
+}
+
+.fa-caret-right::before {
+  content: '\f0da';
+}
+
+.fa-info-circle::before {
+  content: '\f05a';
+}
+
+.fa-refresh::before {
+  content: '\f021';
+}
+
+.fa-chevron-up::before {
+  content: '\f077';
+}
+
+.fa-file-text-o::before {
+  content: '\f0f6';
+}
+
+.fa-github::before {
+  content: '\f09b';
+}
+
+.fa-paperclip::before {
+  content: '\f0c6';
+}
+
+.fa-tag::before {
+  content: '\f02b';
+}
+
+.fa-arrow-up::before {
+  content: '\f062';
+}
+
+.fa-bug::before {
+  content: '\f188';
+}
+
+.fa-google::before {
+  content: '\f1a0';
+}
+
+.fa-user::before {
+  content: '\f007';
+}
+
+.fa-exclamation-circle::before {
+  content: '\f06a';
+}
+
+.fa-bell::before {
+  content: '\f0f3';
+}
+
+.fa-arrow-down::before {
+  content: '\f063';
+}
+
+.fa-bitbucket-square::before {
+  content: '\f172';
+}
+
+.fa-file-o::before {
+  content: '\f016';
+}
+
+.fa-users::before {
+  content: '\f0c0';
+}
+
+.fa-tags::before {
+  content: '\f02c';
+}
+
+.fa-lightbulb-o::before {
+  content: '\f0eb';
+}
+
+.fa-circle::before {
+  content: '\f111';
+}
+
+.fa-certificate::before {
+  content: '\f0a3';
+}
+
+.fa-minus-circle::before {
+  content: '\f056';
+}
+
+.fa-bitbucket::before {
+  content: '\f171';
+}
+
+.fa-git::before {
+  content: '\f1d3';
+}
+
+.fa-folder::before {
+  content: '\f07b';
+}
+
+.fa-archive::before {
+  content: '\f187';
+}
+
+.fa-lock::before {
+  content: '\f023';
+}
+
+.fa-sign-out::before {
+  content: '\f08b';
+}
+
+.fa-thumb-tack::before {
+  content: '\f08d';
+}
+
+.fa-fire::before {
+  content: '\f06d';
+}
+
+.fa-power-off::before {
+  content: '\f011';
+}
+
+.fa-download::before {
+  content: '\f019';
+}
+
+.fa-globe::before {
+  content: '\f0ac';
+}
+
+.fa-pencil::before {
+  content: '\f040';
+}
+
+.fa-pause::before {
+  content: '\f04c';
+}
+
+.fa-play::before {
+  content: '\f04b';
+}
+
+.fa-arrow-right::before {
+  content: '\f061';
+}
+
+.fa-user-secret::before {
+  content: '\f21b';
+}
+
+.fa-search-plus::before {
+  content: '\f00e';
+}
+
+.fa-search-minus::before {
+  content: '\f010';
+}
+
+.fa-book::before {
+  content: '\f02d';
+}
+
+.fa-cubes::before {
+  content: '\f1b3';
+}
+
+.fa-edit::before {
+  content: '\f044';
+}
+
+.fa-times-circle::before {
+  content: '\f057';
+}
+
+.fa-skype::before {
+  content: '\f17e';
+}
+
+.fa-linkedin-square::before {
+  content: '\f08c';
+}
+
+.fa-twitter-square::before {
+  content: '\f081';
+}
+
+.fa-unlink::before {
+  content: '\f127';
+}
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  clip: auto;
+}

config/application.rb

@@ -192,6 +192,11 @@ module Gitlab
     config.assets.precompile << "icons.json"
     config.assets.precompile << "illustrations/*.svg"
 
+    # Import Fontawesome fonts
+    config.assets.paths << "#{config.root}/node_modules/font-awesome/fonts"
+    config.assets.precompile << "fontawesome-webfont.woff2"
+    config.assets.precompile << "fontawesome-webfont.woff"
+
     # Import css for xterm
     config.assets.paths << "#{config.root}/node_modules/xterm/src/"
     config.assets.precompile << "xterm.css"

config/dependency_decisions.yml

@@ -616,8 +616,8 @@
     :when: 2019-09-11 13:08:28.431132000 Z
 - - :whitelist
   - "(MIT OR CC0-1.0)"
-  - :who:
-    :why:
+  - :who: 
+    :why: 
     :versions: []
     :when: 2019-11-08 10:03:31.787226000 Z
 - - :whitelist
@@ -632,3 +632,10 @@
     :why: This license is public domain
     :versions: []
     :when: 2020-07-17 10:50:44.632875345 Z
+- - :license
+  - font-awesome
+  - MIT
+  - :who: Mike Greiling
+    :why: MIT license
+    :versions: []
+    :when: 2020-07-28 20:35:27.574875000 Z

package.json

@@ -86,6 +86,7 @@
     "emoji-unicode-version": "^0.2.1",
     "exports-loader": "^0.7.0",
     "file-loader": "^5.1.0",
+    "font-awesome": "4.7.0",
     "fuzzaldrin-plus": "^0.6.0",
     "glob": "^7.1.6",
     "graphql": "^14.7.0",

yarn.lock

@@ -5138,6 +5138,11 @@ follow-redirects@1.5.10, follow-redirects@^1.0.0:
   dependencies:
     debug "=3.1.0"
 
+font-awesome@4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
+
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"