diff options
| author | Sarah German <sgerman@gitlab.com> | 2023-10-20 13:48:31 +0300 |
|---|---|---|
| committer | David O'Regan <doregan@gitlab.com> | 2023-10-20 13:48:31 +0300 |
| commit | 596cc5542cac7f133665f63a7b6ca96a137dfdcd (patch) | |
| tree | 44094bdd44cae2f8946fbcd55ed0a46db6893649 /layouts | |
| parent | 38228f3e5b2d650d806dc84d92720a6eb4eb235e (diff) | |
Refactor banners to use GitLab UI components
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/banner.html | 19 | ||||
| -rw-r--r-- | layouts/default.html | 14 |
2 files changed, 4 insertions, 29 deletions
diff --git a/layouts/banner.html b/layouts/banner.html index 05aa2edf..f45134aa 100644 --- a/layouts/banner.html +++ b/layouts/banner.html @@ -1,20 +1,3 @@ -<% -banner_raw = @items["/_data/banner.yaml"][:description] -%> <% if show_banner? and !stable_version?(current_branch) %> -<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 gl-text-center gl-mt-6 gl-mb-0 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, 'gl-mx-3') %> - <button type="button" class="close gl-mt-n2" data-dismiss="alert" aria-label="Close"> - <span aria-hidden="true">×</span> - </button> - </div> - </div> - </div> - <script type="application/javascript" src="<%= @items['/assets/javascripts/banner.*'].path %>"></script> -</div> + <div id="js-survey-banner" data-content='<%= html_escape(markdown(@items["/_data/banner.yaml"][:description])) %>'></div> <% end %> diff --git a/layouts/default.html b/layouts/default.html index bd58ab9c..4e1d66ab 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -5,8 +5,9 @@ <%= render '/head.*' %> <%= render '/canonical_urls.*' %> </head> - <body itemscope itemtype="http://schema.org/WebPage" data-spy="scroll" data-target="#doc-nav" data-offset="90"> + <body itemscope itemtype="http://schema.org/WebPage" data-spy="scroll" data-target="#doc-nav" data-offset="90" <% if show_version_banner? %>class="has-archive-banner"<% end %>> <%= render '/header.*' %> + <% if show_version_banner? %><div id="js-version-banner"></div><% end %> <section class="gl-docs container-fluid"> <div class="row"> <div class="col-0 col-xl-2 pl-0"> @@ -21,16 +22,7 @@ </div> </div> <div class="main pl-xl-4 wrapper js-main-wrapper col-12 col-xl-7"> - <div class="row"> - <div class="col"> - <div id="js-version-banner" <%= 'data-is-outdated' if show_version_banner? %> data-latest-version-url='<%= @item.identifier.without_ext + '.html' %>' data-archives-url="/archives/"></div> - </div> - </div> - <div class="row"> - <div class="col"> - <%= render '/banner.*' %> - </div> - </div> + <%= render '/banner.*' %> <div class="row"> <div class="col"> <div class="mobile-toggle-wrapper gl-mt-7"> |