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

Merge pull request #5658 from deepaksinghgusain227/navbar-top-account-ui 

Fixed Admin Account Ui issue
This commit is contained in:
Devansh 2022-01-20 14:59:52 +05:30 committed by GitHub
parent 69eff9dbdd 5b268226cf
commit 9d09e79533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 49 additions and 11 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=94da304c8b02ad3ba649",
"/css/admin.css": "/css/admin.css?id=a6d49861c786caa6ae00"
"/css/admin.css": "/css/admin.css?id=0bb475332a7616042381"
}

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

@ -87,6 +87,24 @@ body {
color: #a2a2a2;
}
.profile-info-div{
display: flex;
.profile-info-icon{
height: 31px;
width: 30px;
background: #3c41ff;
padding: 6px;
text-align: center;
font-size: 17px;
font-weight: 600;
color: #fff;
border-radius: 50%;
margin-right: 6px;
margin-top: 3px;
}
}
.dropdown-list {
top: 63px;
right: 0px;

21
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -61,7 +61,7 @@
<div class="dropdown-toggle">
<i class="icon locale-icon" style="height:34px;width:34px"></i>
<i class="icon locale-icon-bold" style="height:26px;width:26px"></i>
</div>
<div class="dropdown-list bottom-right">
@ -83,13 +83,20 @@
<div class="profile-info">
<div class="dropdown-toggle">
<div style="display: inline-block; vertical-align: middle;">
<span class="name">
{{ auth()->guard('admin')->user()->name }}
</span>
<div class="profile-info-div">
<div class="profile-info-icon">
<span>{{ substr(auth()->guard('admin')->user()->name, 0, 1) }}</span>
</div>
<div class="profile-info-desc">
<span class="name">
{{ auth()->guard('admin')->user()->name }}
</span>
<span class="role">
{{ auth()->guard('admin')->user()->role['name'] }}
</span>
<span class="role">
{{ auth()->guard('admin')->user()->role['name'] }}
</span>
</div>
</div>
</div>
<i class="icon arrow-down-icon active"></i>
</div>

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

File diff suppressed because one or more lines are too long

4
packages/Webkul/Ui/publishable/assets/images/Local-Icon-bold.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M39 19C39 27.2843 24 44 24 44C24 44 9 27.2843 9 19C9 10.7157 15.7157 4 24 4C32.2843 4 39 10.7157 39 19Z" stroke="#8184AB" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
<circle cx="24" cy="19" r="7" stroke="#8184AB" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 413 B

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

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=99de3c7f62be5fb50eaf",
"/css/ui.css": "/css/ui.css?id=dba4251d81d38dfeef7b"
"/css/ui.css": "/css/ui.css?id=cd88292a65dfcf07d879"
}

4
packages/Webkul/Ui/src/Resources/assets/images/Local-Icon-bold.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M39 19C39 27.2843 24 44 24 44C24 44 9 27.2843 9 19C9 10.7157 15.7157 4 24 4C32.2843 4 39 10.7157 39 19Z" stroke="#8184AB" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
<circle cx="24" cy="19" r="7" stroke="#8184AB" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 413 B

5
packages/Webkul/Ui/src/Resources/assets/sass/main/_icons.scss vendored
View File

@ -166,6 +166,11 @@
background-image: url("../images/Local-Icon.svg");
}
.locale-icon-bold {
@extend %menu-properties;
background-image: url("../images/Local-Icon-bold.svg");
}
.store-icon {
@extend %menu-properties;
background-image: url("../images/store-icon.svg");