Skip to content

Commit

Permalink
Update 3labs-logo SVG and styles in the admin bar and render blade
Browse files Browse the repository at this point in the history
  • Loading branch information
@murdercode
murdercode committed Oct 12, 2023
1 parent 68c2a3a commit 1b63238
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 69 deletions.
36 changes: 11 additions & 25 deletions resources/views/components/icons/3labs-logo.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
<svg width="16px" height="16px" viewBox="0 0 52 52" version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:space="preserve" xmlns:serif="http://www.serif.com/"
style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;display:inline-block">
<g transform="matrix(1,0,0,1,-1518.43,-664.935)">
<g transform="matrix(2.63401,0,0,2.63401,-1979.26,-3607.86)">
<g transform="matrix(0.37965,0,0,0.37965,751.427,1369.72)">
<rect x="1518.43" y="664.935" width="51.391" height="51.391"
style="fill:rgb(239,68,68);"/>
</g>
<g transform="matrix(0.205728,0,0,0.199459,1224.2,1598)">
<g id="_3" serif:id="3">
<g transform="matrix(0.969407,0,0,0.969407,19.5853,-63.1565)">
<path d="M535.631,245.705C535.631,252.898 541.471,258.738 548.664,258.738C555.857,258.738 561.697,252.898 561.697,245.705L574.729,245.705C574.729,260.091 563.05,271.771 548.664,271.771C534.278,271.771 522.598,260.091 522.598,245.705L535.631,245.705Z"
style="fill:white;"/>
</g>
<path d="M575.813,139.831L573.962,139.831L545.538,163.758L553.345,173.031L575.813,154.117L575.813,139.831Z"
style="fill:white;"/>
<rect x="528.262" y="139.831" width="47.551" height="12.122"
style="fill:white;"/>
</g>
</g>
</g>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28" fill="none">
<path
d="M0 14C0 21.732 6.26801 28 14 28C21.732 28 28 21.732 28 14C28 6.26801 21.732 0 14 0C6.26801 0 0 6.26801 0 14Z"
fill="#EF4444"/>
<path fill-rule="evenodd" clip-rule="evenodd"
d="M10.2663 15.426C10.2663 17.422 11.9378 19.0426 13.9965 19.0426C16.0552 19.0426 17.7267 17.422 17.7267 15.426H21.4566C21.4566 19.418 18.114 22.6591 13.9965 22.6591C9.87908 22.6591 6.53613 19.418 6.53613 15.426H10.2663Z"
fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd"
d="M21.1856 5.34998H20.6391L12.2471 12.199L14.552 14.8534L21.1856 9.43931V5.34998Z" fill="white"/>
<path d="M21.1851 5.34998L7.146 5.34998L7.146 8.81987L21.1851 8.81987V5.34998Z" fill="white"/>
</svg>
104 changes: 60 additions & 44 deletions resources/views/render.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,40 @@
@auth
<style>
.admin-bar svg {
border-radius: 9999px;
}
.admin-bar {
@if(config('admin-bar.style.theme') == 'light')
background-color: #f8f9fa;
background-color: #f8f9fa;
color: #323f52;
@else
background-color: #000;
background-color: #000;
color: #f8f9fa;
@endif
@if(config('admin-bar.style.position') == 'top')
top: 0;
top: 10px;
@else
bottom: 0;
bottom: 10px;
@endif
position: fixed;
position: fixed;
left: 0;
right: 10px;
z-index: 999999;
padding: 5px 10px;
height: 35px;
padding: 6px;
display: flex;
align-items: center;
width: 100%;
font-size: {{ config('admin-bar.style.font-size') }};
border-radius: 9999px;
}
.admin-bar > .wrapper {
width: 100%;
max-width: {{config('admin-bar.style.max-width') }};
margin: auto;
display: flex;
align-items: center;
}
.admin-bar > .wrapper > div {
Expand All @@ -41,12 +45,15 @@
text-align: right;
}
.admin-bar > .wrapper > div.left {
margin-right: 0.5rem;
}
.admin-bar > .wrapper > div.right * + * {
margin-left: 1rem;
}
.admin-bar > .wrapper a {
opacity: 0.8;
color: inherit;
text-decoration: none;
font-weight: bold;
Expand All @@ -64,7 +71,6 @@
.admin-bar ul li {
display: inline-block;
margin-left: 1rem;
}
.sr-only {
Expand Down Expand Up @@ -110,10 +116,11 @@
border-color: #4d4d4d;
}
.navbar {
.navbar, .welcome_back, .center {
display: none;
}
.navbar:target {
display: block;
position: fixed;
Expand All @@ -135,22 +142,39 @@
<div class="wrapper">
<div class="left">

@if(config('admin-bar.style.show3labsLogo'))
<x-admin-bar::icons.3labs-logo/>
@endif
<img src="{{auth()->user()->avatar_url ?? auth()->user()->avatar_html}}"
alt="{{auth()->user()->name}}" width="28"
height="28" style="border-radius: 9999px;aspect-ratio: 1">


</div>

<div class="center" style="display: flex">

<div class="welcome_back" style="margin-right: 24px">
{{__('Welcome back')}},
<strong>
{{auth()->user()->name}}
</strong>
</div>

<div class="actions" style="align-items: center;display: flex;">
@if(isset($postEditLink))
<a href="{{$postEditLink}}" target="_blank">
<x-admin-bar::icons.edit/>
{{__('Edit Post')}}
</a>
@endif
</div>

{{-- {{__('Welcome back')}},--}}
{{-- <strong>--}}
{{-- {{auth()->user()->name}}--}}
{{-- </strong>--}}
</div>

<div class="right">

<a class="hamburger" href="#navbar">
<span class="sr-only">Open main menu</span>
<x-admin-bar::icons.hamburger/>
</a>
{{-- <a class="hamburger" href="#navbar">--}}
{{-- <span class="sr-only">Open main menu</span>--}}
{{-- <x-admin-bar::icons.hamburger/>--}}
{{-- </a>--}}

<nav class="navbar" id="navbar" aria-label="Main menu">

Expand All @@ -159,32 +183,24 @@
<x-admin-bar::icons.close/>
</a>

<ul>
<ul style="align-items: center; display: flex">

@if(isset($postEmptyCacheLink))
<li>
<a href="{{$postEmptyCacheLink}}">
<x-admin-bar::icons.trash/>
{{__('Clear Cache')}}
</a>
</li>
@endif

@if(isset($postEditLink))
<li>
<a href="{{$postEditLink}}" target="_blank">
<x-admin-bar::icons.edit/>
{{__('Edit Post')}}
</a>
</li>
@endif

<li>
<a target="_blank" href="{{config('admin-bar.config.adminUrl')}}">
{{__('Control Panel')}}
</a>
@if(config('admin-bar.style.show3labsLogo'))
<a target="_blank" href="{{config('admin-bar.config.adminUrl')}}">

<x-admin-bar::icons.3labs-logo/>
</a>
@endif
</li>

{{-- <li>--}}
{{-- <a target="_blank" href="{{config('admin-bar.config.adminUrl')}}">--}}
{{-- {{__('Control Panel')}}--}}
{{-- </a>--}}
{{-- </li>--}}

</ul>

</nav>
Expand Down

0 comments on commit 1b63238

Please sign in to comment.