diff options
| author | David O'Regan <doregan@gitlab.com> | 2022-12-05 03:45:27 +0300 |
|---|---|---|
| committer | David O'Regan <doregan@gitlab.com> | 2022-12-05 03:45:27 +0300 |
| commit | 641f78ef7ed2114b23b245bd4cd2a75d8dec1378 (patch) | |
| tree | bf77267fea59c9e7f565099bd6a2368b809010c9 | |
| parent | 4e8dfa5af783c14cd1f92d12fd766ad40f734f71 (diff) | |
| parent | 492478f8147893d798e62ee3be6b9bccb8903648 (diff) | |
Merge branch 'sarahg/fast404' into 'main'
Simplify 404 page
Closes #1326
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3331
Merged-by: David O'Regan <doregan@gitlab.com>
Approved-by: David O'Regan <doregan@gitlab.com>
Co-authored-by: Sarah German <sgerman@gitlab.com>
| -rw-r--r-- | content/404.html | 26 | ||||
| -rw-r--r-- | layouts/404.html | 14 |
2 files changed, 14 insertions, 26 deletions
diff --git a/content/404.html b/content/404.html index f400f826..51ea4257 100644 --- a/content/404.html +++ b/content/404.html @@ -3,23 +3,15 @@ title: Page Not Found | GitLab Documentation searchbar: false --- -<div class="four-oh-four gl-text-center gl-display-flex gl-justify-content-center"> +<div class="four-oh-four gl-docs gl-text-center gl-display-flex gl-justify-content-center"> <div> - <img src="<%= @items['/assets/images/error-404.svg'].path %>" width="300" alt="" class="gl-m-auto" /> - <h1 class="gl-text-theme-indigo-900">We're sorry, no page exists at this address.</h1> - <p>To search an older version of the docs, <a href="https://docs.gitlab.com/archives">access an archive</a>.</p> - - <% if @config[:algolia] == "true" %> - <div class="search-card gl-w-70p gl-pt-6 gl-pb-7 gl-mt-7 gl-mx-auto gl-rounded-lg"> - <h3 class="gl-mb-5 gl-text-theme-indigo-900">Search the docs</h3> - <div id="docsearch" class="gl-display-flex gl-justify-content-center"></div> - </div> - <% end %> - - <div class="gl-mt-8 gl-mb-11"> - <a href="javascript:history.back()" class="back-btn gl-py-3 gl-px-4 gl-text-purple-600 gl-rounded-small gl-border gl-border-purple-700 gl-transition-slow"> - <%= icon('arrow-left') %>Go back - </a> - </div> + <h1 class="gl-font-size-h1-xl! gl-mt-3!">We're sorry, no page exists at this address.</h1> + <ul class="gl-list-style-none gl-pl-0"> + <li class="gl-display-inline-block"><a href="https://docs.gitlab.com/search/">Search the latest docs</a></li> + • + <li class="gl-display-inline-block"><a href="https://docs.gitlab.com/ee/">Browse the latest docs</a></li> + • + <li class="gl-display-inline-block"><a href="https://docs.gitlab.com/archives/">Access older docs</a></li> + </ul> </div> </div> diff --git a/layouts/404.html b/layouts/404.html index fc54df78..f638d150 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -7,20 +7,16 @@ </head> <body> <%= render '/header.*' %> - <section class="container-fluid mt-5 pt-5"> + <section class="container-fluid"> <div class="row"> - <div class="col-12"> - <%= yield %> + <div class="col-12 gl-h-100vh gl-display-flex gl-flex-direction-column"> + <main class="gl-mt-5 gl-flex-grow-1 gl-flex-shrink-0"><%= yield %></main> <%= render '/footer.*' %> + </div> </div> - </div> - </section> + </section> <script src="<%= @items['/frontend/shared/global_imports.*'].path %>"></script> - <% if @config[:algolia] == "true" %> - <script src="<%= @items['/frontend/search/docsearch.*'].path %>"></script> - <% end %> - <% if production? %> <%# Add analytics only in production %> <%= render '/analytics.*' %> |