Merge branch 'fix/adjust-button-group-width-on-mobile' into 'master'
Improve top area navigation See merge request gitlab-org/gitlab-ce!16726
This commit is contained in:
commit
f88fbd2d83
14 changed files with 35 additions and 24 deletions
|
@ -48,7 +48,7 @@
|
|||
};
|
||||
</script>
|
||||
<template>
|
||||
<ul class="nav-links scrolling-tabs">
|
||||
<ul class="nav-links scrolling-tabs separator">
|
||||
<li
|
||||
v-for="(tab, i) in tabs"
|
||||
:key="i"
|
||||
|
|
|
@ -82,6 +82,10 @@
|
|||
/* Small devices (phones, tablets, 768px and lower) */
|
||||
@media (max-width: $screen-xs-max) {
|
||||
width: 100%;
|
||||
|
||||
&.mobile-separator {
|
||||
border-bottom: 1px solid $border-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -168,9 +172,9 @@
|
|||
display: inline-block;
|
||||
}
|
||||
|
||||
// Applies on /dashboard/issues
|
||||
.project-item-select-holder {
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -340,7 +344,6 @@
|
|||
|
||||
.project-item-select-holder.btn-group {
|
||||
display: flex;
|
||||
max-width: 350px;
|
||||
overflow: hidden;
|
||||
float: right;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.top-area
|
||||
%ul.nav-links
|
||||
%ul.nav-links.mobile-separator
|
||||
= nav_link(page: dashboard_groups_path) do
|
||||
= link_to dashboard_groups_path, title: _("Your groups") do
|
||||
Your groups
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
.top-area.scrolling-tabs-container.inner-page-scroll-tabs
|
||||
.fade-left= icon('angle-left')
|
||||
.fade-right= icon('angle-right')
|
||||
%ul.nav-links.scrolling-tabs
|
||||
%ul.nav-links.scrolling-tabs.mobile-separator
|
||||
= nav_link(page: [dashboard_projects_path, root_path]) do
|
||||
= link_to dashboard_projects_path, class: 'shortcuts-activity', data: {placement: 'right'} do
|
||||
Your projects
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.nav-block
|
||||
%ul.nav-links
|
||||
%ul.nav-links.mobile-separator
|
||||
= nav_link(html_options: { class: ("active" unless params[:personal].present?) }) do
|
||||
= link_to s_('DashboardProjects|All'), dashboard_projects_path
|
||||
= nav_link(html_options: { class: ("active" if params[:personal].present?) }) do
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
- if current_user.todos.any?
|
||||
.top-area
|
||||
%ul.nav-links
|
||||
%ul.nav-links.mobile-separator
|
||||
%li.todos-pending{ class: active_when(params[:state].blank? || params[:state] == 'pending') }>
|
||||
= link_to todos_filter_path(state: 'pending') do
|
||||
%span
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
%ul.nav-links
|
||||
%ul.nav-links.mobile-separator
|
||||
%li{ class: active_when(scope.nil?) }>
|
||||
= link_to schedule_path_proc.call(nil) do
|
||||
= s_("PipelineSchedules|All")
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- failed_builds = @pipeline.statuses.latest.failed
|
||||
|
||||
.tabs-holder
|
||||
%ul.pipelines-tabs.nav-links.no-top.no-bottom
|
||||
%ul.pipelines-tabs.nav-links.no-top.no-bottom.mobile-separator
|
||||
%li.js-pipeline-tab-link
|
||||
= link_to project_pipeline_path(@project, @pipeline), data: { target: 'div#js-tab-pipeline', action: 'pipelines', toggle: 'tab' }, class: 'pipeline-tab' do
|
||||
Pipeline
|
||||
|
|
|
@ -1,11 +1,14 @@
|
|||
%ul.nav-links.event-filter.scrolling-tabs
|
||||
= event_filter_link EventFilter.all, _('All'), s_('EventFilterBy|Filter by all')
|
||||
- if event_filter_visible(:repository)
|
||||
= event_filter_link EventFilter.push, _('Push events'), s_('EventFilterBy|Filter by push events')
|
||||
- if event_filter_visible(:merge_requests)
|
||||
= event_filter_link EventFilter.merged, _('Merge events'), s_('EventFilterBy|Filter by merge events')
|
||||
- if event_filter_visible(:issues)
|
||||
= event_filter_link EventFilter.issue, _('Issue events'), s_('EventFilterBy|Filter by issue events')
|
||||
- if comments_visible?
|
||||
= event_filter_link EventFilter.comments, _('Comments'), s_('EventFilterBy|Filter by comments')
|
||||
= event_filter_link EventFilter.team, _('Team'), s_('EventFilterBy|Filter by team')
|
||||
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
|
||||
.fade-left= icon('angle-left')
|
||||
.fade-right= icon('angle-right')
|
||||
%ul.nav-links.event-filter.scrolling-tabs
|
||||
= event_filter_link EventFilter.all, _('All'), s_('EventFilterBy|Filter by all')
|
||||
- if event_filter_visible(:repository)
|
||||
= event_filter_link EventFilter.push, _('Push events'), s_('EventFilterBy|Filter by push events')
|
||||
- if event_filter_visible(:merge_requests)
|
||||
= event_filter_link EventFilter.merged, _('Merge events'), s_('EventFilterBy|Filter by merge events')
|
||||
- if event_filter_visible(:issues)
|
||||
= event_filter_link EventFilter.issue, _('Issue events'), s_('EventFilterBy|Filter by issue events')
|
||||
- if comments_visible?
|
||||
= event_filter_link EventFilter.comments, _('Comments'), s_('EventFilterBy|Filter by comments')
|
||||
= event_filter_link EventFilter.team, _('Team'), s_('EventFilterBy|Filter by team')
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
%ul.nav-links
|
||||
%ul.nav-links.mobile-separator
|
||||
%li{ class: milestone_class_for_state(params[:state], 'opened', true) }>
|
||||
= link_to milestones_filter_path(state: 'opened') do
|
||||
Open
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
%ul.nav-links
|
||||
%ul.nav-links.mobile-separator
|
||||
%li{ class: active_when(scope.nil?) }>
|
||||
= link_to build_path_proc.call(nil) do
|
||||
All
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- type = local_assigns.fetch(:type, :issues)
|
||||
- page_context_word = type.to_s.humanize(capitalize: false)
|
||||
|
||||
%ul.nav-links.issues-state-filters
|
||||
%ul.nav-links.issues-state-filters.mobile-separator
|
||||
%li{ class: active_when(params[:state] == 'opened') }>
|
||||
= link_to page_filter_path(state: 'opened', label: true), id: 'state-opened', title: "Filter by #{page_context_word} that are currently opened.", data: { state: 'opened' } do
|
||||
#{issuables_state_counter_text(type, :opened)}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- subject = local_assigns.fetch(:subject, current_user)
|
||||
- include_private = local_assigns.fetch(:include_private, false)
|
||||
|
||||
.nav-links.snippet-scope-menu
|
||||
.nav-links.snippet-scope-menu.mobile-separator
|
||||
%li{ class: active_when(params[:scope].nil?) }
|
||||
= link_to subject_snippets_path(subject) do
|
||||
All
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Change button group width on mobile
|
||||
merge_request: 16726
|
||||
author: George Tsiolis
|
||||
type: fixed
|
Loading…
Reference in a new issue