diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-04 13:24:24 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-04 13:24:24 -0500 |
| commit | 8835514b10871b7fa46813b194ebf3320991b8ff (patch) | |
| tree | 38cdffd3d0b88ed7bd9626da0277394471955a8f | |
| parent | c060823d02e9fc204b650eee889f282442276c25 (diff) | |
| download | gitlab-ce-8835514b10871b7fa46813b194ebf3320991b8ff.tar.gz | |
Fixes style consistencies.
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 2f014d5549f..1b686c58eaf 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -135,9 +135,8 @@ form.edit-issue { } .editor-details { - @media (max-width: $screen-sm-max) { - display: block; - } + display: block; + @media (min-width: $screen-sm-min) { display: inline-block; } diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 6cc5ce44b43..617b0437807 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -19,7 +19,7 @@ = icon('circle-o') %a.btn.btn-default.pull-right.hidden-sm.hidden-md.hidden-lg.gutter-toggle{ href: "#" } - =icon('angle-double-left') + = icon('angle-double-left') .issue-meta %strong.identifier @@ -29,11 +29,11 @@ .editor-details .editor-details %strong - =link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-xs") + = link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-xs") %span.hidden-xs = '@' + @issue.author.username %strong - =link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", + = link_to_member(@project, @issue.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", by_username: true, avatar: false) = time_ago_with_tooltip(@issue.created_at) 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 c28e9d6f302..d24c12251f3 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -3,9 +3,9 @@ %span.hidden-xs = @merge_request.state_human_name %span.hidden-sm.hidden-md.hidden-lg - =icon(@merge_request.state_icon_name) + = icon(@merge_request.state_icon_name) %a.btn.btn-default.pull-right.hidden-sm.hidden-md.hidden-lg.gutter-toggle{ href: "#" } - =icon('angle-double-left') + = icon('angle-double-left') .issue-meta %strong.identifier Merge Request ##{@merge_request.iid} @@ -13,11 +13,11 @@ 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") %span.hidden-xs = '@' + @merge_request.author.username %strong - =link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", + = link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-sm hidden-md hidden-lg", by_username: true, avatar: false) = time_ago_with_tooltip(@merge_request.created_at) |