TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 12:11:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

add media query in modals and pc in item units

Browse Source
This commit is contained in:
hastichavda
2019-11-14 16:28:09 +05:30
parent 9cce0b10a2
commit 1e04a8d0a5
11 changed files with 95 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/base/modal/CategoryModal.vue
View File

@ -3,7 +3,7 @@
<form action="" @submit.prevent="submitCategoryData"> <form action="" @submit.prevent="submitCategoryData">
<div class="card-body"> <div class="card-body">
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('expenses.category') }}<span class="required text-danger">*</span></label> <label class="col-sm-4 col-form-label input-label">{{ $t('expenses.category') }}<span class="required text-danger">*</span></label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
ref="name" ref="name"

40
resources/assets/js/components/base/modal/CustomerModal.vue
View File

@ -7,7 +7,7 @@
<tab id="basic-home" :name="$t('customers.basic_info')"> <tab id="basic-home" :name="$t('customers.basic_info')">
<div class="basic-info"> <div class="basic-info">
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.display_name') }} <span class="required">*</span></label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.display_name') }} <span class="required">*</span></label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
ref="name" ref="name"
@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.primary_display_name') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.primary_display_name') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
v-model="formData.contact_name" v-model="formData.contact_name"
@ -34,7 +34,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('login.email') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('login.email') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
:invalid="$v.formData.email.$error" :invalid="$v.formData.email.$error"
@ -49,7 +49,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $tc('settings.currencies.currency') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $tc('settings.currencies.currency') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-select <base-select
v-model="currency" v-model="currency"
@ -64,7 +64,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.phone') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
:invalid="$v.formData.phone.$error" :invalid="$v.formData.phone.$error"
@ -79,7 +79,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.website') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.website') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
v-model="formData.website" v-model="formData.website"
@ -100,7 +100,7 @@
<tab id="basic-profile" :name="$t('customers.billing_address')"> <tab id="basic-profile" :name="$t('customers.billing_address')">
<div class="basic-info"> <div class="basic-info">
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.name') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.name') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
v-model="billing.name" v-model="billing.name"
@ -110,7 +110,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.phone') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
:invalid="$v.billing.phone.$error" :invalid="$v.billing.phone.$error"
@ -126,7 +126,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.address') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.address') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-text-area <base-text-area
v-model="billing.address_street_1" v-model="billing.address_street_1"
@ -155,7 +155,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.country') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.country') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-select <base-select
v-model="billingCountry" v-model="billingCountry"
@ -171,7 +171,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.state') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.state') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-select <base-select
v-model="billingState" v-model="billingState"
@ -187,7 +187,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.city') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.city') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-select <base-select
v-model="billingCity" v-model="billingCity"
@ -213,7 +213,7 @@
</div> --> </div> -->
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.zip_code') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.zip_code') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
v-model="billing.zip" v-model="billing.zip"
@ -236,7 +236,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.name') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.name') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
v-model="shipping.name" v-model="shipping.name"
@ -246,7 +246,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.phone') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
:invalid="$v.shipping.phone.$error" :invalid="$v.shipping.phone.$error"
@ -262,7 +262,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.address') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.address') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-text-area <base-text-area
v-model="shipping.address_street_1" v-model="shipping.address_street_1"
@ -291,7 +291,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.country') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.country') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-select <base-select
v-model="shippingCountry" v-model="shippingCountry"
@ -307,7 +307,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.state') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.state') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-select <base-select
v-model="shippingState" v-model="shippingState"
@ -323,7 +323,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.city') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.city') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-select <base-select
v-model="shippingCity" v-model="shippingCity"
@ -339,7 +339,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('customers.zip_code') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('customers.zip_code') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-input <base-input
v-model="shipping.zip" v-model="shipping.zip"

11
resources/assets/js/components/base/modal/ItemModal.vue
View File

@ -3,7 +3,7 @@
<form action="" @submit.prevent="submitItemData"> <form action="" @submit.prevent="submitItemData">
<div class="card-body"> <div class="card-body">
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label"> <label class="col-sm-4 col-form-label input-label">
{{ $t('items.name') }}<span class="required">*</span> {{ $t('items.name') }}<span class="required">*</span>
</label> </label>
<div class="col-sm-7"> <div class="col-sm-7">
@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('items.price') }}<span class="required">*</span></label> <label class="col-sm-4 col-form-label input-label">{{ $t('items.price') }}<span class="required">*</span></label>
<div class="col-sm-7"> <div class="col-sm-7">
<div class="base-input"> <div class="base-input">
<money <money
@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('items.unit') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('items.unit') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-select <base-select
v-model="formData.unit" v-model="formData.unit"
@ -54,7 +54,7 @@
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">{{ $t('items.description') }}</label> <label class="col-sm-4 col-form-label input-label">{{ $t('items.description') }}</label>
<div class="col-sm-7"> <div class="col-sm-7">
<base-text-area <base-text-area
v-model="formData.description" v-model="formData.description"
@ -121,7 +121,8 @@ export default {
{ name: 'kg', value: 'kg' }, { name: 'kg', value: 'kg' },
{ name: 'km', value: 'km' }, { name: 'km', value: 'km' },
{ name: 'lb', value: 'lb' }, { name: 'lb', value: 'lb' },
{ name: 'mg', value: 'mg' } { name: 'mg', value: 'mg' },
{ name: 'pc', value: 'pc ' }
], ],
formData: { formData: {
name: null, name: null,

4
resources/assets/js/plugins/en.js
View File

@ -611,8 +611,6 @@ export default {
estimate_viewed_desc: 'When your customer views the estimate sent via crater dashboard.', estimate_viewed_desc: 'When your customer views the estimate sent via crater dashboard.',
save: 'Save', save: 'Save',
email_save_message: 'Email saved successfully', email_save_message: 'Email saved successfully',
// invoice_viewed_message: 'Invoice viewed updated successfully',
// estimate_viewed_message: 'Estimate viewed updated successfully',
please_enter_email: 'Please Enter Email' please_enter_email: 'Please Enter Email'
}, },
tax_types: { tax_types: {
@ -622,7 +620,6 @@ export default {
add_new_tax: 'Add New Tax', add_new_tax: 'Add New Tax',
tax_settings: 'Tax Settings', tax_settings: 'Tax Settings',
tax_per_item: 'Tax Per Item', tax_per_item: 'Tax Per Item',
// tax_per_item_switch: 'Tax Per Item updated successfully',
tax_name: 'Tax Name', tax_name: 'Tax Name',
compound_tax: 'Compound Tax', compound_tax: 'Compound Tax',
percent: 'Percent', percent: 'Percent',
@ -660,7 +657,6 @@ export default {
preference: 'Preference | Preferences', preference: 'Preference | Preferences',
general_settings: 'Default preferences for the system.', general_settings: 'Default preferences for the system.',
updated_message: 'Preferences updated successfully', updated_message: 'Preferences updated successfully',
// set_discount_per_item_message: 'Discount set per item updated successfully',
select_language: 'select language', select_language: 'select language',
select_time_zone: 'select Time Zone', select_time_zone: 'select Time Zone',
select_date_formate: 'select Date Formate', select_date_formate: 'select Date Formate',

8
resources/assets/js/plugins/es.js
View File

@ -529,7 +529,8 @@ export default {
preferences: 'Preferencias', preferences: 'Preferencias',
notifications: 'Notificaciones', notifications: 'Notificaciones',
tax_types: 'Tipos de impuestos', tax_types: 'Tipos de impuestos',
expense_category: 'Categorías de gastos' expense_category: 'Categorías de gastos',
update_app: 'Actualizar aplicación'
}, },
title: 'Configuraciones', title: 'Configuraciones',
setting: 'Configuraciones | Configuraciones', setting: 'Configuraciones | Configuraciones',
@ -661,6 +662,11 @@ export default {
select_time_zone: 'selecciona la zona horaria', select_time_zone: 'selecciona la zona horaria',
select_date_formate: 'seleccione formato de fecha', select_date_formate: 'seleccione formato de fecha',
select_financial_year: 'seleccione año financiero' select_financial_year: 'seleccione año financiero'
},
update_app: {
title: 'Actualizar aplicación',
description: 'actualizar la descripción de la aplicación',
update: 'Actualizar'
} }
}, },
wizard: { wizard: {

8
resources/assets/js/plugins/fr.js
View File

@ -529,7 +529,8 @@ export default {
preferences: 'Préférences', preferences: 'Préférences',
notifications: 'Les notifications', notifications: 'Les notifications',
tax_types: 'Types de taxe', tax_types: 'Types de taxe',
expense_category: 'Catégories de dépenses' expense_category: 'Catégories de dépenses',
update_app: "Mise à jour de l'application"
}, },
title: 'Paramètres', title: 'Paramètres',
setting: 'Paramètres | Paramètres', setting: 'Paramètres | Paramètres',
@ -664,6 +665,11 @@ export default {
select_time_zone: 'sélectionnez le fuseau horaire', select_time_zone: 'sélectionnez le fuseau horaire',
select_date_formate: 'sélectionnez Date Formate', select_date_formate: 'sélectionnez Date Formate',
select_financial_year: 'sélectionner lexercice' select_financial_year: 'sélectionner lexercice'
},
update_app: {
title: "Mise à jour de l'application",
description: "mettre à jour la description de l'application",
update: 'Mise à jour'
} }
}, },
wizard: { wizard: {

3
resources/assets/js/views/items/Create.vue
View File

@ -112,7 +112,8 @@ export default {
{ name: 'kg', value: 'kg' }, { name: 'kg', value: 'kg' },
{ name: 'km', value: 'km' }, { name: 'km', value: 'km' },
{ name: 'lb', value: 'lb' }, { name: 'lb', value: 'lb' },
{ name: 'mg', value: 'mg' } { name: 'mg', value: 'mg' },
{ name: 'pc', value: 'pc ' }
], ],
formData: { formData: {
name: '', name: '',

3
resources/assets/js/views/items/Index.vue
View File

@ -245,7 +245,8 @@ export default {
{ name: 'kg', value: 'kg' }, { name: 'kg', value: 'kg' },
{ name: 'km', value: 'km' }, { name: 'km', value: 'km' },
{ name: 'lb', value: 'lb' }, { name: 'lb', value: 'lb' },
{ name: 'mg', value: 'mg' } { name: 'mg', value: 'mg' },
{ name: 'pc', value: 'pc ' }
], ],
isRequestOngoing: true, isRequestOngoing: true,
filtersApplied: false, filtersApplied: false,

16
resources/assets/sass/components/category-modal.scss vendored
View File

@ -19,3 +19,19 @@
} }
} }
@media(max-width: $x-small-breakpoint ) {
.base-modal {
.category-modal {
.input-label {
text-align: left;
}
}
}
}

17
resources/assets/sass/components/customer-modal.scss vendored
View File

@ -34,3 +34,20 @@
} }
} }
@media(max-width: $x-small-breakpoint ) {
.base-modal {
.customer-modal {
.input-label {
text-align: left;
}
}
}
}

17
resources/assets/sass/components/item-modal.scss vendored
View File

@ -19,3 +19,20 @@
} }
} }
@media(max-width: $x-small-breakpoint ) {
.base-modal {
.item-modal {
.input-label {
text-align: left;
}
}
}
}