Merge branch 'issue-edit-inline' into issue-edit-inline-description-template

3 files changed, 60 insertions, 40 deletions

diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue
new file mode 100644
index 00000000000..b4c31811a0b
--- /dev/null
+++ b/app/assets/javascripts/issue_show/components/fields/description.vue
@@ -0,0 +1,47 @@
+<script>
+  /* global Flash */
+  import markdownField from '../../../vue_shared/components/markdown/field.vue';
+
+  export default {
+    props: {
+      formState: {
+        type: Object,
+        required: true,
+      },
+      markdownPreviewUrl: {
+        type: String,
+        required: true,
+      },
+      markdownDocs: {
+        type: String,
+        required: true,
+      },
+    },
+    components: {
+      markdownField,
+    },
+  };
+</script>
+
+<template>
+  <div class="common-note-form">
+    <label
+      class="sr-only"
+      for="issue-description">
+      Description
+    </label>
+    <markdown-field
+      :markdown-preview-url="markdownPreviewUrl"
+      :markdown-docs="markdownDocs">
+      <textarea
+        id="issue-description"
+        class="note-textarea js-gfm-input js-autosize markdown-area"
+        data-supports-slash-commands="false"
+        aria-label="Description"
+        v-model="formState.description"
+        ref="textatea"
+        slot="textarea">
+      </textarea>
+    </markdown-field>
+  </div>
+</template>
diff --git a/app/assets/javascripts/issue_show/components/fields/template.vue b/app/assets/javascripts/issue_show/components/fields/description_template.vue
index 074d0df3803..074d0df3803 100644
--- a/app/assets/javascripts/issue_show/components/fields/template.vue
+++ b/app/assets/javascripts/issue_show/components/fields/description_template.vue
diff --git a/app/assets/javascripts/issue_show/components/fields/title.vue b/app/assets/javascripts/issue_show/components/fields/title.vue
index aea30bc76b1..01ae6fd3dd2 100644
--- a/app/assets/javascripts/issue_show/components/fields/title.vue
+++ b/app/assets/javascripts/issue_show/components/fields/title.vue
@@ -1,54 +1,27 @@
 <script>
-  import descriptionTemplate from './template.vue';
-
   export default {
     props: {
       formState: {
         type: Object,
         required: true,
       },
-      issuableTemplates: {
-        type: Array,
-        required: false,
-        default: () => [],
-      },
-    },
-    components: {
-      descriptionTemplate,
-    },
-    computed: {
-      hasIssuableTemplates() {
-        return this.issuableTemplates.length !== 0;
-      },
     },
   };
 </script>
 
 <template>
-  <fieldset class="row">
-    <div
-      class="col-sm-4 col-lg-3"
-      v-if="hasIssuableTemplates">
-      <description-template
-        :issuable-templates="issuableTemplates" />
-    </div>
-    <div
-      :class="{
-        'col-sm-8 col-lg-9': hasIssuableTemplates,
-        'col-xs-12': !hasIssuableTemplates,
-      }">
-      <label
-        class="sr-only"
-        for="issue-title">
-        Title
-      </label>
-      <input
-        id="issue-title"
-        class="form-control"
-        type="text"
-        placeholder="Issue title"
-        aria-label="Issue title"
-        v-model="formState.title" />
-    </div>
+  <fieldset>
+    <label
+      class="sr-only"
+      for="issue-title">
+      Title
+    </label>
+    <input
+      id="issue-title"
+      class="form-control"
+      type="text"
+      placeholder="Issue title"
+      aria-label="Issue title"
+      v-model="formState.title" />
   </fieldset>
 </template>