kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '44382-ui-breakdown-for-create-merge-request' into 'master' 

UI breakdown of message of the last pushed branch for Create merge request

Closes #44382

See merge request gitlab-org/gitlab-ce!17821
This commit is contained in:
Clement Ho 2018-03-22 18:55:44 +00:00
parent 53d352aaf4 40b7eedc08
commit c920d165f5
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/pages/events.scss
View File

@ -162,17 +162,14 @@
* Last push widget
*/
.event-last-push {
overflow: auto;
width: 100%;
display: flex;
align-items: center;
.event-last-push-text {
@include str-truncated(100%);
padding: 4px 0;
font-size: 13px;
float: left;
margin-right: -150px;
padding-right: 150px;
line-height: 20px;
margin-right: $gl-padding;
}
}

2
app/views/projects/_last_push.html.haml
View File

@ -13,6 +13,6 @@
#{time_ago_with_tooltip(event.created_at)}
.pull-right
.flex-right
= link_to new_mr_path_from_push_event(event), title: _("New merge request"), class: "btn btn-info btn-sm qa-create-merge-request" do
#{ _('Create merge request') }

5
changelogs/unreleased/44382-ui-breakdown-for-create-merge-request.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix UI breakdown for Create merge request button
merge_request: 17821
author: Takuya Noguchi
type: fixed