diff options
| author | David O'Regan <doregan@gitlab.com> | 2022-08-06 13:42:33 +0300 |
|---|---|---|
| committer | David O'Regan <doregan@gitlab.com> | 2022-08-06 13:42:33 +0300 |
| commit | 934cee194e9b1d73059c7c8702433a9fb5c83e5b (patch) | |
| tree | 6ba92eece3099d79b637bfe1f9ed34351e400266 | |
| parent | 5fb47933b2e36faa4bde8c6972d7a1807a6686be (diff) | |
| parent | 021a524d3313e58642142340e90f8538628d90ed (diff) | |
Merge branch '1248-broken-banner-link-ui' into 'main'
Fix alert banner GL classes and index
See merge request gitlab-org/gitlab-docs!3005
| -rw-r--r-- | content/assets/javascripts/banner.js | 2 | ||||
| -rw-r--r-- | layouts/banner.html | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/content/assets/javascripts/banner.js b/content/assets/javascripts/banner.js index b4e5959a..a1417408 100644 --- a/content/assets/javascripts/banner.js +++ b/content/assets/javascripts/banner.js @@ -26,7 +26,7 @@ function getCookie(cname) { (function() { const bannerClose = document.querySelector('#banner-close'); if (getCookie("bannerclose") !== "yes") { - bannerClose.classList.remove('d-none'); + bannerClose.classList.remove('gl-display-none'); setCookie(); } })();
\ No newline at end of file diff --git a/layouts/banner.html b/layouts/banner.html index 81b5623e..8e873734 100644 --- a/layouts/banner.html +++ b/layouts/banner.html @@ -2,14 +2,14 @@ banner_raw = @items["/_data/banner.yaml"][:description] %> <% if show_banner? and !stable_version?(current_branch) %> -<div class="d-lg-block"> - <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"> - <%= icon('tanuki', 12, 'mx-2') %> +<div class="gl-lg-display-block"> + <div class="admonition-wrapper note gl-display-none" id="banner-close"> + <div class="admonition alert alert-banner alert-dismissible fade show text-center gl-mt-3 gl-z-index-1" role="alert"> + <div class="gl-display-flex gl-justify-content-center gl-align-items-center"> + <%= icon('tanuki', 12, 'gl-mx-3') %> <%= markdown(banner_raw) %> - <%= icon('tanuki', 12, 'mx-2') %> - <button type="button" class="close mt-n1" data-dismiss="alert" aria-label="Close"> + <%= icon('tanuki', 12, 'gl-mx-3') %> + <button type="button" class="close gl-mt-n2" data-dismiss="alert" aria-label="Close"> <span aria-hidden="true">×</span> </button> </div> |