diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-10-31 21:02:11 +0200 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-10-31 21:02:11 +0200 |
| commit | 8dade803dc64608908019137563e1c6323af0c51 (patch) | |
| tree | 79a820789d42add5e916da03a4cf405a2f510529 | |
| parent | a63c9e94dfb87013875a75a3c96ac5773c71f5d6 (diff) | |
| download | gitlab-ce-8dade803dc64608908019137563e1c6323af0c51.tar.gz | |
resolve conflicts
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/popup_dialog.vue | 59 |
1 files changed, 17 insertions, 42 deletions
diff --git a/app/assets/javascripts/vue_shared/components/popup_dialog.vue b/app/assets/javascripts/vue_shared/components/popup_dialog.vue index fae6eccb4f4..47efee64c6e 100644 --- a/app/assets/javascripts/vue_shared/components/popup_dialog.vue +++ b/app/assets/javascripts/vue_shared/components/popup_dialog.vue @@ -10,14 +10,11 @@ export default { text: { type: String, required: false, -<<<<<<< HEAD -======= }, hideFooter: { type: Boolean, required: false, default: false, ->>>>>>> e8a46294c0... apply changes for JS and CSS from gitlab-ee!2912 }, kind: { type: String, @@ -107,46 +104,24 @@ export default { <p>{{this.text}}</p> </slot> </div> - <slot name="footer"> - <div class="modal-footer" v-if="!hideFooter"> - <button - type="button" - class="btn btn-default pull-left" - @click="close" - > - Cancel - </button> - <button - type="button" - class="btn pull-right" - :disabled="submitDisabled" - :class="btnKindClass" - @click="emitSubmit(true)" - > - {{primaryButtonLabel}} - </button> - </div> - </slot> - </div> -<<<<<<< HEAD - <div class="modal-footer"> - <button - type="button" - class="btn" - :class="btnCancelKindClass" - @click="close"> - {{ closeButtonLabel }} - </button> - <button - type="button" - class="btn" - :class="btnKindClass" - @click="emitSubmit(true)"> - {{ primaryButtonLabel }} - </button> + <div class="modal-footer" v-if="!hideFooter"> + <button + type="button" + class="btn pull-left" + :class="btnCancelKindClass" + @click="close"> + {{ closeButtonLabel }} + </button> + <button + type="button" + class="btn pull-right" + :disabled="submitDisabled" + :class="btnKindClass" + @click="emitSubmit(true)"> + {{ primaryButtonLabel }} + </button> + </div> </div> -======= ->>>>>>> e8a46294c0... apply changes for JS and CSS from gitlab-ee!2912 </div> </div> <div class="modal-backdrop fade in" /> |