Skip to content

Commit

Permalink
Added app-wrapper to handle app wide styling.
Browse files Browse the repository at this point in the history
  • Loading branch information
imolorhe committed Jan 12, 2018
1 parent 4752024 commit 6552fe7
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 40 deletions.
82 changes: 42 additions & 40 deletions src/app/containers/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,44 +1,46 @@
<div class="main-container">
<div class="loading-screen styled" *ngIf="!isReady">
<div class="loading-screen-inner">
<div class="loading-screen-logo-container">
<img src="assets/img/logo_350.svg" alt="Altair">
<div class="app-wrapper">
<div class="main-container">
<div class="loading-screen styled" *ngIf="!isReady">
<div class="loading-screen-inner">
<div class="loading-screen-logo-container">
<img src="assets/img/logo_350.svg" alt="Altair">
</div>
<div class="loading-screen-loading-indicator">
<span class="loading-indicator-dot"></span>
<span class="loading-indicator-dot"></span>
<span class="loading-indicator-dot"></span>
</div>
</div>
<div class="loading-screen-loading-indicator">
<span class="loading-indicator-dot"></span>
<span class="loading-indicator-dot"></span>
<span class="loading-indicator-dot"></span>
</div>
</div>
</div>
<header class="header">
<div class="branding">
<img src="assets/img/logo.svg" alt="logo" class="header-logo">
</div>
<app-window-switcher
[windows]="windowsArr"
[activeWindowId]="activeWindowId"
[isElectron]="isElectron"
(newWindowChange)="newWindow()"
(activeWindowChange)="setActiveWindow($event)"
(removeWindowChange)="removeWindow($event)"
(windowNameChange)="setWindowName($event)"></app-window-switcher>
<div class="header-actions" *ngIf="false">
<clr-dropdown>
<button class="nav-icon" type="button" clrDropdownTrigger>
<clr-icon shape="cog"></clr-icon>
<clr-icon shape="caret down"></clr-icon>
</button>
<clr-dropdown-menu clrPosition="bottom-right" *clrIfOpen>
<button type="button" clrDropdownItem>Settings</button>
<button type="button" (click)="externalLink($event, 'https://github.com/imolorhe/altair')" clrDropdownItem>View on GitHub</button>
</clr-dropdown-menu>
</clr-dropdown>
<header class="header">
<div class="branding">
<img src="assets/img/logo.svg" alt="logo" class="header-logo">
</div>
</header>
<ng-container *ngFor="let windowId of windowIds">
<app-window [windowId]="windowId" [class.hide]="windowId !== activeWindowId"></app-window>
</ng-container>
<app-window-switcher
[windows]="windowsArr"
[activeWindowId]="activeWindowId"
[isElectron]="isElectron"
(newWindowChange)="newWindow()"
(activeWindowChange)="setActiveWindow($event)"
(removeWindowChange)="removeWindow($event)"
(windowNameChange)="setWindowName($event)"></app-window-switcher>
<div class="header-actions" *ngIf="false">
<clr-dropdown>
<button class="nav-icon" type="button" clrDropdownTrigger>
<clr-icon shape="cog"></clr-icon>
<clr-icon shape="caret down"></clr-icon>
</button>
<clr-dropdown-menu clrPosition="bottom-right" *clrIfOpen>
<button type="button" clrDropdownItem>Settings</button>
<button type="button" (click)="externalLink($event, 'https://github.com/imolorhe/altair')" clrDropdownItem>View on GitHub</button>
</clr-dropdown-menu>
</clr-dropdown>
</div>
</header>
<ng-container *ngFor="let windowId of windowIds">
<app-window [windowId]="windowId" [class.hide]="windowId !== activeWindowId"></app-window>
</ng-container>
</div>
<!-- The github link has been added to the settings dropdown -->
<app-fork-repo *ngIf="!isElectron"></app-fork-repo>
</div>
<!-- The github link has been added to the settings dropdown -->
<app-fork-repo *ngIf="!isElectron"></app-fork-repo>
1 change: 1 addition & 0 deletions src/scss/components/_response-stats.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
right: 0;
padding: 10px;
font-size: 12px;
color: $theme-font-color;
}
.response-stats__item {
display: inline-block;
Expand Down

0 comments on commit 6552fe7

Please sign in to comment.