Skip to content
Snippets Groups Projects
Commit 18777a5d authored by Coung Ngo's avatar Coung Ngo
Browse files

Merge branch 'pj-migration-pages-domains' into 'master'

Update the button component in the page domains

See merge request !105830



Merged-by: default avatarCoung Ngo <cngo@gitlab.com>
Approved-by: default avatarAxel García <agarcia@gitlab.com>
Approved-by: default avatarCoung Ngo <cngo@gitlab.com>
Co-authored-by: default avatarSunjung Park <spark@gitlab.com>
parents 720be347 046fc320
No related branches found
No related tags found
1 merge request!105830Update the button component in the page domains
Pipeline #713857682 failed
Pipeline: GitLab

#713861497

    Pipeline: GitLab

    #713861491

      ......@@ -4,9 +4,8 @@
      = _("New Pages Domain")
      = render 'projects/pages_domains/helper_text'
      %div
      = form_for [@project, domain_presenter], html: { class: 'fieldset-form' } do |f|
      = gitlab_ui_form_for [@project, domain_presenter], html: { class: 'fieldset-form' } do |f|
      = render 'form', { f: f }
      .form-actions
      = f.submit _('Create New Domain'), class: "gl-button btn btn-confirm"
      .float-right
      = link_to _('Cancel'), project_pages_path(@project), class: 'gl-button btn btn-default btn-cancel'
      .form-actions.gl-display-flex
      = f.submit _('Create New Domain'), class: 'gl-mr-3', pajamas_button: true
      = link_to _('Cancel'), project_pages_path(@project), class: 'gl-button btn btn-default btn-cancel'
      ......@@ -15,8 +15,8 @@
      = _('Pages Domain')
      = render 'projects/pages_domains/helper_text'
      %div
      = form_for [@project, domain_presenter], html: { class: 'fieldset-form' } do |f|
      = gitlab_ui_form_for [@project, domain_presenter], html: { class: 'fieldset-form' } do |f|
      = render 'form', { f: f }
      .form-actions.d-flex.justify-content-between
      = f.submit _('Save Changes'), class: "gl-button btn btn-confirm"
      .form-actions.gl-display-flex
      = f.submit _('Save Changes'), class: 'gl-mr-3', pajamas_button: true
      = link_to _('Cancel'), project_pages_path(@project), class: 'gl-button btn btn-default btn-inverse'
      0% Loading or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment