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

Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1

This commit is contained in:
merdan 2022-02-28 17:06:59 +05:00
parent 2822c21060 e23b96bd29
commit cf740f86c7
8 changed files with 12 additions and 20 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=e7804c84a3c923405168",
"/css/admin.css": "/css/admin.css?id=2f1b3aea4447fd4b8eb1"
"/css/admin.css": "/css/admin.css?id=190719708b97aebe06f8"
}

9
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss vendored
View File

@ -832,7 +832,6 @@ body {
}
.page-action {
position: absolute;
right: 10px;
margin-top: 0px;
}
@ -848,8 +847,6 @@ body {
.icon.search-icon.search-btn {
position: absolute;
// margin-top: 6px;
// right: 16px;
}
.notif-filter {
@ -867,12 +864,6 @@ body {
.page-header {
.page-title {
width: 100% !important;
.control-group {
margin-top: 10px !important;
width: 100% !important;
margin-left: 0px !important;
}
}
.page-action {

11
packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php
View File

@ -7,16 +7,17 @@
@push('css')
<style>
@media only screen and (max-width: 768px){
.content-container .content .page-header .page-action {
position: absolute !important;
right: 10px !important;
}
.content-container .content .page-header .page-action button {
position: relative;
right: 0px !important;
top: 0px !important;
}
.content-container .content .page-header .page-title .control-group {
margin-top: 20px!important;
width: 100%!important;
margin-left: 0!important;
}
}
</style>
@endpush

2
packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
View File

@ -128,7 +128,7 @@
<div class="misc-controls">
<a href="{{ route('shop.home.index') }}" class="link">{{ __('shop::app.checkout.cart.continue-shopping') }}</a>
<div>
<div style="display:flex;">
@if ($cart->hasProductsWithQuantityBox())
<button type="submit" class="btn btn-lg btn-primary" id="update_cart_button">
{{ __('shop::app.checkout.cart.update-cart') }}

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -4,7 +4,7 @@
"/js/velocity.js": "/js/velocity.js?id=8467110c3c1ee5e363d02172acbf1a3f",
"/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
"/js/components.js": "/js/components.js?id=f536199f308a82f48041993dd85acdd3",
"/css/velocity.css": "/css/velocity.css?id=47d53499747d0380f5aa4c10a2f237c0",
"/css/velocity.css": "/css/velocity.css?id=869a81556eed304d3e19e14988d0997e",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",

2
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -1617,7 +1617,7 @@
.sticky-header {
top: 0px;
height: 55px;
z-index: 100;
z-index: 1000;
position: sticky;
background: white;