diff options
| author | David O'Regan <doregan@gitlab.com> | 2022-04-25 19:37:29 +0300 |
|---|---|---|
| committer | David O'Regan <doregan@gitlab.com> | 2022-04-25 19:37:29 +0300 |
| commit | d1c22b8410fa4450a65fa5a40d10f3deb4ab920e (patch) | |
| tree | ef9c253fb6f2d6256b2dd49e6f1dcfd626bfdf26 | |
| parent | 5f7978a234328817f22133b9543a2edf20f87380 (diff) | |
| parent | b0d913b9494414d81a0756620ba2f6339dea3ab9 (diff) | |
Merge branch '1162-fontawesome-banner' into 'main'
Replace FontAwesome icons in banner with gitlab/svg icons
See merge request gitlab-org/gitlab-docs!2604
| -rw-r--r-- | content/assets/stylesheets/stylesheet.scss | 7 | ||||
| -rw-r--r-- | layouts/banner.html | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss index fd939d48..20c88e94 100644 --- a/content/assets/stylesheets/stylesheet.scss +++ b/content/assets/stylesheets/stylesheet.scss @@ -258,10 +258,9 @@ ol { .alert-banner { background-color: $help-indigo-50; border-color: rgba($help-indigo-50, 0.3); - margin-top: 20px; - i { - margin-left: 10px; - margin-right: 10px; + svg { + min-width: 12px; + fill: $color-tanuki-dark; } } diff --git a/layouts/banner.html b/layouts/banner.html index 0164b84f..81b5623e 100644 --- a/layouts/banner.html +++ b/layouts/banner.html @@ -6,9 +6,9 @@ banner_raw = @items["/_data/banner.yaml"][:description] <div class="admonition-wrapper note d-none" id="banner-close"> <div class="admonition alert alert-banner alert-dismissible fade show text-center mt-2" role="alert"> <div class="d-flex justify-content-center align-items-center"> - <i class="fa fa-gitlab fa-fw" style="color:rgb(225,67,41); font-size:.85em" aria-hidden="true"></i> + <%= icon('tanuki', 12, 'mx-2') %> <%= markdown(banner_raw) %> - <i class="fa fa-gitlab fa-fw" style="color:rgb(225,67,41); font-size:.85em" aria-hidden="true"></i> + <%= icon('tanuki', 12, 'mx-2') %> <button type="button" class="close mt-n1" data-dismiss="alert" aria-label="Close"> <span aria-hidden="true">×</span> </button> |