Commit 77eb1ed6 authored by Simon Knox's avatar Simon Knox

Merge branch...

Merge branch '219720-on-empty-issues-list-page-import-issues-button-not-full-width-on-small-screens' into 'master'

Import Issues button not full width on small screens

See merge request gitlab-org/gitlab!84677
parents 87bf25e6 7bfea1b9
...@@ -102,6 +102,7 @@ export default { ...@@ -102,6 +102,7 @@ export default {
:text="$options.i18n.importIssuesText" :text="$options.i18n.importIssuesText"
:text-sr-only="!showLabel" :text-sr-only="!showLabel"
:icon="importButtonIcon" :icon="importButtonIcon"
class="gl-w-full gl-md-w-auto"
> >
<gl-dropdown-item v-gl-modal="importModalId"> <gl-dropdown-item v-gl-modal="importModalId">
{{ $options.i18n.importCsvText }} {{ $options.i18n.importCsvText }}
......
...@@ -785,7 +785,7 @@ export default { ...@@ -785,7 +785,7 @@ export default {
</gl-button> </gl-button>
<csv-import-export-buttons <csv-import-export-buttons
v-if="showCsvButtons" v-if="showCsvButtons"
class="gl-mr-3" class="gl-w-full gl-sm-w-auto gl-sm-mr-3"
:export-csv-path="exportCsvPathWithQuery" :export-csv-path="exportCsvPathWithQuery"
:issuable-count="currentTabCount" :issuable-count="currentTabCount"
/> />
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
= link_to _('New issue'), button_path, class: 'gl-button btn btn-confirm', id: 'new_issue_link' = link_to _('New issue'), button_path, class: 'gl-button btn btn-confirm', id: 'new_issue_link'
- if show_import_button - if show_import_button
.js-csv-import-export-buttons{ data: { show_import_button: 'true', issuable_type: issuable_type, import_csv_issues_path: import_csv_namespace_project_issues_path, can_edit: can_edit.to_s, project_import_jira_path: project_import_jira_path(@project), max_attachment_size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes), container_class: 'gl-display-inline-flex gl-vertical-align-middle', show_label: 'true' } } .js-csv-import-export-buttons{ data: { show_import_button: 'true', issuable_type: issuable_type, import_csv_issues_path: import_csv_namespace_project_issues_path, can_edit: can_edit.to_s, project_import_jira_path: project_import_jira_path(@project), max_attachment_size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes), container_class: 'gl-w-full gl-sm-w-auto gl-sm-mr-3 gl-display-inline-flex gl-vertical-align-middle', show_label: 'true' } }
%hr %hr
%p.gl-text-center.gl-mb-0 %p.gl-text-center.gl-mb-0
%strong %strong
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment