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

Merge pull request #3287 from jitendra-webkul/1.0 

Issue #3246 fixed
This commit is contained in:
Jitendra Singh 2020-06-19 13:07:07 +05:30 committed by GitHub
parent e23989b833 a7a4fd12e5
commit 010a7fb021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 57 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=a14c779523092ac32b88",
"/css/admin.css": "/css/admin.css?id=88c7c29cf850edc4bfb3"
"/css/admin.css": "/css/admin.css?id=525b83d3e88c080cfe99"
}

32
packages/Webkul/Admin/src/Resources/assets/sass/partials/_rtl.scss vendored
View File

@ -47,24 +47,6 @@
.control-group {
margin-right: 20px;
margin-left: 0px;
&.has-error.date, &.has-error.date {
&::after {
margin-top: -12px;
}
}
}
.control-group.date {
&::after {
margin-top: 6px;
position: absolute;
margin-right: -35px;
}
&:last-child {
margin-left: 0px;
}
}
}
@ -242,21 +224,7 @@
float: left;
}
.control-group.date {
&::after {
position: absolute;
right: calc(70% - 40px);
}
}
.pagination .page-item .icon {
transform: rotate(180deg);
}
.slot-list {
.control-group.date::after {
top: 18px;
right: calc(100% - 40px);
}
}
}

10
packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php
View File

@ -1,10 +1,5 @@
@section('css')
<style>
.slot-list .control-group.date::after {
margin-top: -13px;
left: 100%;
}
.has-control-group .control-group {
width: 50%;
float: left;
@ -17,11 +12,6 @@
.has-control-group .control-group:last-child {
padding-left: 10px;
}
.rtl .control-group.date::after {
right: 100%;
margin-right: -40px;
}
</style>
@stop

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=37c14af2c4e52712039a",
"/css/ui.css": "/css/ui.css?id=249bf606a388b3ce946d"
"/js/ui.js": "/js/ui.js?id=c86f70be4c5422f1479c",
"/css/ui.css": "/css/ui.css?id=590bacf10a97f0d0a7e3"
}

16
packages/Webkul/Ui/src/Resources/assets/js/components/date.vue
View File

@ -1,13 +1,14 @@
<template>
<span style="display: flex;align-items: center;">
<span>
<slot>
<input type="text" :name="name" class="control" :value="value" data-input>
</slot>
<button
class="btn"
style="height:100%;margin-left: 8px; margin-top: 5px;"
@click.prevent="clear"
> <span class="icon trash-icon"></span> </button>
<span
class="icon cross-icon"
v-if="enableRemoveButton"
@click.prevent="clear">
</span>
</span>
</template>
@ -17,7 +18,10 @@ import Flatpickr from 'flatpickr';
export default {
props: {
name: String,
value: String,
enableRemoveButton: Boolean
},
data () {

18
packages/Webkul/Ui/src/Resources/assets/js/components/datetime.vue
View File

@ -1,13 +1,14 @@
<template>
<span style="display: flex;align-items: center;">
<span>
<slot>
<input type="text" :name="name" class="control" :value="value" data-input>
</slot>
<button
class="btn"
style="height:100%;margin-left: 8px; margin-top: 5px;"
@click.prevent="clear"
> <span class="icon trash-icon"></span> </button>
<span
class="icon cross-icon"
v-if="enableRemoveButton"
@click.prevent="clear">
</span>
</span>
</template>
@ -17,7 +18,10 @@ import Flatpickr from "flatpickr";
export default {
props: {
name: String,
value: String
value: String,
enableRemoveButton: Boolean
},
data() {

1
packages/Webkul/Ui/src/Resources/assets/js/components/time.vue
View File

@ -12,6 +12,7 @@ import Flatpickr from "flatpickr";
export default {
props: {
name: String,
value: String
},

32
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -650,6 +650,13 @@ h5 {
left: 70%;
top: 50%;
}
.cross-icon {
position: absolute;
cursor: pointer;
margin-left: -54px;
top: 38px;
}
}
.control-info {
@ -693,24 +700,43 @@ h5 {
.control-group {
&.date, &.datetime {
&::after {
right: 50px !important;
top: 6px;
left: unset;
}
.cross-icon {
top: 10px;
}
}
}
}
.rtl {
.control-group {
&.date, &.datetime {
&::after {
margin-right: -34px;
right: 70%;
}
.cross-icon {
margin-right: -54px;
top: 38px;
}
}
}
.table {
.control-group {
&.date, &.datetime {
&::after {
left: 84px !important;
top: 6px;
right: unset !important;
}
}
.cross-icon {
top: 10px;
}
}
}
}