Commit 0332e774 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'jivanvl-remove-prepend-bottom-32' into 'master'

Remove prepend-bottom-32 CSS class

See merge request gitlab-org/gitlab!34793
parents f403e299 bb2a4807
...@@ -421,7 +421,6 @@ img.emoji { ...@@ -421,7 +421,6 @@ img.emoji {
.append-bottom-10 { margin-bottom: 10px; } .append-bottom-10 { margin-bottom: 10px; }
.append-bottom-15 { margin-bottom: 15px; } .append-bottom-15 { margin-bottom: 15px; }
.append-bottom-20 { margin-bottom: 20px; } .append-bottom-20 { margin-bottom: 20px; }
.prepend-bottom-32 { margin-bottom: 32px; }
.ml-10 { margin-left: 4.5rem; } .ml-10 { margin-left: 4.5rem; }
.inline { display: inline-block; } .inline { display: inline-block; }
.center { text-align: center; } .center { text-align: center; }
......
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div v-if="isActive" class="full-width prepend-bottom-32"> <div v-if="isActive" class="full-width gl-mb-7">
<gl-deprecated-button :disabled="isConfirmingOrder" variant="success" @click="confirmOrder"> <gl-deprecated-button :disabled="isConfirmingOrder" variant="success" @click="confirmOrder">
<gl-loading-icon v-if="isConfirmingOrder" inline size="sm" /> <gl-loading-icon v-if="isConfirmingOrder" inline size="sm" />
{{ isConfirmingOrder ? $options.i18n.confirming : $options.i18n.confirm }} {{ isConfirmingOrder ? $options.i18n.confirming : $options.i18n.confirm }}
......
...@@ -36,10 +36,7 @@ export default { ...@@ -36,10 +36,7 @@ export default {
<div class="order-summary d-flex flex-column flex-grow-1 prepend-top-5 mt-lg-5"> <div class="order-summary d-flex flex-column flex-grow-1 prepend-top-5 mt-lg-5">
<div class="d-lg-none"> <div class="d-lg-none">
<div @click="toggleCollapse"> <div @click="toggleCollapse">
<h4 <h4 class="d-flex justify-content-between gl-font-lg" :class="{ 'gl-mb-7': !collapsed }">
class="d-flex justify-content-between gl-font-lg"
:class="{ 'prepend-bottom-32': !collapsed }"
>
<div class="d-flex"> <div class="d-flex">
<gl-icon v-if="collapsed" name="chevron-right" :size="18" /> <gl-icon v-if="collapsed" name="chevron-right" :size="18" />
<gl-icon v-else name="chevron-down" :size="18" /> <gl-icon v-else name="chevron-down" :size="18" />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment