mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-16 08:06:08 +10:00
Move static icon and change appearance.
MR meta details media queries.
This commit is contained in:
@@ -5,11 +5,17 @@
|
||||
*/
|
||||
|
||||
.status-box {
|
||||
@media (max-width: $screen-sm-max) {
|
||||
padding: 5px 11px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
@media (min-width: $screen-sm-min) {
|
||||
padding: 0 $gl-btn-padding;
|
||||
margin-top: 5px;
|
||||
}
|
||||
@include border-radius(3px);
|
||||
display: block;
|
||||
float: left;
|
||||
padding: 0 $gl-btn-padding;
|
||||
margin-top: 5px;
|
||||
margin-right: 10px;
|
||||
color: #FFF;
|
||||
font-size: $gl-font-size;
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
.issue-meta {
|
||||
display: inline-block;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -133,3 +133,12 @@ form.edit-issue {
|
||||
color: $secondary-text;
|
||||
margin-left: 52px;
|
||||
}
|
||||
|
||||
.editor-details {
|
||||
@media (max-width: $screen-sm-max) {
|
||||
display: block;
|
||||
}
|
||||
@media (min-width: $screen-sm-min) {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
@@ -4,17 +4,17 @@
|
||||
= @merge_request.state_human_name
|
||||
%span.hidden-sm.hidden-md.hidden-lg
|
||||
=icon(@merge_request.state_icon_name)
|
||||
|
||||
%span.identifier
|
||||
Merge Request #{@merge_request.to_reference}
|
||||
%span.creator
|
||||
·
|
||||
by
|
||||
=link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-xs")
|
||||
=link_to_member(@project, @merge_request.author, size: 24,
|
||||
by_username: true, avatar: false)
|
||||
·
|
||||
= time_ago_with_tooltip(@merge_request.created_at)
|
||||
.issue-meta
|
||||
%strong.identifier
|
||||
Merge Request ##{@merge_request.iid}
|
||||
%span.creator
|
||||
by
|
||||
.editor-details
|
||||
%strong
|
||||
=link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-xs")
|
||||
=link_to_member(@project, @merge_request.author, size: 24,
|
||||
by_username: true, avatar: false)
|
||||
= time_ago_with_tooltip(@merge_request.created_at)
|
||||
|
||||
.issue-btn-group.pull-right
|
||||
- if can?(current_user, :update_merge_request, @merge_request)
|
||||
|
||||
Reference in New Issue
Block a user