diff options
| author | Ryan Harris <harrisryan1@gmail.com> | 2017-01-07 22:16:37 -0500 |
|---|---|---|
| committer | Ryan Harris <harrisryan1@gmail.com> | 2017-01-24 15:16:36 -0500 |
| commit | 336d7a79920bd2ebb5b6b2cadd273be1620f9201 (patch) | |
| tree | a840a253eabf5017a979d463338aff77131d73f2 | |
| parent | 106326a5b9ff19b0c6e0053e3d0b80cdf608e622 (diff) | |
| download | gitlab-ce-336d7a79920bd2ebb5b6b2cadd273be1620f9201.tar.gz | |
Fixed tab index order on branch commits list page
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/commits/show.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/26447-fix-tab-list-order.yml | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 407c800feb7..a74a73d7954 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -83,6 +83,7 @@ .block-controls { float: right; + margin-top: -36px; .control { float: left; diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index e77f23c7fd8..ab9545bfb0e 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -13,6 +13,9 @@ .tree-ref-holder = render 'shared/ref_switcher', destination: 'commits' + %ul.breadcrumb.repo-breadcrumb + = commits_breadcrumbs + .block-controls.hidden-xs.hidden-sm - if @merge_request.present? .control @@ -30,8 +33,6 @@ .control = link_to namespace_project_commits_path(@project.namespace, @project, @ref, { format: :atom, private_token: current_user.private_token }), title: "Commits Feed", class: 'btn' do = icon("rss") - %ul.breadcrumb.repo-breadcrumb - = commits_breadcrumbs %div{ id: dom_id(@project) } %ol#commits-list.list-unstyled.content_list diff --git a/changelogs/unreleased/26447-fix-tab-list-order.yml b/changelogs/unreleased/26447-fix-tab-list-order.yml new file mode 100644 index 00000000000..351c53bd076 --- /dev/null +++ b/changelogs/unreleased/26447-fix-tab-list-order.yml @@ -0,0 +1,4 @@ +--- +title: Fix tab index order on branch commits list page +merge_request: +author: Ryan Harris |