diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index ace46e32b18d8b613c63773ccfaf3d80cfe8760f..3703b7568c88214cae5927ebffa2a47af00cb155 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -111,10 +111,11 @@ body.modal-open { flex-grow: 1; height: 56px; padding: $gl-btn-padding $gl-btn-padding 0; + text-align: right; - > svg { - float: right; - height: 100%; + .illustration { + height: inherit; + width: initial; } } } diff --git a/app/views/projects/issues/_import_export.svg b/app/views/projects/issues/_import_export.svg deleted file mode 100644 index 53c35d12f579a2352d5c9b5ea1557484e509ca3e..0000000000000000000000000000000000000000 --- a/app/views/projects/issues/_import_export.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/views/projects/issues/import_csv/_modal.html.haml b/app/views/projects/issues/import_csv/_modal.html.haml index 5339c4325b9b2cc4715422a7bed529eb97f99ab3..86bc54786ad225728e82e4a333e636474c48325c 100644 --- a/app/views/projects/issues/import_csv/_modal.html.haml +++ b/app/views/projects/issues/import_csv/_modal.html.haml @@ -5,8 +5,8 @@ .modal-header %h3 = _('Import issues') - .import-export-svg-container - = render 'projects/issues/import_export.svg' + .svg-content.import-export-svg-container + = image_tag 'illustrations/export-import.svg', alt: _('Import/Export illustration'), class: 'illustration' %a.close{ href: '#', 'data-dismiss' => 'modal' } × .modal-body .modal-text diff --git a/changelogs/unreleased/55312-svg.yml b/changelogs/unreleased/55312-svg.yml new file mode 100644 index 0000000000000000000000000000000000000000..a6260aeaf2ae2b8781196e2be66670ae3919cd9a --- /dev/null +++ b/changelogs/unreleased/55312-svg.yml @@ -0,0 +1,5 @@ +--- +title: Use export-import svgs from gitlab-svgs +merge_request: 24954 +author: +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9747c1ee95267b5d2eca977e1456c7ace086b31c..29d3c463fe47e90eae5c446d6f61e71cede7d2c7 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3953,6 +3953,9 @@ msgstr "" msgid "Import timed out. Import took longer than %{import_jobs_expiration} seconds" msgstr "" +msgid "Import/Export illustration" +msgstr "" + msgid "ImportProjects|Importing the project failed" msgstr ""