diff options
| -rw-r--r-- | content/assets/stylesheets/stylesheet.scss | 59 | ||||
| -rw-r--r-- | layouts/cta.html | 2 | ||||
| -rw-r--r-- | layouts/cta_omnibus.html | 2 | ||||
| -rw-r--r-- | layouts/header.html | 50 |
4 files changed, 33 insertions, 80 deletions
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss index b9819725..955cd250 100644 --- a/content/assets/stylesheets/stylesheet.scss +++ b/content/assets/stylesheets/stylesheet.scss @@ -1,5 +1,5 @@ --- -version: 96 +version: 97 --- @import "variables"; @@ -164,12 +164,6 @@ pre { } } -.gitlab-embed-snippets { - .clip-btn { - display: none; - } -} - code, code span { font-family: $mono-font-family; @@ -584,11 +578,8 @@ h6 { } .collapse-toggle { cursor: pointer; - float: right; - width: 26px; - height: 36px; display: flex; - padding-right: 10px; + padding-right: 1rem; align-items: center; justify-content: center; &::after { @@ -629,8 +620,8 @@ h6 { } .global-nav-link { - line-height: 1.25; - font-size: 14px; + line-height: 1rem; + font-size: .875rem; width: 100%; } @@ -1257,48 +1248,6 @@ li { overflow: auto; } -.half-width { - width: 50%; - @media all and (max-width: $sm-width) { - width: 100%; - } -} - -.width-60 { - width: 60%; - @media all and (max-width: $sm-width) { - width: 100%; - } -} - -.width-70 { - width: 70%; - @media all and (max-width: $sm-width) { - width: 100%; - } -} - -.width-75 { - width: 75%; - @media all and (max-width: $sm-width) { - width: 100%; - } -} - -.width-80 { - width: 80%; - @media all and (max-width: $sm-width) { - width: 100%; - } -} - -.width-90 { - width: 90%; - @media all and (max-width: $sm-width) { - width: 100%; - } -} - .banner { z-index: 5; line-height: 2; diff --git a/layouts/cta.html b/layouts/cta.html index 54664e64..cf677ce1 100644 --- a/layouts/cta.html +++ b/layouts/cta.html @@ -1,3 +1,3 @@ -<a class="btn btn-danger text-white mb-2 mb-lg-0" href="https://about.gitlab.com/free-trial/" target="_blank" rel="noopener noreferrer" role="button"> +<a class="btn btn-danger text-white" href="https://about.gitlab.com/free-trial/" target="_blank" rel="noopener noreferrer" role="button"> Get free trial </a> diff --git a/layouts/cta_omnibus.html b/layouts/cta_omnibus.html index 23a00fcd..35fecfeb 100644 --- a/layouts/cta_omnibus.html +++ b/layouts/cta_omnibus.html @@ -1,3 +1,3 @@ -<a class="btn btn-danger text-white mb-2 mb-lg-0" href="https://about.gitlab.com/free-trial/self-managed/" target="_blank" rel="noopener noreferrer" role="button"> +<a class="btn btn-danger text-white" href="https://about.gitlab.com/free-trial/self-managed/" target="_blank" rel="noopener noreferrer" role="button"> Get free trial </a>
\ No newline at end of file diff --git a/layouts/header.html b/layouts/header.html index 436577cc..1bac258e 100644 --- a/layouts/header.html +++ b/layouts/header.html @@ -7,21 +7,21 @@ <span class="navbar-toggler-icon"></span> </button> <div class="collapse navbar-collapse" id="navbarSupportedContent"> - <ul class="navbar-nav mr-auto"> - <li class="nav-item active"> - <% if @item[:searchbar].nil? %> - <% unless @item.identifier.to_s.split('/')[1] == 'search' %> - <form class="form-inline my-2 my-lg-0" id="search-form" action="/search/" method="get"> - <span class="fa fa-search form-control-feedback position-absolute ml-2 text-muted"></span> - <input class="form-control mr-sm-2 docsearch" name="query" type="search" placeholder="Search the docs..." aria-label="Search"> - <input type="submit" style="visibility: hidden; position:absolute;" /> - </form> + <ul class="navbar-nav mr-auto"> + <li class="nav-item active"> + <% if @item[:searchbar].nil? %> + <% unless @item.identifier.to_s.split('/')[1] == 'search' %> + <form class="form-inline my-2 my-lg-0" id="search-form" action="/search/" method="get"> + <span class="fa fa-search form-control-feedback position-absolute ml-2 text-muted"></span> + <input class="form-control mr-sm-2 docsearch" name="query" type="search" placeholder="Search the docs..." aria-label="Search"> + <input type="submit" style="visibility: hidden; position:absolute;" /> + </form> + <% end %> <% end %> - <% end %> - </li> - </ul> - <ul class="navbar-nav mr-0 mr-lg-3 my-2 my-lg-0"> - <li class="nav-item dropdown"> + </li> + </ul> + <ul class="navbar-nav"> + <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 %> </button> @@ -36,23 +36,27 @@ <%= render '/partials/versions_list.*', version: version %> <% end %> <!-- End of online versions --> - + <!-- Start of last major versions --> <div class="dropdown-divider"></div> <% data_versions[:previous_majors].each do |version| %> <%= render '/partials/versions_list.*', version: version %> <% end %> <!-- End of last major versions --> - <% end %> - <div class="dropdown-divider"></div> - <a class="dropdown-item" <%= active_dropdown('archives') %> href='/archives/'>Archives</a> + + <% end %> + <div class="dropdown-divider"></div> + <a class="dropdown-item" <%= active_dropdown('archives') %> href='/archives/'>Archives</a> </div> </li> + <li class="nav-item p-2"> + <% if @item.identifier.to_s.split('/')[1] == 'omnibus' %> + <%= render '/cta_omnibus.*' %> + <% else %> + <%= render '/cta.*' %> + <% end %> + </li> </ul> - <% if @item.identifier.to_s.split('/')[1] == 'omnibus' %> - <%= render '/cta_omnibus.*' %> - <% else %> - <%= render '/cta.*' %> - <% end %> </div> </nav> + |