Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 8 deletions

diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_empty_state.vue b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_empty_state.vue
index fbdb60f61f1..f701bedc74d 100644
--- a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_empty_state.vue
+++ b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_empty_state.vue
@@ -41,6 +41,7 @@ export default {
 <template>
   <gl-empty-state
     :svg-path="$options.SCHEDULE_MD_SVG_URL"
+    :svg-height="150"
     :primary-button-text="$options.i18n.createNew"
     :primary-button-link="newSchedulePath"
   >
diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue
index 0c3ede47015..cd1d9a97ef3 100644
--- a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue
+++ b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue
@@ -370,7 +370,7 @@ export default {
         />
       </gl-form-group>
       <!--Variable List-->
-      <gl-form-group class="gl-mb-2" :label="$options.i18n.variables">
+      <gl-form-group class="gl-mb-0" :label="$options.i18n.variables">
         <div
           v-for="(variable, index) in variables"
           :key="`var-${index}`"
@@ -456,13 +456,23 @@ export default {
       <gl-form-checkbox id="schedule-active" v-model="activated" class="gl-mb-3">
         {{ $options.i18n.activated }}
       </gl-form-checkbox>
-
-      <gl-button variant="confirm" data-testid="schedule-submit-button" @click="scheduleHandler">
-        {{ buttonText }}
-      </gl-button>
-      <gl-button :href="schedulesPath" data-testid="schedule-cancel-button">
-        {{ $options.i18n.cancel }}
-      </gl-button>
+      <div class="gl-display-flex gl-gap-3 gl-flex-wrap">
+        <gl-button
+          variant="confirm"
+          data-testid="schedule-submit-button"
+          class="gl-w-full gl-sm-w-auto"
+          @click="scheduleHandler"
+        >
+          {{ buttonText }}
+        </gl-button>
+        <gl-button
+          :href="schedulesPath"
+          data-testid="schedule-cancel-button"
+          class="gl-w-full gl-sm-w-auto"
+        >
+          {{ $options.i18n.cancel }}
+        </gl-button>
+      </div>
     </gl-form>
   </div>
 </template>