Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 12 insertions, 6 deletions

diff --git a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue
index fb25d3618ab..336ce714a05 100644
--- a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue
+++ b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue
@@ -115,12 +115,13 @@ export default {
       </template>
     </markdown-field>
     <slot name="resolve-checkbox"></slot>
-    <div class="note-form-actions gl-display-flex gl-justify-content-space-between">
+    <div class="note-form-actions gl-display-flex">
       <gl-button
         ref="submitButton"
         :disabled="!hasValue || isSaving"
+        class="gl-mr-3 gl-w-auto!"
         category="primary"
-        variant="success"
+        variant="confirm"
         type="submit"
         data-track-event="click_button"
         data-qa-selector="save_comment_button"
@@ -128,9 +129,14 @@ export default {
       >
         {{ buttonText }}
       </gl-button>
-      <gl-button ref="cancelButton" variant="default" category="primary" @click="cancelComment">{{
-        __('Cancel')
-      }}</gl-button>
+      <gl-button
+        ref="cancelButton"
+        class="gl-w-auto!"
+        variant="default"
+        category="primary"
+        @click="cancelComment"
+        >{{ __('Cancel') }}</gl-button
+      >
     </div>
     <gl-modal
       ref="cancelCommentModal"
diff --git a/app/assets/javascripts/design_management/pages/index.vue b/app/assets/javascripts/design_management/pages/index.vue
index 04d80dc0069..ad557f64ce4 100644
--- a/app/assets/javascripts/design_management/pages/index.vue
+++ b/app/assets/javascripts/design_management/pages/index.vue
@@ -333,7 +333,7 @@ export default {
     ghostClass: 'gl-visibility-hidden',
   },
   i18n: {
-    dropzoneDescriptionText: __('Drop or %{linkStart}upload%{linkEnd} designs to attach'),
+    dropzoneDescriptionText: __('Drag your designs here or %{linkStart}click to upload%{linkEnd}.'),
   },
 };
 </script>