This commit is contained in:
pushuo 2022-08-04 15:56:47 +08:00
parent 006750c9bc
commit 30a76e22a9
4 changed files with 58 additions and 28 deletions

View File

@ -598,10 +598,10 @@ body.page-seller-product .share-link-pop .share-links-code img {
.header-wrap .header-right > .navbar > li a.nav-link.show {
background-color: #eee;
}
.header-wrap .header-right .navbar.navbar-right li a.nav-link {
.header-wrap .header-right .navbar.navbar-left li a.nav-link {
position: relative;
}
.header-wrap .header-right .navbar.navbar-right li a.nav-link:after {
.header-wrap .header-right .navbar.navbar-left li a.nav-link:after {
content: "";
position: absolute;
left: 0;
@ -611,12 +611,18 @@ body.page-seller-product .share-link-pop .share-links-code img {
height: 3px;
background-color: #fd560f;
}
.header-wrap .header-right .navbar.navbar-right li.active, .header-wrap .header-right .navbar.navbar-right li:hover {
.header-wrap .header-right .navbar.navbar-left li.active, .header-wrap .header-right .navbar.navbar-left li:hover {
font-weight: bold;
}
.header-wrap .header-right .navbar.navbar-right li.active a:after, .header-wrap .header-right .navbar.navbar-right li:hover a:after {
.header-wrap .header-right .navbar.navbar-left li.active a:after, .header-wrap .header-right .navbar.navbar-left li:hover a:after {
display: block;
}
.header-wrap .header-right .navbar.navbar-right > li {
padding: 0 0.5rem;
}
.header-wrap .header-right .navbar.navbar-right > li a.nav-link {
padding: 0 10px;
}
.header-wrap .avatar {
height: 36px;
margin-bottom: -15px;

View File

@ -74,30 +74,42 @@
}
}
.navbar.navbar-right {
li {
a.nav-link {
position: relative;
.navbar {
&.navbar-left {
li {
a.nav-link {
position: relative;
&:after {
content: '';
position: absolute;
left: 0;
display: none;
bottom: 0;
width: 100%;
height: 3px;
background-color: $primary;
&:after {
content: '';
position: absolute;
left: 0;
display: none;
bottom: 0;
width: 100%;
height: 3px;
background-color: $primary;
}
}
&.active, &:hover {
font-weight: bold;
a {
&:after {
display: block;
}
}
}
}
}
&.active, &:hover {
font-weight: bold;
&.navbar-right {
> li {
padding: 0 .5rem;
a {
&:after {
display: block;
}
a.nav-link {
padding: 0 10px;
}
}
}

View File

@ -6,18 +6,29 @@
</div>
</div>
<div class="header-right">
<ul class="navbar navbar-right">
<ul class="navbar navbar-left">
@foreach ($links as $link)
<li class="nav-item {{ $link['active'] ? 'active' : '' }}"><a href="{{ $link['url'] }}" class="nav-link">{{ $link['title'] }}</a></li>
@endforeach
</ul>
<ul class="navbar">
<ul class="navbar navbar-right">
<li class="nav-item">
<a target="_blank" href="{{ shop_route('home.index') }}" class="nav-link"><i class="bi bi-send me-1"></i> @lang('admin/common.access_frontend')</a>
</li>
<li class="nav-item">
<div class="dropdown">
<a href="#" class="nav-link dropdown-toggle px-2" data-bs-toggle="dropdown">
<a class="nav-link dropdown-toggle" href="javascript:void(0)" data-bs-toggle="dropdown">{{ $admin_language['name'] }}</a>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuLink">
@foreach ($admin_languages as $language)
<li><a href="" class="dropdown-item">{{ $language['name'] }}</a></li>
@endforeach
</ul>
</div>
</li>
<li class="nav-item">
<div class="dropdown">
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
<img src="http://dummyimage.com/100x100" class="avatar img-fluid rounded-circle me-1">
<span class="text-dark ml-2">{{ current_user()->name }}</span>
</a>

View File

@ -117,7 +117,7 @@
id: null,
name: '',
email: '',
locale: @json($admin_language ?? 'en'),
locale: @json($admin_language['code'] ?? 'en'),
password: '',
roles: [],
},
@ -144,6 +144,7 @@
id: tax.id,
name: tax.name,
email: tax.email,
locale: tax.locale,
roles: tax.roles.map(e => e.id),
}
}
@ -190,7 +191,7 @@
closeCustomersDialog(form) {
Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
this.dialog.form.roles = [];
this.dialog.form.locale = @json($admin_language ?? 'en');
this.dialog.form.locale = @json($admin_language['code'] ?? 'en');
this.dialog.show = false
this.$refs[form].resetFields();
}