Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use SVGs for UI graphics. Implements #27828. #306

Merged
merged 3 commits into from
Jan 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.bg-photo {
background: url(/assets/images/beastie-shark.png);
background: url(/assets/images/beastie-shark.svg);
background-repeat: no-repeat;
background-size: auto 80%;
background-position: top right;
Expand Down Expand Up @@ -40,4 +40,4 @@
background-size: auto 70px;
padding-right: 0px;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
<div *ngIf="theme.isActive">
<div *ngIf="theme.hasDarkLogo; else lightLogo">
<div class="branding mat-bg-primary" *ngIf="is_freenas; else isTruenasDark">
<img src="assets/images/logo.png" alt="" class="app-logo">
<img src="assets/images/logo-text.png" alt="" class="app-logo-text">
<img src="assets/images/logo.svg" alt="FreeNAS Shark logo" class="app-logo">
<img src="assets/images/logo-text.svg" alt="FreeNAS" class="app-logo-text">
</div>
<ng-template #isTruenasDark>
<div class="branding mat-bg-primary">
<img src="assets/images/truenas-logo-ondark.png" alt="truenas-logo">
<img src="assets/images/truenas-logo-ondark.svg" alt="TrueNAS logo">
</div>
</ng-template>
</div>
<ng-template #lightLogo>
<div class="branding mat-bg-primary" *ngIf="is_freenas; else isTruenasLight">
<img src="assets/images/light-logo.png" alt="" class="app-logo">
<img src="assets/images/light-logo-text.png" alt="" class="app-logo-text">
<img src="assets/images/light-logo.svg" alt="FreeNAS icon" class="app-logo">
<img src="assets/images/light-logo-text.svg" alt="FreeNAS" class="app-logo-text">
</div>
<ng-template #isTruenasLight>
<div class="branding mat-bg-primary">
<img src="assets/images/truenas-logo.png" alt="truenas-logo">
<img src="assets/images/truenas-logo.svg" alt="TrueNAS logo">
</div>
</ng-template>
</ng-template>
</div>
</div>
<div class="app-user">
<div class="app-user-photo">
<img src="assets/images/ix.png" alt="">
<img src="assets/images/ix.svg" alt="iXsystems logo">
</div>
<span class="app-user-name">
<md-icon class="icon-xs text-muted">lock</md-icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<md-card>
<md-card-content>
<div class="text-center pb-1">
<img src="assets/images/logo-full.png" alt="">
<img src="assets/images/logo-full.svg" alt="FreeNAS logo">
<p class="text-muted">New password will be sent to your email address</p>
</div>
<form #fpForm="ngForm" (ngSubmit)="submitEmail()">
Expand Down
4 changes: 2 additions & 2 deletions src/app/views/sessions/signin/signin.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<md-card-content>
<div *ngIf="connected();else notconnected">
<div class="text-center pb-1" *ngIf="logo_ready">
<img *ngIf="is_freenas; else isTruenas" src="assets/images/logo-full.png" alt="freenas-log">
<img *ngIf="is_freenas; else isTruenas" src="assets/images/logo-full.svg" alt="FreeNAS logo">
<ng-template #isTruenas>
<img src="assets/images/truenas-logo.png" alt="truenas-logo">
<img src="assets/images/truenas-logo.svg" alt="TrueNAS logo">
</ng-template>
<!--p class="text-muted">Sign in to your account</p-->
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/sessions/signup/signup.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<md-card>
<md-card-content>
<div class="text-center pb-1">
<img src="assets/images/logo-full.png" alt="">
<img src="assets/images/logo-full.svg" alt="FreeNAS logo">
<p class="text-muted">Sign up to use our service</p>
</div>
<form #signupForm="ngForm" (ngSubmit)="signup()">
Expand Down
Binary file removed src/assets/images/beastie-shark.png
Binary file not shown.
465 changes: 465 additions & 0 deletions src/assets/images/beastie-shark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/images/ix.png
Binary file not shown.
91 changes: 91 additions & 0 deletions src/assets/images/ix.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/images/light-logo-full.png
Binary file not shown.
65 changes: 65 additions & 0 deletions src/assets/images/light-logo-full.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/images/light-logo-text.png
Binary file not shown.
Loading