merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2624 from jitendra-webkul/booking-product 

Up down icon issue fixed
This commit is contained in:
Jitendra Singh 2020-03-06 19:10:54 +05:30 committed by GitHub
parent 9846fb9408 27aa309754
commit 741c1f25ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 66 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css vendored
View File

File diff suppressed because one or more lines are too long

16
packages/Webkul/BookingProduct/publishable/assets/images/Icon-Calendar.svg Executable file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Icon-Calendar</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Icon-Calendar" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(3.000000, 2.000000)">
<path d="M2,9 L4,9 L4,11 L2,11 L2,9 Z M5,9 L7,9 L7,11 L5,11 L5,9 Z M8,9 L10,9 L10,11 L8,11 L8,9 Z M11,9 L13,9 L13,11 L11,11 L11,9 Z M14,9 L16,9 L16,11 L14,11 L14,9 Z M2,12 L4,12 L4,14 L2,14 L2,12 Z M5,12 L7,12 L7,14 L5,14 L5,12 Z M8,12 L10,12 L10,14 L8,14 L8,12 Z M11,12 L13,12 L13,14 L11,14 L11,12 Z M14,12 L16,12 L16,14 L14,14 L14,12 Z M11,15 L13,15 L13,17 L11,17 L11,15 Z M2,15 L4,15 L4,17 L2,17 L2,15 Z M5,15 L7,15 L7,17 L5,17 L5,15 Z M8,15 L10,15 L10,17 L8,17 L8,15 Z" id="Combined-Shape" fill="#8E8E8E"></path>
<rect id="Rectangle-6" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x="0" y="2" width="18" height="18" rx="2"></rect>
<path d="M0,7 L17.2233522,7" id="Path-2" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M5.05517578,0.0166015625 L5.05517578,2" id="Path-3" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M13,0 L13,1.91914536" id="Path-3-Copy" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

2
packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/css/default-booking.css": "/css/default-booking.css?id=3607d6ec4cb93857b42c",
"/css/velocity-booking.css": "/css/velocity-booking.css?id=64d628792a52ad6151b7"
"/css/velocity-booking.css": "/css/velocity-booking.css?id=fb0d5b9e37ed77d662d1"
}

16
packages/Webkul/BookingProduct/src/Resources/assets/images/Icon-Calendar.svg Executable file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Icon-Calendar</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Icon-Calendar" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(3.000000, 2.000000)">
<path d="M2,9 L4,9 L4,11 L2,11 L2,9 Z M5,9 L7,9 L7,11 L5,11 L5,9 Z M8,9 L10,9 L10,11 L8,11 L8,9 Z M11,9 L13,9 L13,11 L11,11 L11,9 Z M14,9 L16,9 L16,11 L14,11 L14,9 Z M2,12 L4,12 L4,14 L2,14 L2,12 Z M5,12 L7,12 L7,14 L5,14 L5,12 Z M8,12 L10,12 L10,14 L8,14 L8,12 Z M11,12 L13,12 L13,14 L11,14 L11,12 Z M14,12 L16,12 L16,14 L14,14 L14,12 Z M11,15 L13,15 L13,17 L11,17 L11,15 Z M2,15 L4,15 L4,17 L2,17 L2,15 Z M5,15 L7,15 L7,17 L5,17 L5,15 Z M8,15 L10,15 L10,17 L8,17 L8,15 Z" id="Combined-Shape" fill="#8E8E8E"></path>
<rect id="Rectangle-6" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x="0" y="2" width="18" height="18" rx="2"></rect>
<path d="M0,7 L17.2233522,7" id="Path-2" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M5.05517578,0.0166015625 L5.05517578,2" id="Path-3" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M13,0 L13,1.91914536" id="Path-3-Copy" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

26
packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss vendored
View File

@ -41,10 +41,11 @@
.icon {
position: relative;
width: 10px;
height: 10px;
display: inline-block;
width: 8px;
height: 8px;
margin-left: 5px;
top: 0;
top: -1px;
&.arrow-down-icon {
background-image: url(../images/arrow-down.svg) !important;
@ -223,4 +224,23 @@
}
}
}
}
.form-group {
position: relative;
&.date, &.datetime {
&::after {
background-image: url("../images/Icon-Calendar.svg");
width: 24px;
height: 24px;
content: '';
display: inline-block;
vertical-align: middle;
margin-left: -34px;
margin-top: 2px;
top: 3px !important;
pointer-events: none;
}
}
}

1
packages/Webkul/BookingProduct/src/Resources/lang/en/app.php
View File

@ -73,6 +73,7 @@ return [
'slot-duration' => 'Slot Duration',
'slot-duration-in-minutes' => ':minutes Minutes',
'today-availability' => 'Today Availability',
'slots-for-all-days' => 'Show for all days',
'sunday' => 'Sunday',
'monday' => 'Monday',
'tuesday' => 'Tuesday',

4
packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/appointment.blade.php
View File

@ -22,9 +22,9 @@
</span>
<div class="toggle" @click="showDaysAvailability = ! showDaysAvailability">
Show for all days
{{ __('bookingproduct::app.shop.products.slots-for-all-days') }}
<i class="icon arrow-down-icon"></i>
<i class="icon" :class="[! showDaysAvailability ? 'arrow-down-icon' : 'arrow-up-icon']"></i>
</div>
<div class="days-availability" v-show="showDaysAvailability">

4
packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/table.blade.php
View File

@ -22,9 +22,9 @@
</span>
<div class="toggle" @click="showDaysAvailability = ! showDaysAvailability">
Show for all days
{{ __('bookingproduct::app.shop.products.slots-for-all-days') }}
<i class="icon arrow-down-icon"></i>
<i class="icon" :class="[! showDaysAvailability ? 'arrow-down-icon' : 'arrow-up-icon']"></i>
</div>
<div class="days-availability" v-show="showDaysAvailability">

4
packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/appointment.blade.php
View File

@ -22,9 +22,9 @@
</span>
<div class="toggle" @click="showDaysAvailability = ! showDaysAvailability">
Show for all days
{{ __('bookingproduct::app.shop.products.slots-for-all-days') }}
<i class="icon arrow-down-icon"></i>
<i class="icon" :class="[! showDaysAvailability ? 'arrow-down-icon' : 'arrow-up-icon']"></i>
</div>
<div class="days-availability" v-show="showDaysAvailability">

4
packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php
View File

@ -22,9 +22,9 @@
</span>
<div class="toggle" @click="showDaysAvailability = ! showDaysAvailability">
Show for all days
{{ __('bookingproduct::app.shop.products.slots-for-all-days') }}
<i class="icon arrow-down-icon"></i>
<i class="icon" :class="[! showDaysAvailability ? 'arrow-down-icon' : 'arrow-up-icon']"></i>
</div>
<div class="days-availability" v-show="showDaysAvailability">