diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-02 12:31:57 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-02 12:31:57 +0300 |
| commit | 4cbe72d76722ce6c3d327ec62f54478a6e955d32 (patch) | |
| tree | d20b590352fad37014ae32646f060bd0f02346b9 /app/views/projects/merge_requests | |
| parent | 5b92ddb80994ff6ab992dcdb39e3a27c687f0dc3 (diff) | |
UI improvements mostly for mobile screens
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 1ee2e1bdae8..0a719fc642e 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -7,7 +7,7 @@ %i.fa.fa-check MERGED - else - %span.pull-right + %span.pull-right.hidden-xs - if merge_request.for_fork? %span.light #{merge_request.source_project_namespace}: @@ -31,7 +31,7 @@ %span.task-status = merge_request.task_status - .pull-right + .pull-right.hidden-xs %small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')} .merge-request-labels diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index cd1e48ca976..a6d90a68b11 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -1,8 +1,6 @@ = render "projects/issues_nav" .row - .fixed.sidebar-expand-button.hidden-lg.hidden-md - %i.fa.fa-list.fa-2x .col-md-3.responsive-side = render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project), labels: true, redirect: 'merge_requests', entity: 'merge_request' |