diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 12:42:45 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 12:42:45 -0500 |
| commit | b413785e1dfdbc594e86880e79e20bdd5963c938 (patch) | |
| tree | 80616d24b209dae3e6dc4f715850cd695586a6ba /app/views/shared/issuable/_sidebar_assignees.html.haml | |
| parent | 3e7a17d4759a2c25f0c717408c48bfc7e975dde3 (diff) | |
| download | gitlab-ce-b413785e1dfdbc594e86880e79e20bdd5963c938.tar.gz | |
[skip ci] Replace .pull-right with .float-right
Diffstat (limited to 'app/views/shared/issuable/_sidebar_assignees.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_sidebar_assignees.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml index 304df38a096..07a87181b0b 100644 --- a/app/views/shared/issuable/_sidebar_assignees.html.haml +++ b/app/views/shared/issuable/_sidebar_assignees.html.haml @@ -13,15 +13,15 @@ = _('Assignee') = icon('spinner spin', class: 'hidden block-loading', 'aria-hidden': 'true') - if can_edit_issuable - = link_to _('Edit'), '#', class: 'js-sidebar-dropdown-toggle edit-link pull-right' + = link_to _('Edit'), '#', class: 'js-sidebar-dropdown-toggle edit-link float-right' - if !signed_in - %a.gutter-toggle.pull-right.js-sidebar-toggle{ role: "button", href: "#", "aria-label" => _('Toggle sidebar') } + %a.gutter-toggle.float-right.js-sidebar-toggle{ role: "button", href: "#", "aria-label" => _('Toggle sidebar') } = sidebar_gutter_toggle_icon .value.hide-collapsed - if issuable.assignee = link_to_member(@project, issuable.assignee, size: 32, extra_class: 'bold') do - if !issuable.can_be_merged_by?(issuable.assignee) - %span.pull-right.cannot-be-merged{ data: { toggle: 'tooltip', placement: 'left' }, title: _('Not allowed to merge') } + %span.float-right.cannot-be-merged{ data: { toggle: 'tooltip', placement: 'left' }, title: _('Not allowed to merge') } = icon('exclamation-triangle', 'aria-hidden': 'true') %span.username = issuable.assignee.to_reference |