diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 19:49:46 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 19:49:46 +0000 |
commit | fb1a7553c7b22c8541caa0a6a3f0b49cd20dcf4a (patch) | |
tree | b62070a25e93d0d6c9505c9e89553b8dd06e1094 /app | |
parent | 5b2ce9adb46d85fe00bcd0ac4e174aabb990c485 (diff) | |
parent | c75c8409763c702a564e3b99472306c803b5029c (diff) | |
download | gitlab-ce-fb1a7553c7b22c8541caa0a6a3f0b49cd20dcf4a.tar.gz |
Merge branch 'issue_13885' into 'master'
Display nav controls on mobile
Set inputs inside .nav-controls to full-width on viewports below 600px
Fixes #13885
**Affected pages**
/dashboard/groups
/admin/builds
/dashboard/projects
/dashboard/issues
/dashboard/merge_requests
/dashboard/milestones
/dashboard/todos
/explore
/groups/{group-name}/issues
/groups/{group-name}
/groups/{group-name}/milestones
/{group-name}/{project-name}/builds
/{group-name}/{project-name}/forks
/{group-name}/{project-name}/issues
/{group-name}/{project-name}/labels
/{group-name}/{project-name}/merge_requests
/{group-name}/{project-name}/milestones
/{group-name}/{project-name}/wikis/home
/{group-name}/{project-name}/wikis/pages
Some Screenshots
**Groups**
![Screen_Shot_2016-03-15_at_2.22.23_PM](/uploads/b55348676693cc3ff67cddc4528f7f6c/Screen_Shot_2016-03-15_at_2.22.23_PM.png)
**Admin > Builds**
![admin-builds](/uploads/2e84119660f4895a1530883412c4b728/admin-builds.png)
**TODOs**
![todos](/uploads/84344c43011e22f902701038932d3eaa/todos.png)
**Dashboard > Projects**
![dashboards-projects](/uploads/f508d9107598038798aa10485d3d5cfe/dashboards-projects.png)
**Project Issues**
![issues](/uploads/d6c69a8f81ee07da95b2a3b99b81cf51/issues.png)
**Project Merge Requests**
![merge_requests](/uploads/b3c1a537f28931bd38077c36627a0d7a/merge_requests.png)
See merge request !3214
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/common.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 37 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 2 | ||||
-rw-r--r-- | app/views/dashboard/issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/issues/index.html.haml | 2 |
7 files changed, 50 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index bc03c2180be..7285ccec797 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -375,7 +375,6 @@ table { position: absolute; top: 0; right: 0; - width: 250px !important; visibility: hidden; } } diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index 40a508c1ebc..99e49a70923 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -11,3 +11,11 @@ } } } + +@media (max-width: $screen-xs-max) { + .filter-item { + display: block; + margin: 0 0 10px 0; + } +} + diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 5f4ce87b085..625a0bf69c6 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,38 @@ } } - /* Hide on extra small devices (phones) */ @media (max-width: $screen-xs-max) { - display: none; + padding-bottom: 0; + + .btn, form, .dropdown, .dropdown-menu-toggle, .form-control { + margin: 0 0 10px 0; + display: block; + width: 100%; + } + + form { + display: block; + height: auto; + + input { + width: 100%; + margin: 0 0 10px; + } + } + + .input-short { + width: 100%; + } + + .icon-label { + display: inline-block; + } + + // Applies on /dashboard/issues + .project-item-select-holder { + display: block; + margin: 0; + } } /* Small devices (tablets, 768px and lower) */ diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index be05db58c40..6107c8a6d0a 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -39,7 +39,7 @@ } .sidebar-wrapper { - z-index: 999; + z-index: 1000; background: $background-color; } diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index dfa5f80eef8..1eec4db45a0 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -10,6 +10,8 @@ - if current_user = link_to issues_dashboard_url(format: :atom, private_token: current_user.private_token), class: 'btn' do = icon('rss') + %span.icon-label + Subscribe = render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue" = render 'shared/issuable/filter', type: :issues diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index b0805593fdc..aea35c50862 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -10,6 +10,8 @@ - if current_user = link_to issues_group_url(@group, format: :atom, private_token: current_user.private_token), class: 'btn' do = icon('rss') + %span.icon-label + Subscribe = render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue" = render 'shared/issuable/filter', type: :issues 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 |