diff options
| author | David O'Regan <doregan@gitlab.com> | 2022-05-13 18:06:58 +0300 |
|---|---|---|
| committer | David O'Regan <doregan@gitlab.com> | 2022-05-13 18:06:58 +0300 |
| commit | e638c93782b685763c0ac519b7f430551718ac27 (patch) | |
| tree | 32f73d90cb75cacb4ae471fd91371ca7d21d82f0 | |
| parent | 263feacaaa8ec186968cd6b8b17b1ef0fcb6e709 (diff) | |
| parent | 0bad3ed9877ad8e52733c7c09f9c55338e0af38e (diff) | |
Merge branch '987-follups-navbar' into 'main'
Homepage CSS follow-ups: navbar
See merge request gitlab-org/gitlab-docs!2647
| -rw-r--r-- | content/assets/stylesheets/_landing.scss | 2 | ||||
| -rw-r--r-- | content/assets/stylesheets/stylesheet.scss | 17 | ||||
| -rw-r--r-- | layouts/header.html | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/content/assets/stylesheets/_landing.scss b/content/assets/stylesheets/_landing.scss index 6414210c..a96461ae 100644 --- a/content/assets/stylesheets/_landing.scss +++ b/content/assets/stylesheets/_landing.scss @@ -1,5 +1,5 @@ --- -version: 10 +version: 11 --- @import 'variables'; diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss index 670cf01c..2155b1b3 100644 --- a/content/assets/stylesheets/stylesheet.scss +++ b/content/assets/stylesheets/stylesheet.scss @@ -313,12 +313,29 @@ ol { .dropdown-toggle { background-color: $help-indigo-500; + svg { + fill: $white; + margin-right: 0 !important; + } + &::after { + display: none; + } } @media all and (max-width: $bp-md) { .btn { width: 100%; } + .navbar-toggler { + border: 0; + } + .navbar-toggler-icon { + background-color: $theme-indigo-200; + /* https://caniuse.com/css-masks */ + /* stylelint-disable property-no-vendor-prefix */ + mask: url('/assets/images/ellipsis_h.svg') no-repeat center; + -webkit-mask: url('/assets/images/ellipsis_h.svg') no-repeat center; + } } } diff --git a/layouts/header.html b/layouts/header.html index 742f0b1e..f22633c4 100644 --- a/layouts/header.html +++ b/layouts/header.html @@ -25,7 +25,7 @@ <ul class="navbar-nav mb-0"> <li class="nav-item p-2 dropdown"> <button class="btn dropdown-toggle text-white" type="button" id="navbarDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <%= version_dropdown_title %> + <%= version_dropdown_title %><%= icon('chevron-down') %> </button> <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" <%= active_dropdown(ENV['CI_DEFAULT_BRANCH']) %> href='<%= @item.identifier.without_ext + '.html' %>' class="versions-tooltip"><%= dotcom %> |