diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss index 5d7fd36be165bf875def8164b6cdcffa1f3c5b0f..2b72c24936822d7b2b4bb52ef47a910cc9e54d3a 100644 --- a/app/assets/stylesheets/framework/issue_box.scss +++ b/app/assets/stylesheets/framework/issue_box.scss @@ -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; diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss index 787f0c8da0f1c3a401a691470bc3c65388f1e463..d3eda1a57e6f227cbad1e535beb53eb4ed7eed42 100644 --- a/app/assets/stylesheets/pages/detail_page.scss +++ b/app/assets/stylesheets/pages/detail_page.scss @@ -19,6 +19,7 @@ .issue-meta { display: inline-block; + line-height: 20px; } } diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index e4a171ed4d55428a5e6f9af9232f5e446622cfe5..2f014d5549f97ceeca1f62673e081cb5b89cb66f 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -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; + } +} \ No newline at end of file diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index de305fd1d0ac8551410cecd68ab83de9d7c013fa..f0c49dc5bde3f87c30dda7d47856d8d8464231ce 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -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)