Merge branch 'mw-cleanup-fa-classes' into 'master'

Remove deprecated fa-styles See merge request gitlab-org/gitlab!49700

Merge branch 'mw-cleanup-fa-classes' into 'master'
Remove deprecated fa-styles See merge request gitlab-org/gitlab!49700
06c514d3 · Phil Hughes · 0385d220 · e2baf74d · 06c514d3 · 06c514d3
Commit 06c514d3 authored Dec 10, 2020 by Phil Hughes
7 changed files
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -264,11 +264,8 @@
    width: 15px;
  }

-  svg,
-  .fa {
-    &:not(:last-child) {
-      margin-right: 5px;
-    }
+  svg:not(:last-child) {
+    margin-right: 5px;
  }
 }

@@ -358,24 +355,15 @@

 .btn-loading {
  &:not(.disabled) {
-    .fa,
    .spinner {
      display: none;
    }
  }
-
-  .fa {
-    margin-right: 5px;
-  }
 }

 .btn-build {
  margin-left: 10px;

-  i {
-    color: $gl-text-color-secondary;
-  }
-
  svg {
    fill: $gl-text-color-secondary;
  }

--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -169,7 +169,6 @@
    transition-duration: 0.3s;
  }

-  .fa,
  svg {
    position: relative;
    top: 5px;
@@ -361,11 +360,6 @@
  color: $gray-400;
  fill: $gray-400;

-  .fa {
-    position: relative;
-    font-size: 16px;
-  }
-
  svg {
    @include btn-svg;
    margin: 0;

--- a/app/assets/stylesheets/page_bundles/cycle_analytics.scss
+++ b/app/assets/stylesheets/page_bundles/cycle_analytics.scss
@@ -314,11 +314,6 @@
        vertical-align: top;
        font-weight: $gl-font-weight-normal;
      }
-
-      .fa {
-        color: var(--gray-500, $gray-500);
-        font-size: $code-font-size;
-      }
    }
  }


--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -46,11 +46,6 @@
      fill: $gl-text-color;
    }

-    .fa {
-      font-size: 12px;
-      color: $gl-text-color;
-    }
-
    .commit-sha {
      color: $blue-600;
    }

--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -169,11 +169,6 @@
  .form-check {
    margin-bottom: 10px;

-    i.fa {
-      margin: 2px 0;
-      font-size: 20px;
-    }
-
    .option-title {
      font-weight: $gl-font-weight-normal;
      display: inline-block;
@@ -193,7 +188,7 @@
    }

    &.disabled {
-      i.fa {
+      svg {
        opacity: 0.5;
      }


--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -6,7 +6,6 @@
  .nav-block {
    margin: 16px 0;

-    .btn .fa,
    .btn svg {
      color: $gl-text-color-secondary;
    }

--- a/ee/app/assets/stylesheets/pages/issues.scss
+++ b/ee/app/assets/stylesheets/pages/issues.scss
@@ -55,10 +55,6 @@
  .issue-token-link:focus > & {
    background-color: $border-gray-normal;
  }
-
-  > .fa {
-    line-height: inherit;
-  }
 }

 .issue-token-title-standalone {
@@ -90,8 +86,4 @@
    background-color: $border-gray-normal;
    outline: none;
  }
-
-  > .fa {
-    font-size: 0.9em;
-  }
 }