replaced logo with new version and fixed alignment

pull/3/head
Chris Veilleux 2019-03-25 13:24:23 -05:00
parent efbb7b2ee5
commit 8b70dc79fd
4 changed files with 6 additions and 42 deletions

View File

@ -1,4 +1,4 @@
<mat-toolbar fxLayout="row" fxLayoutAlign="space-between center" color="primary"> <mat-toolbar fxLayout="row" fxLayoutAlign="start center" fxLayoutAlign.xs="space-between center" color="primary">
<!-- <!--
At the start of the title bar, put the hamburger menu icon and At the start of the title bar, put the hamburger menu icon and
the Mycroft logo. The latter is also a link to the WordPress home page the Mycroft logo. The latter is also a link to the WordPress home page
@ -6,7 +6,7 @@
<button mat-icon-button class="menu-button" (click)="snav.toggle()"> <button mat-icon-button class="menu-button" (click)="snav.toggle()">
<fa-icon [icon]="menuIcon"></fa-icon> <fa-icon [icon]="menuIcon"></fa-icon>
</button> </button>
<a [href]="mycroftUrls.wordPress"> <a fxFlex.gt-xs [href]="mycroftUrls.wordPress">
<div id=mycroft-logo class="mycroft-logo"></div> <div id=mycroft-logo class="mycroft-logo"></div>
</a> </a>
<globalnav-account-menu [isAuthenticated]="isLoggedIn" [mycroftUrls]="mycroftUrls"></globalnav-account-menu> <globalnav-account-menu [isAuthenticated]="isLoggedIn" [mycroftUrls]="mycroftUrls"></globalnav-account-menu>

View File

@ -4,6 +4,7 @@ mat-toolbar {
z-index: 2; // Put this on top of the sidenav container z-index: 2; // Put this on top of the sidenav container
.menu-button { .menu-button {
margin-right: 8px;
width: 38px; width: 38px;
fa-icon { fa-icon {
color: #2c3e50; color: #2c3e50;
@ -14,10 +15,9 @@ mat-toolbar {
// Use inline css to display the logo at top of sidebar because Angular // Use inline css to display the logo at top of sidebar because Angular
// libraries do not support static assets yet. // libraries do not support static assets yet.
.mycroft-logo { .mycroft-logo {
background: url("toolbar-logo.svg") no-repeat; background: url("toolbar-logo.png") no-repeat;
height: 25px; height: 25px;
margin-top: -5px; width: 125px;
width: 168px;
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 560 85" enable-background="new 0 0 560 85" xml:space="preserve">
<g>
<path fill="#FFFFFF" d="M8.8,27.3l20.6,45.7L50,27.3c0.7-1.7,2.4-2.7,4.2-2.7h0.1c2.6,0,4.6,2.1,4.6,4.6v49c0,1.6-1.3,2.9-2.9,2.9
h0c-1.6,0-2.9-1.3-2.9-2.9V58l0.5-26.3L32.5,79.1c-0.5,1.2-1.7,2-3.1,2h0c-1.3,0-2.5-0.8-3.1-2L5.2,32l0.5,26v20.3
c0,1.6-1.3,2.9-2.9,2.9h0c-1.6,0-2.9-1.3-2.9-2.9l0-49c0-2.6,2.1-4.6,4.6-4.6h0C6.4,24.6,8.1,25.7,8.8,27.3z"/>
<path fill="#FFFFFF" d="M99.6,55.4L116.7,26c0.5-0.9,1.4-1.4,2.4-1.4h0c2.2,0,3.6,2.4,2.4,4.3l-19.2,31.7v17.6
c0,1.6-1.3,2.9-2.9,2.9h0c-1.6,0-2.9-1.3-2.9-2.9V60.3l-19-31.5c-1.1-1.9,0.2-4.3,2.4-4.3h0c1,0,1.9,0.5,2.4,1.4L99.6,55.4z"/>
<path fill="#FFFFFF" d="M180.2,63.3c1.8,0,3.3,1.7,2.8,3.5c-1.1,4.3-3.2,7.7-6.3,10.3c-3.9,3.2-9.1,4.8-15.6,4.8
c-6.9,0-12.4-2.3-16.7-6.9c-4.3-4.6-6.4-11-6.4-19.1v-6.2c0-5.1,1-9.6,2.9-13.6c1.9-3.9,4.6-7,8.2-9.1c3.5-2.1,7.6-3.2,12.3-3.2
c6.5,0,11.6,1.6,15.5,4.9c3.1,2.6,5.1,6,6.2,10.4c0.4,1.8-1,3.5-2.8,3.5h0c-1.3,0-2.5-0.9-2.8-2.2c-0.8-3.3-2.2-6-4.4-7.9
c-2.6-2.4-6.5-3.6-11.6-3.6c-5.4,0-9.7,1.8-12.9,5.5c-3.1,3.7-4.7,8.8-4.7,15.4v6.4c0,6.4,1.5,11.5,4.6,15.2
c3.1,3.7,7.3,5.6,12.6,5.6c5.2,0,9.1-1.1,11.8-3.4c2.2-1.9,3.7-4.6,4.5-8.1C177.7,64.2,178.9,63.3,180.2,63.3L180.2,63.3z"/>
<path fill="#FFFFFF" d="M226,58.4h-17.2v19.8c0,1.6-1.3,2.9-2.9,2.9h0c-1.6,0-2.9-1.3-2.9-2.9V24.6h20c6.5,0,11.6,1.5,15.3,4.6
c3.7,3,5.5,7.2,5.5,12.5c0,3.7-1.1,7-3.4,9.7c-2.3,2.8-5.3,4.7-9,5.7L244,76.8c1.1,1.7,0,4-2.1,4.2l0,0c-1,0.1-2-0.4-2.5-1.3
L226,58.4z M208.9,53.5h15.3c4.2,0,7.6-1.1,10.1-3.2c2.5-2.2,3.8-5,3.8-8.4c0-3.8-1.3-6.7-3.9-8.9c-2.6-2.2-6.2-3.3-10.9-3.3h-14.4
V53.5z"/>
<path fill="#FFFFFF" d="M377.5,55.3H352v23c0,1.6-1.3,2.9-2.9,2.9l0,0c-1.6,0-2.9-1.3-2.9-2.9V24.6h35.4c1.4,0,2.5,1.1,2.5,2.5v0.1
c0,1.4-1.1,2.5-2.5,2.5H352v20.7h25.5c1.4,0,2.5,1.1,2.5,2.5v0C380,54.1,378.9,55.3,377.5,55.3z"/>
<path fill="#FFFFFF" d="M440.7,29.6h-18.1v48.6c0,1.6-1.3,2.9-2.9,2.9l0,0c-1.6,0-2.9-1.3-2.9-2.9V29.6h-18.1
c-1.4,0-2.5-1.1-2.5-2.5v0c0-1.4,1.1-2.5,2.5-2.5h42c1.4,0,2.5,1.1,2.5,2.5v0C443.2,28.5,442.1,29.6,440.7,29.6z"/>
<path fill="#FFFFFF" d="M525,66h-27.4l-5.3,13.3c-0.4,1-1.4,1.7-2.6,1.7h0c-2,0-3.3-2-2.6-3.8l20.4-50.1c0.6-1.6,2.2-2.6,3.8-2.6
l0,0c1.7,0,3.2,1,3.8,2.6l20.2,50.1c0.7,1.8-0.6,3.8-2.6,3.8h0c-1.1,0-2.1-0.7-2.6-1.7L525,66z M499.5,61.1H523l-11.7-29.5
L499.5,61.1z"/>
<path fill="#FFFFFF" d="M557.1,81.1L557.1,81.1c-1.6,0-2.9-1.3-2.9-2.9V27.5c0-1.6,1.3-2.9,2.9-2.9l0,0c1.6,0,2.9,1.3,2.9,2.9v50.7
C560,79.8,558.7,81.1,557.1,81.1z"/>
<g>
<path fill="#FFFFFF" d="M294.4,19.9c-18,0-32.6,14.6-32.6,32.6S276.5,85,294.4,85S327,70.5,327,52.5S312.4,19.9,294.4,19.9z
M294.4,80c-15.2,0-27.5-12.4-27.5-27.5c0-15.2,12.4-27.5,27.5-27.5c15.2,0,27.5,12.4,27.5,27.5C322,67.7,309.6,80,294.4,80z"/>
<path fill="#FFFFFF" d="M271.8,52.5c0,12.5,10.1,22.6,22.6,22.6V29.8C281.9,29.8,271.8,40,271.8,52.5z"/>
<circle fill="#FFFFFF" cx="294.4" cy="5.8" r="5.8"/>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.1 KiB