diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/404.html | 2 | ||||
| -rw-r--r-- | layouts/archives.html | 2 | ||||
| -rw-r--r-- | layouts/breadcrumbs.html | 6 | ||||
| -rw-r--r-- | layouts/default.html | 4 | ||||
| -rw-r--r-- | layouts/footer.html | 7 | ||||
| -rw-r--r-- | layouts/header.html | 14 | ||||
| -rw-r--r-- | layouts/instantsearch.html | 2 | ||||
| -rw-r--r-- | layouts/redirect.html | 2 |
8 files changed, 20 insertions, 19 deletions
diff --git a/layouts/404.html b/layouts/404.html index 9749cac9..3b91b156 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -6,7 +6,7 @@ <link rel="canonical" href="<%= @config[:base_url] %>/404.html"> <link rel="stylesheet" href="<%= @items['/assets/stylesheets/404.*'].path %>"> </head> - <body> + <body class="gl-markdown"> <%= render '/header.*' %> <section class="container"> <div class="row"> diff --git a/layouts/archives.html b/layouts/archives.html index 3728b4ea..3b345a2d 100644 --- a/layouts/archives.html +++ b/layouts/archives.html @@ -3,7 +3,7 @@ <head> <%= render '/head.*' %> </head> -<body> +<body class="gl-markdown"> <%= render '/gtm.*' %> <%= render '/header.*' %> <div id="js-banner"></div> diff --git a/layouts/breadcrumbs.html b/layouts/breadcrumbs.html index baa2d8bc..48957f17 100644 --- a/layouts/breadcrumbs.html +++ b/layouts/breadcrumbs.html @@ -2,8 +2,8 @@ <% 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" width="15" height="15" alt=""> - <ol class="breadcrumb gl-breadcrumb-list ml-1"> + <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> @@ -16,7 +16,7 @@ <% 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"> + <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> diff --git a/layouts/default.html b/layouts/default.html index 83556510..ce00ca61 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -6,7 +6,7 @@ <%= render '/head.*' %> <%= render '/canonical_urls.*' %> </head> - <body itemscope itemtype="http://schema.org/WebPage" data-spy="scroll" data-target="#doc-nav" data-offset="90"> + <body class="gl-markdown" itemscope itemtype="http://schema.org/WebPage" data-spy="scroll" data-target="#doc-nav" data-offset="90"> <%= render '/gtm.*' %> <%= render '/header.*' %> <section class="container-fluid pt-5"> @@ -36,7 +36,7 @@ <div class="row"> <div class="col"> <div class="my-3 my-lg-0"> - <a class="position-absolute text-muted mt-2 pt-1 text-decoration-none mobile-nav-toggle" href="#"><i class="fa fa-bars fa-lg" aria-hidden="true"></i> | </a> + <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> diff --git a/layouts/footer.html b/layouts/footer.html index 36d5e657..89e3fd3d 100644 --- a/layouts/footer.html +++ b/layouts/footer.html @@ -1,6 +1,7 @@ -<footer class="pl-4 pr-3 border-top footer"> +<footer class="px-3 border-top footer"> <div class="row py-2"> <div class="col-9"> + <img src="/assets/images/gitlab-logo.svg" alt="" aria-hidden="true" role="img"> </div> <div class="col-3 p-0 m-0"> <div class="d-none d-md-flex justify-content-end"> @@ -51,7 +52,7 @@ <p class="text-muted"> View <a href="<%= edit_on_gitlab(@item) %>" target="_blank" rel="noopener noreferrer"><span class="text-decoration-underline">page source</span></a> - Edit in <a href="<%= edit_on_gitlab(@item, editor: :webide) %>" target="_blank" rel="noopener noreferrer"><span class="text-decoration-underline">Web IDE</span></a> - <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank" rel="license noopener noreferrer"><img src="<%= @items['/assets/images/by-sa.svg'].path %>" alt="Creative Commons License"></a> + <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank" rel="license noopener noreferrer"><img class="d-inline pl-3" src="<%= @items['/assets/images/by-sa.svg'].path %>" alt="Creative Commons License"></a> </p> </div> </div> @@ -74,4 +75,4 @@ </ul> </div> </div> -</footer> +</footer>
\ No newline at end of file diff --git a/layouts/header.html b/layouts/header.html index b622ff10..343ad61f 100644 --- a/layouts/header.html +++ b/layouts/header.html @@ -7,12 +7,12 @@ <span class="navbar-toggler-icon"></span> </button> <div class="collapse navbar-collapse" id="navbarSupportedContent"> - <ul class="navbar-nav mr-auto"> + <ul class="navbar-nav mr-auto mb-0"> <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> + <span class="fa fa-search form-control-feedback position-absolute ml-3 text-muted"></span> <input class="form-control mr-sm-2 docsearch border-0" name="query" type="search" placeholder="Search the docs..." aria-label="Search"> <input type="submit" style="visibility: hidden; position:absolute;" /> </form> @@ -20,7 +20,7 @@ <% end %> </li> </ul> - <ul class="navbar-nav"> + <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 %> @@ -51,10 +51,10 @@ </li> <li class="nav-item p-2"> <% if @item.identifier.to_s.split('/')[1] == 'omnibus' %> - <%= render '/cta_omnibus.*' %> - <% else %> - <%= render '/cta.*' %> - <% end %> + <%= render '/cta_omnibus.*' %> + <% else %> + <%= render '/cta.*' %> + <% end %> </li> </ul> </div> diff --git a/layouts/instantsearch.html b/layouts/instantsearch.html index a40f2c18..fd590ac9 100644 --- a/layouts/instantsearch.html +++ b/layouts/instantsearch.html @@ -5,7 +5,7 @@ <link rel="canonical" href="<%= @config[:base_url] %>/search/"> <%= render '/instantsearch-head.*' %> </head> - <body> + <body class="gl-markdown"> <%= render '/gtm.*' %> <%= render '/header.*' %> <section class="container"> diff --git a/layouts/redirect.html b/layouts/redirect.html index e0ca9179..be8b06df 100644 --- a/layouts/redirect.html +++ b/layouts/redirect.html @@ -16,7 +16,7 @@ <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,400italic' rel='stylesheet' type='text/css'> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> </head> - <body> + <body class="gl-markdown"> <%= render '/header.*' %> <div class="wrapper pt-5"> <div id="doc-nav" class="doc-nav"></div> |