Merge pull request #1163 from frappe/mergify/bp/main/pr-1161

fix: More fixes (backport #1161)

frontend/src/components/Controls/GridFieldsEditorModal.vue

@@ -72,7 +72,7 @@
       </div>
     </template>
     <template #actions>
-      <div class="flex flex-col gap-2">
+      <div class="flex items-center gap-2 justify-end">
         <Button
           v-if="dirty"
           class="w-full"

frontend/src/components/Modals/ConvertToDealModal.vue

@@ -1,17 +1,5 @@
 <template>
-  <Dialog
-    v-model="show"
-    :options="{
-      size: 'xl',
-      actions: [
-        {
-          label: __('Convert'),
-          variant: 'solid',
-          onClick: convertToDeal,
-        },
-      ],
-    }"
-  >
+  <Dialog v-model="show" :options="{ size: 'xl' }">
     <template #body-header>
       <div class="mb-6 flex items-center justify-between">
         <div>
@@ -90,6 +78,11 @@
       />
       <ErrorMessage class="mt-4" :message="error" />
     </template>
+    <template #actions>
+      <div class="flex justify-end">
+        <Button :label="__('Convert')" variant="solid" @click="convertToDeal" />
+      </div>
+    </template>
   </Dialog>
 </template>
 <script setup>

frontend/src/components/SLASection.vue

@@ -21,13 +21,10 @@
             <div v-else>{{ s.value }}</div>
           </div>
         </Tooltip>
-        <Dropdown
-          class="form-control"
-          v-if="s.type == 'Select'"
-          :options="s.options"
-        >
+        <Dropdown v-if="s.type == 'Select'" :options="s.options">
           <template #default="{ open }">
             <Button
+              class="form-control bg-surface-white hover:bg-surface-white"
               :label="s.value"
               :iconRight="open ? 'chevron-up' : 'chevron-down'"
             />