toolbar is really fixed now

master
Max 5 years ago
parent 7f384ec926
commit 6b260594e1

@ -1,38 +1,6 @@
@import '../../../styles/mixins.sass' @import '../../../styles/mixins.sass'
@import '../../../styles/vars.sass' @import '../../../styles/vars.sass'
#content
position: fixed
width: 100%
height: calc(100% - 56px)
#chat
box-sizing: content-box
height: 100%
width: 25%
float: left
overflow-y: auto
#feed
box-sizing: content-box
height: 100%
width: 50%
float: left
overflow-y: auto
#social
box-sizing: content-box
height: 100%
width: 25%
float: left
overflow-y: auto
.mat-toolbar.mat-primary
width: 100%
position: sticky
top: 0
z-index: 1
/deep/ .mat-tab-body-wrapper /deep/ .mat-tab-body-wrapper
height: 100% height: 100%
@ -45,8 +13,9 @@
height: 100% height: 100%
.tab-content .tab-content
height: 50% box-sizing: content-box
width: 100% width: 100%

@ -1,5 +1,7 @@
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"> <!-- getting the google material fonts-->
<mat-sidenav-container class="sidenav-container" class="mat-typography"> <mat-sidenav-container class="mat-typography">
<!-- SIDENAV -->
<mat-sidenav #drawer class="sidenav" <mat-sidenav #drawer class="sidenav"
fxShow="true" fxHide.gt-sm="true" fxShow="true" fxHide.gt-sm="true"
fixedInViewport="false" fixedInViewport="false"
@ -21,8 +23,12 @@
</div> </div>
</mat-nav-list> </mat-nav-list>
</mat-sidenav> </mat-sidenav>
<!-- TOOLBAR -->
<mat-sidenav-content> <mat-sidenav-content>
<mat-toolbar color="primary" class="mat-elevation-z4"> <mat-toolbar color="primary" class="mat-elevation-z4">
<!--content on SMALL SCREEN-->
<button <button
type="button" type="button"
aria-label="Toggle sidenav" aria-label="Toggle sidenav"
@ -32,7 +38,6 @@
<mat-icon aria-label="Side nav toggle icon">menu</mat-icon> <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
</button> </button>
<span>Greenvironment</span> <span>Greenvironment</span>
<!--The following menu items will be hidden on both SM and XS screen sizes -->
<nav mat-tab-nav-bar backgroundColor="primary" fxShow="true" fxHide.lt-md="true"> <nav mat-tab-nav-bar backgroundColor="primary" fxShow="true" fxHide.lt-md="true">
<div [hidden]="!loggedIn"> <div [hidden]="!loggedIn">
<a mat-tab-link class="link" <a mat-tab-link class="link"
@ -57,15 +62,19 @@
</a> </a>
</div> </div>
</nav> </nav>
<!--content on BIG SCREEN-->
<div id="menu-button-box"> <div id="menu-button-box">
<span class="mat-button" *ngIf="loggedIn" fxShow="true" fxHide.lt-md="true" routerLink={{profileUrl}}>Hello, {{user.username}}</span> <span class="mat-button" *ngIf="loggedIn" fxShow="true" fxHide.lt-md="true" routerLink={{profileUrl}}>Hello, {{user.username}}</span>
<button mat-icon-button [matMenuTriggerFor]="requestMenu" [disabled]="!loggedIn" id="menu-button"> <button mat-icon-button [matMenuTriggerFor]="requestMenu" [disabled]="!loggedIn" id="menu-button">
<mat-icon [matBadge]="user.receivedRequests.length" [matBadgeHidden]="!(user.receivedRequests.length > 0)" matBadgeColor="accent">notifications</mat-icon> <mat-icon [matBadge]="user.receivedRequests.length" [matBadgeHidden]="!(user.receivedRequests.length > 0)" matBadgeColor="accent">notifications</mat-icon>
</button> </button>
<button mat-icon-button [matMenuTriggerFor]="menu" id="menu-button"> <button mat-icon-button [matMenuTriggerFor]="menu" id="menu-button">
<mat-icon>more_vert</mat-icon> <mat-icon>more_vert</mat-icon>
</button> </button>
</div> </div>
<mat-menu #requestMenu="matMenu"> <mat-menu #requestMenu="matMenu">
<span mat-menu-item disableRipple="true" disabled="true">friend requests:</span> <span mat-menu-item disableRipple="true" disabled="true">friend requests:</span>
<button mat-menu-item *ngFor = "let request of user.receivedRequests" [class.selected]="request === selectedRequest" (click)="$event.stopPropagation();" disableRipple="true"> <button mat-menu-item *ngFor = "let request of user.receivedRequests" [class.selected]="request === selectedRequest" (click)="$event.stopPropagation();" disableRipple="true">
@ -96,6 +105,7 @@
</button> </button>
</div> </div>
</mat-menu> </mat-menu>
</mat-toolbar> </mat-toolbar>
<router-outlet></router-outlet> <router-outlet></router-outlet>
</mat-sidenav-content> </mat-sidenav-content>

@ -1,23 +1,19 @@
.sidenav-container
height: 100%
.mat-sidenav-container .mat-sidenav-container
height: 100% margin-top: 56px
height: calc(100vh - 56px)
.mat-sidenav-content
height: 100vh
.sidenav .sidenav
width: 200px width: 200px
.sidenav .mat-toolbar .sidenav .mat-toolbar
background: inherit //background: inherit
.mat-toolbar.mat-primary .mat-toolbar.mat-primary
height: 56px height: 56px
position: sticky position: fixed
//position: sticky
top: 0 top: 0
z-index: 1000 z-index: 999
.mat-tab-nav-bar .mat-tab-nav-bar
width: 50% width: 50%
height: 56px height: 56px
@ -36,12 +32,7 @@
/deep/ .mat-tab-link /deep/ .mat-tab-link
min-width: 5em!important min-width: 5em!important
#login-button
#menu-button-box #menu-button-box
text-align: right text-align: right
width: 100% width: 100%

@ -1,5 +1,6 @@
<mat-toolbar color="primary">Profile</mat-toolbar> <div id="profile-page">
<div id="profile"> <mat-toolbar color="primary">Profile</mat-toolbar>
<div id="profile">
<div id="profilecontainer" [hidden]="profileNotFound"> <div id="profilecontainer" [hidden]="profileNotFound">
<div id="profile-card-container"> <div id="profile-card-container">
<mat-card class="mat-elevation-z8"> <mat-card class="mat-elevation-z8">
@ -102,4 +103,5 @@
<h1>Profile not found :(</h1> <h1>Profile not found :(</h1>
</div> </div>
</div> </div>
</div>

@ -1,6 +1,12 @@
@import '../../../styles/mixins.sass' @import '../../../styles/mixins.sass'
@import '../../../styles/vars.sass' @import '../../../styles/vars.sass'
#profile-page
position: fixed
width: 100%
height: calc(100% - 56px)
overflow: scroll
#profile #profile
padding: 2em padding: 2em
max-width: 1200px max-width: 1200px

@ -1,6 +1,7 @@
#search #search
width: 100% width: 100%
overflow-x: hidden
height: 100% height: 100%
#input #input

Loading…
Cancel
Save