Commit c3e07b6f authored by Jacob Schatz's avatar Jacob Schatz

Move static icon and change appearance.

MR meta details media queries.
parent d913febf
...@@ -5,11 +5,17 @@ ...@@ -5,11 +5,17 @@
*/ */
.status-box { .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); @include border-radius(3px);
display: block; display: block;
float: left; float: left;
padding: 0 $gl-btn-padding;
margin-top: 5px;
margin-right: 10px; margin-right: 10px;
color: #FFF; color: #FFF;
font-size: $gl-font-size; font-size: $gl-font-size;
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
.issue-meta { .issue-meta {
display: inline-block; display: inline-block;
line-height: 20px;
} }
} }
......
...@@ -133,3 +133,12 @@ form.edit-issue { ...@@ -133,3 +133,12 @@ form.edit-issue {
color: $secondary-text; color: $secondary-text;
margin-left: 52px; margin-left: 52px;
} }
.editor-details {
@media (max-width: $screen-sm-max) {
display: block;
}
@media (min-width: $screen-sm-min) {
display: inline-block;
}
}
\ No newline at end of file
...@@ -4,16 +4,16 @@ ...@@ -4,16 +4,16 @@
= @merge_request.state_human_name = @merge_request.state_human_name
%span.hidden-sm.hidden-md.hidden-lg %span.hidden-sm.hidden-md.hidden-lg
=icon(@merge_request.state_icon_name) =icon(@merge_request.state_icon_name)
.issue-meta
%span.identifier %strong.identifier
Merge Request #{@merge_request.to_reference} Merge Request ##{@merge_request.iid}
%span.creator %span.creator
·
by 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, mobile_classes: "hidden-xs")
=link_to_member(@project, @merge_request.author, size: 24, =link_to_member(@project, @merge_request.author, size: 24,
by_username: true, avatar: false) by_username: true, avatar: false)
·
= time_ago_with_tooltip(@merge_request.created_at) = time_ago_with_tooltip(@merge_request.created_at)
.issue-btn-group.pull-right .issue-btn-group.pull-right
......
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