From d46d6fc17b8c6235f5ed83a68488d1e9c3a9c30d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 8 Jun 2015 16:54:39 +0200
Subject: [PATCH] Improve UI for phones
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/assets/stylesheets/generic/mobile.scss | 15 +++++++++++++++
app/views/projects/merge_requests/index.html.haml | 7 ++++---
app/views/users/show.html.haml | 2 +-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/app/assets/stylesheets/generic/mobile.scss b/app/assets/stylesheets/generic/mobile.scss
index e61b39f1ac3..f04c8eef904 100644
--- a/app/assets/stylesheets/generic/mobile.scss
+++ b/app/assets/stylesheets/generic/mobile.scss
@@ -64,6 +64,21 @@
margin-left: 15px !important;
max-width: 70% !important;
}
+
+ .issue-info, .merge-request-info {
+ display: none;
+ }
+
+ .issue-details {
+ .creator,
+ .page-title .btn-close {
+ display: none;
+ }
+ }
+
+ %ul.notes .note-role, .note-actions {
+ display: none;
+ }
}
@media (max-width: $screen-sm-max) {
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index 841d1e1cfe9..fa591b0537e 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -4,9 +4,10 @@
= render 'shared/issuable_search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
- if can? current_user, :write_merge_request, @project
- = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-new pull-left", title: "New Merge Request" do
- %i.fa.fa-plus
- New Merge Request
+ .pull-left.hidden-xs
+ = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-new", title: "New Merge Request" do
+ %i.fa.fa-plus
+ New Merge Request
= render 'shared/issuable_filter', type: :merge_requests
.merge-requests-holder
= render 'merge_requests'
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 6ed45fedfa2..1694818aef6 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -13,7 +13,7 @@
%h3
= @user.name
- if @user == current_user
- .pull-right
+ .pull-right.hidden-xs
= link_to profile_path, class: 'btn btn-sm' do
%i.fa.fa-pencil-square-o
Edit Profile settings
--
GitLab