Restyle last push widget
This commit is contained in:
parent
d20f78f700
commit
c1c28d3cea
3 changed files with 11 additions and 29 deletions
|
@ -129,30 +129,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Push event widget
|
||||
*
|
||||
*/
|
||||
.event_lp {
|
||||
color: #777;
|
||||
padding: 10px;
|
||||
min-height: 22px;
|
||||
border-left: 5px solid $primary_color;
|
||||
margin-bottom: 20px;
|
||||
background: #f9f9f9;
|
||||
|
||||
.avatar {
|
||||
width: 24px;
|
||||
}
|
||||
|
||||
.btn-new-mr {
|
||||
@extend .btn-primary;
|
||||
@extend .small;
|
||||
@extend .pull-right;
|
||||
margin: -2px;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Event filter
|
||||
*
|
||||
|
@ -182,3 +158,9 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.event-last-push .btn-create {
|
||||
position: relative;
|
||||
top: -3px;
|
||||
right: -30px;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- if show_last_push_widget?(event)
|
||||
.event_lp
|
||||
.alert.alert-success.event-last-push
|
||||
%span You pushed to
|
||||
= link_to project_commits_path(event.project, event.ref_name) do
|
||||
%strong= truncate(event.ref_name, length: 28)
|
||||
|
@ -8,6 +8,6 @@
|
|||
%span
|
||||
= time_ago_in_words(event.created_at)
|
||||
ago.
|
||||
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-new-mr" do
|
||||
Create Merge Request
|
||||
.pull-right
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do
|
||||
Create Merge Request
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
= text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
|
||||
.pull-left
|
||||
|
||||
= submit_tag "Compare", class: "btn btn-primary wide commits-compare-btn"
|
||||
= submit_tag "Compare", class: "btn btn-create commits-compare-btn"
|
||||
- if @refs_are_same
|
||||
.alert
|
||||
%span Refs are the same
|
||||
|
|
Loading…
Reference in a new issue