diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-04 11:07:11 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-04 11:07:11 +0300 |
| commit | ab8e0d00efe7daf339c7a1bd1399881811d6526d (patch) | |
| tree | 0b6abc186025d495622e6d15f55e94d8f9844230 | |
| parent | 2e642d1567b286a06b8e610788dc5502686f2aaf (diff) | |
| parent | afaa8214efca00e45026c10165985af83a6bc635 (diff) | |
Merge branch 'global-nav-safari-fix' into 'master'
Fixed global nav not sticking in FF & Safari
Closes #299 and #303
See merge request gitlab-com/gitlab-docs!377
| -rw-r--r-- | layouts/default.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/layouts/default.html b/layouts/default.html index 48b1a824..5dde8756 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -67,7 +67,6 @@ <script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script> <script type="application/javascript" src="<%= @items['/assets/javascripts/clipboardjs.*'].path %>"></script> <script type="application/javascript" src="<%= @items['/assets/javascripts/badges.*'].path %>"></script> - <script async src="<%= @items['/assets/javascripts/docs.*'].path %>"></script> <%= render '/docsearch.*' %> <%= render '/https_redirect.*' %> <% if ENV['NANOC_ENV'] == 'production' %> @@ -78,5 +77,6 @@ <script type="application/javascript" src="<%= @items['/assets/javascripts/table-display-block.*'].path %>"></script> <% end %> <%= render '/footer.*' %> + <script src="<%= @items['/assets/javascripts/docs.*'].path %>"></script> </body> </html> |