Extra padding changes

openfoodfacts · Dec 9, 2024 · b93041b · b93041b
1 parent c35d75c
commit b93041b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 48 deletions.
diff --git a/src/components/ContributionAssistantPriceFormCard.vue b/src/components/ContributionAssistantPriceFormCard.vue
@@ -28,20 +28,15 @@
       </v-alert>
       <v-row>
         <v-col>
-          <h3 class="required mb-1">
-            Price
-          </h3>
-          <h3 v-if="productPriceForm.type == 'CATEGORY'" class="mb-1">
-            <v-item-group v-model="productPriceForm.price_per" class="d-inline" mandatory>
-              <v-item v-for="cpp in categoryPricePerList" :key="cpp.key" v-slot="{ isSelected, toggle }" :value="cpp.key">
-                <v-chip class="mr-1" :style="isSelected ? 'border: 1px solid #9E9E9E' : 'border: 1px solid transparent'" @click="toggle">
-                  <v-icon start :icon="isSelected ? 'mdi-checkbox-marked-circle' : 'mdi-circle-outline'" />
-                  {{ cpp.value }}
-                </v-chip>
-              </v-item>
-            </v-item-group>
-          </h3>
-          <PriceInputRow :priceForm="productPriceForm" :hideCurrencyChoice="true" @filled="pricePriceFormFilled = $event" />
+          <v-item-group v-if="productPriceForm.type == 'CATEGORY'" v-model="productPriceForm.price_per" class="d-inline" mandatory>
+            <v-item v-for="cpp in categoryPricePerList" :key="cpp.key" v-slot="{ isSelected, toggle }" :value="cpp.key">
+              <v-chip class="mr-1" :style="isSelected ? 'border: 1px solid #9E9E9E' : 'border: 1px solid transparent'" @click="toggle">
+                <v-icon start :icon="isSelected ? 'mdi-checkbox-marked-circle' : 'mdi-circle-outline'" />
+                {{ cpp.value }}
+              </v-chip>
+            </v-item>
+          </v-item-group>
+          <PriceInputRow class="mt-0" :priceForm="productPriceForm" :hideCurrencyChoice="true" @filled="pricePriceFormFilled = $event" />
         </v-col>
       </v-row>
     </v-card-text>

diff --git a/src/components/PriceInputRow.vue b/src/components/PriceInputRow.vue
@@ -1,6 +1,6 @@
 <template>
   <v-row>
-    <v-col :cols="priceForm.price_is_discounted ? '6' : '12'">
+    <v-col :cols="priceForm.price_is_discounted ? '6' : '12'" class="pb-0">
       <v-text-field
         :model-value="priceForm.price"
         :label="priceForm.price_is_discounted ? $t('PriceForm.LabelDiscounted') : $t('PriceForm.Label')"
@@ -18,7 +18,7 @@
         </template>
       </v-text-field>
     </v-col>
-    <v-col v-if="priceForm.price_is_discounted" cols="6">
+    <v-col v-if="priceForm.price_is_discounted" cols="6" class="pb-0">
       <v-text-field
         :model-value="priceForm.price_without_discount"
         :label="$t('PriceForm.LabelFull')"
@@ -40,14 +40,14 @@
         hide-details="auto"
       />
     </v-col>
-  </v-row>
 
-  <ChangeCurrencyDialog
-    v-if="changeCurrencyDialog"
-    v-model="changeCurrencyDialog"
-    @newCurrencySelected="setCurrencyData($event)"
-    @close="changeCurrencyDialog = false"
-  />
+    <ChangeCurrencyDialog
+      v-if="changeCurrencyDialog"
+      v-model="changeCurrencyDialog"
+      @newCurrencySelected="setCurrencyData($event)"
+      @close="changeCurrencyDialog = false"
+    />
+  </v-row>
 </template>
 
 <script>

diff --git a/src/views/AddPriceMultiple.vue b/src/views/AddPriceMultiple.vue
@@ -60,22 +60,17 @@
             </v-row>
             <v-row>
               <v-col>
-                <h3 class="required mb-1">
-                  {{ $t('Common.Price') }}
-                </h3>
-                <h3 class="mb-1">
-                  <v-item-group v-if="productPriceForm.type === 'CATEGORY'" v-model="productPriceForm.price_per" class="d-inline" mandatory>
-                    <v-item v-for="cpp in categoryPricePerList" :key="cpp.key" v-slot="{ isSelected, toggle }" :value="cpp.key">
-                      <v-chip class="mr-1" :style="isSelected ? 'border: 1px solid #9E9E9E' : 'border: 1px solid transparent'" @click="toggle">
-                        <v-icon start :icon="isSelected ? 'mdi-checkbox-marked-circle' : 'mdi-circle-outline'" />
-                        {{ cpp.value }}
-                      </v-chip>
-                    </v-item>
-                  </v-item-group>
-                </h3>
-                <PriceInputRow :priceForm="productPriceForm" :product="productPriceForm.product" :hideCurrencyChoice="true" @filled="pricePriceFormFilled = $event" />
+                <v-item-group v-if="productPriceForm.type === 'CATEGORY'" v-model="productPriceForm.price_per" class="d-inline" mandatory>
+                  <v-item v-for="cpp in categoryPricePerList" :key="cpp.key" v-slot="{ isSelected, toggle }" :value="cpp.key">
+                    <v-chip class="mr-1" :style="isSelected ? 'border: 1px solid #9E9E9E' : 'border: 1px solid transparent'" @click="toggle">
+                      <v-icon start :icon="isSelected ? 'mdi-checkbox-marked-circle' : 'mdi-circle-outline'" />
+                      {{ cpp.value }}
+                    </v-chip>
+                  </v-item>
+                </v-item-group>
               </v-col>
             </v-row>
+            <PriceInputRow class="mt-0" :priceForm="productPriceForm" :product="productPriceForm.product" :hideCurrencyChoice="true" @filled="pricePriceFormFilled = $event" />
             <v-row>
               <v-col>
                 <v-btn

diff --git a/src/views/AddPriceSingle.vue b/src/views/AddPriceSingle.vue
@@ -51,17 +51,19 @@
           </template>
           <v-divider />
           <v-card-text>
-            <h3 class="mb-1">
-              <v-item-group v-if="addPriceSingleForm.type === 'CATEGORY'" v-model="addPriceSingleForm.price_per" class="d-inline" mandatory>
-                <v-item v-for="cpp in categoryPricePerList" :key="cpp.key" v-slot="{ isSelected, toggle }" :value="cpp.key">
-                  <v-chip class="mr-1" :style="isSelected ? 'border: 1px solid #9E9E9E' : 'border: 1px solid transparent'" @click="toggle">
-                    <v-icon start :icon="isSelected ? 'mdi-checkbox-marked-circle' : 'mdi-circle-outline'" />
-                    {{ cpp.value }}
-                  </v-chip>
-                </v-item>
-              </v-item-group>
-            </h3>
-            <PriceInputRow :priceForm="addPriceSingleForm" :product="addPriceSingleForm.product" :hideCurrencyChoice="true" @filled="pricePriceFormFilled = $event" />
+            <v-row>
+              <v-col>
+                <v-item-group v-if="addPriceSingleForm.type === 'CATEGORY'" v-model="addPriceSingleForm.price_per" class="d-inline" mandatory>
+                  <v-item v-for="cpp in categoryPricePerList" :key="cpp.key" v-slot="{ isSelected, toggle }" :value="cpp.key">
+                    <v-chip class="mr-1" :style="isSelected ? 'border: 1px solid #9E9E9E' : 'border: 1px solid transparent'" @click="toggle">
+                      <v-icon start :icon="isSelected ? 'mdi-checkbox-marked-circle' : 'mdi-circle-outline'" />
+                      {{ cpp.value }}
+                    </v-chip>
+                  </v-item>
+                </v-item-group>
+              </v-col>
+            </v-row>
+            <PriceInputRow class="mt-0" :priceForm="addPriceSingleForm" :product="addPriceSingleForm.product" :hideCurrencyChoice="true" @filled="pricePriceFormFilled = $event" />
           </v-card-text>
         </v-card>
       </v-col>