purchasing/fuse-angular
3
0
Fork 0
mirror of https://github.com/richard-loafle/fuse-angular.git synced 2025-01-10 04:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Toolbar) Changed the username + Small margin tweaks

Browse Source 
(Navbar) Style variant 2 adjustments and tweaks
This commit is contained in:
Sercan Yemen 2018-07-11 10:29:21 +03:00
parent e1c906f08b
commit 3cbe302b54
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/layout/components/navbar/vertical/style-1/style-1.component.html
View File

@ -2,6 +2,7 @@
<div class="logo"> <div class="logo">
<img class="logo-icon" src="assets/images/logos/fuse.svg"> <img class="logo-icon" src="assets/images/logos/fuse.svg">
<span class="logo-text secondary-text">FUSE</span>
</div> </div>
<div class="buttons"> <div class="buttons">

19
src/app/layout/components/navbar/vertical/style-1/style-1.component.scss
View File

@ -23,6 +23,10 @@ fuse-sidebar {
width: 32px; width: 32px;
height: 32px; height: 32px;
} }
.logo-text {
display: none;
}
} }
} }
@ -71,8 +75,15 @@ navbar {
flex: 1 0 auto; flex: 1 0 auto;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
min-height: 64px;
height: 64px;
padding: 12px 12px 12px 20px; padding: 12px 12px 12px 20px;
@include media-breakpoint('xs') {
min-height: 56px;
height: 56px;
}
.logo { .logo {
display: flex; display: flex;
align-items: center; align-items: center;
@ -81,6 +92,14 @@ navbar {
width: 24px; width: 24px;
height: 24px; height: 24px;
} }
.logo-text {
margin-left: 12px;
font-size: 16px;
font-weight: 300;
letter-spacing: 0.4px;
line-height: normal;
}
} }
.buttons { .buttons {

2
src/app/layout/components/navbar/vertical/style-1/style-1.component.ts
View File

@ -81,7 +81,7 @@ export class NavbarVerticalStyle1Component implements OnInit, OnDestroy
{ {
const activeItemOffsetTop = activeNavItem.offsetTop, const activeItemOffsetTop = activeNavItem.offsetTop,
activeItemOffsetParentTop = activeNavItem.offsetParent.offsetTop, activeItemOffsetParentTop = activeNavItem.offsetParent.offsetTop,
scrollDistance = activeItemOffsetTop - activeItemOffsetParentTop - (48 * 3); scrollDistance = activeItemOffsetTop - activeItemOffsetParentTop - (48 * 3) - 168;
this._fusePerfectScrollbar.scrollToTop(scrollDistance); this._fusePerfectScrollbar.scrollToTop(scrollDistance);
} }

4
src/app/layout/components/toolbar/toolbar.component.html
View File

@ -30,8 +30,8 @@
<button mat-button [matMenuTriggerFor]="userMenu" <button mat-button [matMenuTriggerFor]="userMenu"
class="user-button"> class="user-button">
<div fxLayout="row" fxLayoutAlign="center center"> <div fxLayout="row" fxLayoutAlign="center center">
<img class="avatar" src="assets/images/avatars/Velazquez.jpg"> <img class="avatar mr-0 mr-sm-16" src="assets/images/avatars/Velazquez.jpg">
<span class="username mr-12" fxHide fxShow.gt-sm>John Doe</span> <span class="username mr-12" fxHide fxShow.gt-sm>Charlie Adams</span>
<mat-icon class="s-16" fxHide.xs>keyboard_arrow_down</mat-icon> <mat-icon class="s-16" fxHide.xs>keyboard_arrow_down</mat-icon>
</div> </div>
</button> </button>