Commit d63a0234 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '264790-bs4-optimization-commit' into 'master'

Remove duplicated BS display properties from Commit's HAML

See merge request gitlab-org/gitlab!44847
parents 4d688658 b33a1f45
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
%span.btn.disabled.btn-grouped.d-none.d-sm-block.gl-mr-3.has-tooltip{ title: n_("%d comment on this commit", "%d comments on this commit", @notes_count) % @notes_count } %span.btn.disabled.btn-grouped.d-none.d-sm-block.gl-mr-3.has-tooltip{ title: n_("%d comment on this commit", "%d comments on this commit", @notes_count) % @notes_count }
= sprite_icon('comment') = sprite_icon('comment')
= @notes_count = @notes_count
= link_to project_tree_path(@project, @commit), class: "btn btn-default gl-mr-3 d-none d-sm-none d-md-inline" do = link_to project_tree_path(@project, @commit), class: "btn btn-default gl-mr-3 d-none d-md-inline" do
#{ _('Browse files') } #{ _('Browse files') }
.dropdown.inline .dropdown.inline
%a.btn.btn-default.dropdown-toggle.qa-options-button.d-md-inline{ data: { toggle: "dropdown" } } %a.btn.btn-default.dropdown-toggle.qa-options-button.d-md-inline{ data: { toggle: "dropdown" } }
%span= _('Options') %span= _('Options')
= icon('caret-down') = icon('caret-down')
%ul.dropdown-menu.dropdown-menu-right %ul.dropdown-menu.dropdown-menu-right
%li.d-block.d-sm-none.d-md-none %li.d-block.d-sm-none
= link_to project_tree_path(@project, @commit) do = link_to project_tree_path(@project, @commit) do
#{ _('Browse Files') } #{ _('Browse Files') }
- if can_collaborate && !@commit.has_been_reverted?(current_user) - if can_collaborate && !@commit.has_been_reverted?(current_user)
......
---
title: Remove duplicated BS display properties from Commit's HAML
merge_request: 44847
author: Takuya Noguchi
type: other
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