diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-06-13 14:09:47 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-06-13 14:09:47 -0700 |
| commit | 55f7aa5c56a385f2e5dc1b736dc53c381862591b (patch) | |
| tree | 6a3a43744e09b0d8ec19bbe2f7121d233a2aacde | |
| parent | 0a965c974d4931c1bb03db344aa1dc99c3e954c8 (diff) | |
| download | gitlab-ce-47825-gitaly-modal.tar.gz | |
Update class name to modal-xl47825-gitaly-modal
4 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_shared/components/gl_modal.vue b/app/assets/javascripts/vue_shared/components/gl_modal.vue index 5412db0192d..b298b989203 100644 --- a/app/assets/javascripts/vue_shared/components/gl_modal.vue +++ b/app/assets/javascripts/vue_shared/components/gl_modal.vue @@ -1,6 +1,6 @@ <script> const buttonVariants = ['danger', 'primary', 'success', 'warning']; -const sizeVariants = ['sm', 'md', 'lg', 'full']; +const sizeVariants = ['sm', 'md', 'lg', 'xl']; export default { name: 'GlModal', diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 12e4e478dbf..ffb40166c15 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -1,4 +1,4 @@ -.modal-full { +.modal-xl { max-width: 98%; } diff --git a/lib/peek/rblineprof/custom_controller_helpers.rb b/lib/peek/rblineprof/custom_controller_helpers.rb index d22082a812c..9beb442bfa3 100644 --- a/lib/peek/rblineprof/custom_controller_helpers.rb +++ b/lib/peek/rblineprof/custom_controller_helpers.rb @@ -41,7 +41,7 @@ module Peek ] end.sort_by{ |a,b,c,d,e,f| -f } - output = "<div class='modal-dialog modal-full'><div class='modal-content'>" + output = "<div class='modal-dialog modal-xl'><div class='modal-content'>" output << "<div class='modal-header'>" output << "<h4>Line profiling: #{human_description(params[:lineprofiler])}</h4>" output << "<button class='close' type='button' data-dismiss='modal' aria-label='close'><span aria-hidden='true'>×</span></button>" diff --git a/spec/javascripts/vue_shared/components/gl_modal_spec.js b/spec/javascripts/vue_shared/components/gl_modal_spec.js index 2d52b661f28..e4737714312 100644 --- a/spec/javascripts/vue_shared/components/gl_modal_spec.js +++ b/spec/javascripts/vue_shared/components/gl_modal_spec.js @@ -208,12 +208,12 @@ describe('GlModal', () => { expect(vm.$el.querySelector('.modal-dialog').classList.contains('modal-lg')).toEqual(true); }); - it('should render modal-full', () => { + it('should render modal-xl', () => { vm = mountComponent(modalComponent, { - modalSize: 'full', + modalSize: 'xl', }); - expect(vm.$el.querySelector('.modal-dialog').classList.contains('modal-full')).toEqual(true); + expect(vm.$el.querySelector('.modal-dialog').classList.contains('modal-xl')).toEqual(true); }); it('should not add modal size classes when md size is passed', () => { |