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

Conflict Resolved

This commit is contained in:
junaidjaved248 2021-10-25 13:08:19 +05:00
parent ea294e6cfb a8202a9196
commit db60208fe0
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -1,6 +1,6 @@
{
"/js/velocity.js": "/js/velocity.js?id=790c983acca1c5c5a5d4",
"/js/velocity-core.js": "/js/velocity-core.js?id=6d269d95c3cfc74183cb",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=049a30d34102e57e5ea7",
"/js/velocity-core.js": "/js/velocity-core.js?id=6d269d95c3cfc74183cb"
"/css/velocity.css": "/css/velocity.css?id=82edad7c83138009f4db"
}

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

@ -1099,6 +1099,20 @@ i.within-circle {
width: 97px;
-webkit-appearance: none
}
.nav-container {
top: 0px;
left: 0px;
width: 75%;
position: fixed !important;
opacity: 1;
z-index: 9999;
height: 100vh;
font-size: 16px;
overflow-y: scroll;
box-shadow: 5px 0 5px -5px #333;
background-color: #FFFFFF;
}
}
.account-content .account-layout .account-table-content.profile-page-content .table {