diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-14 18:30:53 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-18 14:45:43 -0500 |
| commit | b3b219dae742ca8ae30569565e8eb8fe48f40565 (patch) | |
| tree | e4ff4d720ab321671eab94e36831fb729468b607 | |
| parent | 49534a65963f6bb1bda57230ae9c320037fc176b (diff) | |
| download | gitlab-ce-b3b219dae742ca8ae30569565e8eb8fe48f40565.tar.gz | |
Display nav controls on mobile
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 25 | ||||
| -rw-r--r-- | app/views/projects/issues/index.html.haml | 2 |
2 files changed, 24 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 5f4ce87b085..9d1b7199705 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -102,6 +102,10 @@ display: inline-block; } + .icon-label { + display: none; + } + input { height: 34px; display: inline-block; @@ -124,9 +128,24 @@ } } - /* Hide on extra small devices (phones) */ - @media (max-width: $screen-xs-max) { - display: none; + @media (max-width: 600px) { + .btn, form { + margin: 0 0 10px 0; + display: block; + } + + form { + display: block; + height: auto; + } + + input.input-short { + width: 100%; + } + + .icon-label { + display: inline-block; + } } /* Small devices (tablets, 768px and lower) */ diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index fde9304c0f8..efa7642b2dc 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -11,6 +11,8 @@ - if current_user = link_to namespace_project_issues_path(@project.namespace, @project, :atom, { private_token: current_user.private_token }), class: 'btn append-right-10' do = icon('rss') + %span.icon-label + Subscribe = render 'shared/issuable/search_form', path: namespace_project_issues_path(@project.namespace, @project) - if can? current_user, :create_issue, @project = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: @issuable_finder.assignee.try(:id), milestone_id: @issuable_finder.milestones.try(:first).try(:id) }), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do |