diff options
author | Evan Read <eread@gitlab.com> | 2021-06-11 04:47:45 +0300 |
---|---|---|
committer | Suzanne Selhorn <sselhorn@gitlab.com> | 2021-06-11 04:47:45 +0300 |
commit | 4f297835f206c7ba0ce827eeb8422a87a25cc128 (patch) | |
tree | f9be9c119623e464ae8fd6d63cd8f6ec26265647 | |
parent | f44a8110f51ae09becfb0a9a756f0e491a923cf4 (diff) |
Remove breadcrumbs from published docs
-rw-r--r-- | content/assets/stylesheets/_breadcrumbs.scss | 98 | ||||
-rw-r--r-- | content/assets/stylesheets/_sidebar.scss | 2 | ||||
-rw-r--r-- | content/assets/stylesheets/_typography.scss | 4 | ||||
-rw-r--r-- | content/assets/stylesheets/stylesheet.scss | 3 | ||||
-rw-r--r-- | content/assets/stylesheets/toc.scss | 9 | ||||
-rw-r--r-- | layouts/breadcrumbs.html | 24 | ||||
-rw-r--r-- | layouts/default.html | 1 | ||||
-rw-r--r-- | nanoc.yaml | 2 |
8 files changed, 11 insertions, 132 deletions
diff --git a/content/assets/stylesheets/_breadcrumbs.scss b/content/assets/stylesheets/_breadcrumbs.scss deleted file mode 100644 index 55c96591..00000000 --- a/content/assets/stylesheets/_breadcrumbs.scss +++ /dev/null @@ -1,98 +0,0 @@ ---- -version: 1 ---- - -@import 'variables'; -@import 'mixins/breakpoints'; - -.gl-breadcrumbs { - font-size: 0.75rem; - grid-area: breadcrumbs; - - @media all and (max-width: $bp-xl) { - border-bottom: 0; - margin: 1rem 0; - padding: 0; - } - - @media all and (max-width: $bp-lg) { - padding-top: 1rem; - } - - img { - display: inline; - height: 0.938rem; - width: 0.938rem; - } - - border-width: 0; - padding: 2rem 0 1rem; -} - -.gl-breadcrumb-list { - background-color: transparent; - padding: 0; - align-items: center; - line-height: 1rem; - margin: 0; -} - -@media (max-width: $bp-xs) { - .gl-breadcrumb-list { - flex-wrap: wrap; - } -} - -.gl-breadcrumb-separator { - margin-top: -0.6rem; -} - -.gl-breadcrumb-separator>svg { - margin: auto 0.5rem; - width: 0.5rem; - color: $gds-gray-1000; - fill: currentColor; -} - -.gl-breadcrumb-avatar-tile { - margin-right: 0.25rem; - margin-top: 0.1rem; - margin-bottom: 0.2rem; - border: 1px solid $help-gray-200; - border-radius: 50%; -} - -@media (max-width: $bp-md) { - .gl-breadcrumb-avatar-tile { - margin-left: 2rem; - } -} - -.gl-breadcrumb-item { - font-size: 0.75rem; - line-height: 1rem; - - a { - border-bottom: 0; - } -} - -.gl-breadcrumb-item>a { - color: $gds-gray-1000; -} - -@media (max-width: 575.98px) { - .gl-breadcrumb-item>a { - display: inline-block; - overflow: hidden; - text-overflow: ellipsis; - vertical-align: top; - white-space: nowrap; - max-width: 8rem; - } -} - -.gl-breadcrumb-item:last-child { - color: $gds-gray-950; - font-weight: 600; -} diff --git a/content/assets/stylesheets/_sidebar.scss b/content/assets/stylesheets/_sidebar.scss index e86c7780..dfad35a8 100644 --- a/content/assets/stylesheets/_sidebar.scss +++ b/content/assets/stylesheets/_sidebar.scss @@ -17,7 +17,7 @@ version: 2 } } .global-nav-content { - margin-top: 85px; + margin-top: 60px; margin-bottom: 70px; } a { diff --git a/content/assets/stylesheets/_typography.scss b/content/assets/stylesheets/_typography.scss index 0d64f354..3c5b27e6 100644 --- a/content/assets/stylesheets/_typography.scss +++ b/content/assets/stylesheets/_typography.scss @@ -1,5 +1,5 @@ --- -version: 8 +version: 9 --- @import 'variables'; @@ -376,11 +376,11 @@ version: 8 h1 { color: $theme-indigo-900; font-weight: 600; - margin-top: 0; text-transform: none; font-size: 2rem; line-height: 1; margin-bottom: 1.5rem; + margin-top: 3.3rem; } @media screen and (min-width: $bp-sm) { h1 { diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss index 8c84e906..dc39a866 100644 --- a/content/assets/stylesheets/stylesheet.scss +++ b/content/assets/stylesheets/stylesheet.scss @@ -1,5 +1,5 @@ --- -version: 113 +version: 114 --- @import 'variables'; @@ -9,7 +9,6 @@ version: 113 @import 'mixins'; @import 'base'; @import 'tables'; -@import 'breadcrumbs'; @import 'sidebar'; @import 'typography'; diff --git a/content/assets/stylesheets/toc.scss b/content/assets/stylesheets/toc.scss index 669a6584..a43e3129 100644 --- a/content/assets/stylesheets/toc.scss +++ b/content/assets/stylesheets/toc.scss @@ -1,5 +1,5 @@ --- -version: 20 +version: 21 --- @import 'variables'; @import 'utilities'; @@ -10,8 +10,7 @@ $nav-link-font-size: 0.875rem; // ToC styles .table-of-contents { - padding: 1rem 1rem 0; - margin-top: 35px; + padding: 0.5rem 1rem 0; li { list-style: none; @@ -55,6 +54,10 @@ $nav-link-font-size: 0.875rem; overflow-y: scroll; height: 100vh; } + + @media(max-width: $bp-lg) { + margin-top: 7rem; + } } .nav-pills { diff --git a/layouts/breadcrumbs.html b/layouts/breadcrumbs.html deleted file mode 100644 index 48957f17..00000000 --- a/layouts/breadcrumbs.html +++ /dev/null @@ -1,24 +0,0 @@ -<% if @config[:breadcrumbs] %> - <% ancestor_array = ancestor_path_array(@item) unless ancestor_path_array(@item).empty? %> - <% if ancestor_array %> - <div class="gl-breadcrumbs d-flex w-100"> - <img src="https://assets.gitlab-static.net/uploads/-/system/group/avatar/9970/logo-extra-whitespace.png?width=15" class="gl-breadcrumb-avatar-tile" alt=""> - <ol class="breadcrumb gl-breadcrumb-list ml-1 mt-0 pl-0"> - <% ancestor_array.reverse_each do |item| %> - <% if !item[:title].empty? %> - <li class="gl-breadcrumb-item"><%= link_to item.key?(:title) ? "#{item[:title]}" : "Breadcrumb", item %></li> - <span data-testid="separator" class="gl-breadcrumb-separator"><svg viewBox="0 0 16 16"><path d="M9.9 8.064L5.656 3.821A1 1 0 0 1 7.07 2.407l4.95 4.95a1 1 0 0 1 0 1.414l-4.95 4.95a1 1 0 0 1-1.414-1.414l4.242-4.243z" fill-rule="evenodd"></path></svg></span> - <% end %> - <% end %> - <li class="gl-breadcrumb-item"><%= @item.key?(:title) ? "#{@item[:title]}" : "Current page" %></li> - </ol> - </div> - <% else %> - <div class="gl-breadcrumbs d-flex w-100"> - <img src="https://assets.gitlab-static.net/uploads/-/system/group/avatar/9970/logo-extra-whitespace.png?width=15" class="gl-breadcrumb-avatar-tile" width="15" height="15"> - <ol class="breadcrumb gl-breadcrumb-list ml-1 mt-0 pl-0"> - <li class="gl-breadcrumb-item"><%= @item.key?(:title) ? "#{@item[:title]}" : "Current page" %></li> - </ol> - </div> - <% end %> -<% end %>
\ No newline at end of file diff --git a/layouts/default.html b/layouts/default.html index 939a6583..9352a7d2 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -37,7 +37,6 @@ <div class="col"> <div class="my-3 my-lg-0"> <a class="position-absolute text-muted mt-2 pt-1 text-decoration-none border-bottom-0 mobile-nav-toggle" href="#"><i class="fa fa-bars fa-lg" aria-hidden="true"></i> | </a> - <%= render '/breadcrumbs.*' %> </div> </div> </div> @@ -114,7 +114,7 @@ checks: # Some links require authentication, but we want to keep them in development docs - 'https:\/\/dashboards.gitlab.com\/.*' -breadcrumbs: true +breadcrumbs: false debug: false # Control display of survey banner. See README.md#survey-banner |