diff options
| author | Suzanne Selhorn <sselhorn@gitlab.com> | 2021-11-22 21:55:05 +0300 |
|---|---|---|
| committer | Suzanne Selhorn <sselhorn@gitlab.com> | 2021-11-22 21:55:05 +0300 |
| commit | 2b7e91ebcfaeed7267d5bb6a81972d0e6ed5be78 (patch) | |
| tree | 6249aa90a2de12be053996e29d325a4ffa58c976 | |
| parent | abf0539e15873465fb11bd5cd137e6712b5be877 (diff) | |
| parent | 647bfe6d32b6cc771d2d5940cd27652b7fd6dd66 (diff) | |
Merge branch '1094-scroll-header' into 'main'
feat: allow sticky header
Closes #1094
See merge request gitlab-org/gitlab-docs!2273
| -rw-r--r-- | content/assets/stylesheets/_tables.scss | 4 | ||||
| -rw-r--r-- | layouts/default.html | 2 | ||||
| -rw-r--r-- | layouts/header.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/content/assets/stylesheets/_tables.scss b/content/assets/stylesheets/_tables.scss index c728f7d4..fc7755d3 100644 --- a/content/assets/stylesheets/_tables.scss +++ b/content/assets/stylesheets/_tables.scss @@ -1,5 +1,5 @@ --- -version: 5 +version: 6 --- @import 'variables'; @@ -53,7 +53,7 @@ table { position: sticky; vertical-align: top; z-index: 1; - top: 0; + top: $header-height; box-shadow: 0 3px 0 0 var(--color-auto-gray-4); padding: 12px 8px; border: 0; diff --git a/layouts/default.html b/layouts/default.html index f04a5daf..49da148d 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -8,7 +8,7 @@ <body itemscope itemtype="http://schema.org/WebPage" data-spy="scroll" data-target="#doc-nav" data-offset="90"> <%= render '/gtm.*' %> <%= render '/header.*' %> - <section class="gl-docs container-fluid"> + <section class="gl-docs container-fluid mt-5"> <div class="row"> <div class="col-0 col-xl-2 pl-0"> <div class="nav-wrapper active"> diff --git a/layouts/header.html b/layouts/header.html index 1eecbf54..5c1b3130 100644 --- a/layouts/header.html +++ b/layouts/header.html @@ -1,4 +1,4 @@ -<nav class="navbar navbar-expand-md navbar-dark py-lg-0"> +<nav class="navbar navbar-expand-md navbar-dark py-lg-0 fixed-top"> <a class="navbar-brand d-flex align-items-center justify-content-center" href="/"> <img src="<%= @items['/assets/images/gitlab-logo.svg'].path %>" alt="GitLab documentation home" class="logo" /> <span class="d-none d-lg-block px-2">GitLab</span> <strong class="pl-2 pl-lg-0 pt-0">Docs</strong> |