diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2020-08-20 10:25:23 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2020-08-20 10:25:23 +0300 |
| commit | 7ca8164901bcf07e9c4a9ff4ce028cc93098ef66 (patch) | |
| tree | 5f16d97c7a86749bdcf3553b54237558ef9edf3f /layouts | |
| parent | c99cdb5894fda30d038387d7f87fed2379ffb2e9 (diff) | |
| parent | 9fb6cb6a8b53532dbd1bd2fc1822270a11486854 (diff) | |
Merge branch '828-bootstrap-utilities' into 'master'
Use Bootstrap 4 utilities and remove unused selectors
Closes #828
See merge request gitlab-org/gitlab-docs!1071
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/404.html | 2 | ||||
| -rw-r--r-- | layouts/archives.html | 2 | ||||
| -rw-r--r-- | layouts/default.html | 2 | ||||
| -rw-r--r-- | layouts/header.html | 4 | ||||
| -rw-r--r-- | layouts/instantsearch.html | 2 | ||||
| -rw-r--r-- | layouts/nav-item.html | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/layouts/404.html b/layouts/404.html index f43a4f86..d5cb7c20 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -8,7 +8,7 @@ </head> <body> <%= render '/header.*' %> - <div class="wrapper d-flex justify-center"> + <div class="wrapper d-flex justify-content-center"> <div class="main class"> <%= yield %> <%= render '/footer.*' %> diff --git a/layouts/archives.html b/layouts/archives.html index a20cc5f8..0b0aab27 100644 --- a/layouts/archives.html +++ b/layouts/archives.html @@ -7,7 +7,7 @@ <%= render '/gtm.*' %> <%= render '/header.*' %> <div id="js-banner"></div> - <div class="wrapper d-flex justify-center"> + <div class="wrapper d-flex justify-content-center"> <div class="doc-nav"></div> <div class="main class js-main-wrapper"> <div class="js-article-content"> diff --git a/layouts/default.html b/layouts/default.html index f3ffdb72..ebe5fb4e 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -9,7 +9,7 @@ <%= render '/header.*' %> <div id="js-version-banner" <%= 'data-is-outdated' if show_version_banner? %> data-latest-version-url="<%= @item.identifier.without_ext + '.html' %>" data-archives-url="/archives/"></div> - <div class="wrapper d-flex justify-center"> + <div class="wrapper d-flex justify-content-center"> <div class="nav-wrapper active"> <aside id="global-nav" class="global-nav"> <% if ENV['CI_PROJECT_NAME'] == 'gitlab-docs' or ENV['CI_PROJECT_NAME'].nil? %> diff --git a/layouts/header.html b/layouts/header.html index 81a18fca..c78de7da 100644 --- a/layouts/header.html +++ b/layouts/header.html @@ -1,6 +1,6 @@ <div class="header"> - <div class="flex-container align-center"> - <a class="header-link logo-container flex-container justify-center align-center" href="/"> + <div class="d-flex align-items-center"> + <a class="header-link logo-container d-flex justify-content-center align-items-center" href="/"> <img src="<%= @items['/assets/images/gitlab-logo.svg'].path %>" class="logo" /> <p><span class="header-company-name">GitLab </span><strong>Docs</strong></p> </a> diff --git a/layouts/instantsearch.html b/layouts/instantsearch.html index 2bf770b2..7765be14 100644 --- a/layouts/instantsearch.html +++ b/layouts/instantsearch.html @@ -8,7 +8,7 @@ <body> <%= render '/gtm.*' %> <%= render '/header.*' %> - <div class="wrapper d-flex justify-center"> + <div class="wrapper d-flex justify-content-center"> <div class="doc-nav"></div> <div class="main class instantsearch-input"> <%= yield %> diff --git a/layouts/nav-item.html b/layouts/nav-item.html index 44575abe..12cc0c9d 100644 --- a/layouts/nav-item.html +++ b/layouts/nav-item.html @@ -1,5 +1,5 @@ <li class="nav-item"> - <a class="header-link nav-item flex-container align-center" href="<%= @items["/#{product[:slug]}/#{product[:index_file]}"].path %>"> + <a class="header-link nav-item f-flex align-items-center" href="<%= @items["/#{product[:slug]}/#{product[:index_file]}"].path %>"> <p><%= product[:short_name] %></p> </a> </li> |