Commit a6042a2d authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'list-items' into 'master'

Remove div between ul and li

## What does this MR do?
Adds `container_class`to `ul` instead of `div` for valid HTML

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4592#note_12420843



See merge request !4633
parents 84138691 a9dd1bee
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
.container-fluid { .container-fluid {
background-color: $background-color; background-color: $background-color;
margin-bottom: 0;
} }
li { li {
......
.scrolling-tabs-container .scrolling-tabs-container
%ul.nav-links.sub-nav.scrolling-tabs .nav-links.sub-nav.scrolling-tabs
%div{ class: (container_class) } %ul{ class: (container_class) }
.fade-left .fade-left
= nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
= link_to project_files_path(@project) do = link_to project_files_path(@project) do
......
%ul.nav-links.sub-nav .nav-links.sub-nav
%div{ class: (container_class) } %ul{ class: (container_class) }
- if project_nav_tab?(:issues) && !current_controller?(:merge_requests) - if project_nav_tab?(:issues) && !current_controller?(:merge_requests)
= nav_link(controller: :issues) do = nav_link(controller: :issues) do
= link_to url_for_project_issues(@project, only_path: true), title: 'Issues' do = link_to url_for_project_issues(@project, only_path: true), title: 'Issues' do
......
%ul.nav-links.sub-nav .nav-links.sub-nav
%div{ class: (container_class) } %ul{ class: (container_class) }
- if project_nav_tab? :pipelines - if project_nav_tab? :pipelines
= nav_link(controller: :pipelines) do = nav_link(controller: :pipelines) do
= link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment