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

conflict resolved

This commit is contained in:
prateek srivastava 2022-03-07 11:40:02 +05:30
parent 9ea9584e05 1d3e0c74ed
commit 2cc1bef92f
4 changed files with 7 additions and 4 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/src/Resources/assets/sass/partials/_mobile.scss vendored
View File

@ -154,7 +154,7 @@ $toggleColor: #3c41ff;
min-width: 300px;
max-width: 25vw;
width: 100vw;
height: 100vh;
height: 100%;
z-index: 1;
padding-bottom: 10px;
transition: transform 0.3s ease;

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

@ -3,6 +3,9 @@
.form-container {
text-align: right !important;
.table {
overflow-y: auto;
}
}
.navbar-top {

4
packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/downloadable.blade.php
View File

@ -36,7 +36,7 @@
@push('scripts')
<script type="text/x-template" id="downloadable-link-list-template">
<div class="table" style="overflow-x: unset;">
<div class="table" style="overflow-x: auto;">
<table style="margin-bottom: 20px;">
<thead>
<tr>
@ -175,7 +175,7 @@
</script>
<script type="text/x-template" id="downloadable-sample-list-template">
<div class="table" style="overflow-x: unset;">
<div class="table" style="overflow-x: auto;">
<table style="margin-bottom: 20px;">
<thead>
<tr>