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

Small fixes for todo, mail, projects-dashboard app, ie suppport etc..

Browse Source
This commit is contained in:
mustafahlvc 2017-08-20 16:39:22 +03:00
parent e83e0ff07b
commit faebddd114
10 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/components/search-bar/search-bar.component.html
View File

@ -1,4 +1,4 @@
<div class="fuse-search-bar" [ngClass]="{'expanded':!collapsed}" fxLayout="row" fxLayoutAlign="start center" fxFlex>
<div class="fuse-search-bar" [ngClass]="{'expanded':!collapsed}" fxLayout="row" fxLayoutAlign="start center" fxFlex="0 1 auto">
<label for="fuse-search-bar-input">
<button md-icon-button class="fuse-search-bar-expander" aria-label="Expand Search Bar" (click)="expand()"

4
src/app/core/scss/partials/_page-layouts.scss
View File

@ -35,6 +35,7 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
left: 0;
height: $carded-header-height;
background-image: $top-bg-image;
background-size: cover;
@include media-breakpoint('sm') {
height: $carded-header-height-sm;
@ -273,8 +274,9 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
min-width: 100%;
// Top bg
.header {
> .header {
background-image: $top-bg-image;
background-size: cover;
}
// Fullwidth

2
src/app/core/scss/partials/_toolbar.scss
View File

@ -1,7 +1,7 @@
.toolbar {
.toolbar-separator {
height: calc(100% - 16px);
height: 48px;
width: 1px;
border-right: 1px solid rgba(0, 0, 0, 0.12);
margin: 0 12px;

2
src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
View File

@ -36,7 +36,7 @@
<form [formGroup]="userForm" fxLayout="column">
<md-input-container class="mb-24" fxFlex>
<md-input-container class="mb-24" fxFlex="0 1 auto">
<textarea mdInput placeholder="Mood" name="mood"
formControlName="mood" rows="3"></textarea>
</md-input-container>

2
src/app/main/content/apps/dashboards/project/project.component.html
View File

@ -702,7 +702,7 @@
<div class="pl-16 pr-8 py-16" fxLayout="row" fxLayoutAlign="space-between center">
<div class="h3">{{dateNow | date: 'EEEE'}}, {{dateNow | date: 'h'}}:{{dateNow | date: 'm'}}:{{dateNow | date: 'ss'}}</div>
<div class="h3">{{dateNow | date: 'EEEE, h:m:ss'}}</div>
<div>
<button md-icon-button [mdMenuTriggerFor]="moreMenu" aria-label="more">

4
src/app/main/content/apps/mail/mail.component.html
View File

@ -42,7 +42,7 @@
<!-- CONTENT TOOLBAR -->
<div class="toolbar px-24 py-8">
<div *ngIf="!currentMail">
<div fxFlex="row" fxLayoutAlign="start center">
<md-checkbox (click)="toggleSelectAll()" [checked]="hasSelectedMails"
[indeterminate]="isIndeterminate"></md-checkbox>
@ -85,7 +85,7 @@
</md-menu>
</div>
<div *ngIf="currentMail">
<div *ngIf="currentMail" fxHide.gt-lg>
<button md-icon-button (click)="deSelectCurrentMail()">
<md-icon>arrow_back</md-icon>
</button>

7
src/app/main/content/apps/todo/todo-details/todo-details.component.ts
View File

@ -36,14 +36,14 @@ export class FuseTodoDetailsComponent implements OnInit, OnDestroy
// Subscribe to update the current todo
this.onCurrentTodoChanged =
this.todoService.onCurrentTodoChanged
.subscribe(todo => {
.subscribe(([todo, formType]) => {
if ( todo && formType === 'edit' )
{
this.formType = 'edit';
this.todo = todo;
if ( this.todo )
{
this.todoForm = this.createTodoForm();
this.onFormChange = this.todoForm.valueChanges
@ -70,6 +70,7 @@ export class FuseTodoDetailsComponent implements OnInit, OnDestroy
this.formType = 'new';
this.todoForm = this.createTodoForm();
this.focusTitleField();
this.todoService.onCurrentTodoChanged.next([this.todo, 'new']);
});
}

4
src/app/main/content/apps/todo/todo.component.html
View File

@ -41,7 +41,7 @@
<!-- CONTENT TOOLBAR -->
<div class="toolbar px-24 py-8">
<div *ngIf="!currentTodo">
<div fxFlex="row" fxLayoutAlign="start center">
<md-checkbox (click)="toggleSelectAll()" [checked]="hasSelectedTodos"
[indeterminate]="isIndeterminate"></md-checkbox>
@ -71,7 +71,7 @@
</md-menu>
</div>
<div *ngIf="currentTodo">
<div *ngIf="currentTodo" fxHide.gt-lg>
<button md-icon-button (click)="deSelectCurrentTodo()">
<md-icon>arrow_back</md-icon>
</button>

4
src/app/main/content/apps/todo/todo.component.ts
View File

@ -62,7 +62,7 @@ export class FuseTodoComponent implements OnInit, OnDestroy
this.onCurrentTodoChanged =
this.todoService.onCurrentTodoChanged
.subscribe(currentTodo => {
.subscribe(([currentTodo, formType]) => {
if ( !currentTodo )
{
this.currentTodo = null;
@ -76,7 +76,7 @@ export class FuseTodoComponent implements OnInit, OnDestroy
deSelectCurrentTodo()
{
this.todoService.onCurrentTodoChanged.next(null);
this.todoService.onCurrentTodoChanged.next([null, null]);
}
ngOnDestroy()

4
src/app/main/content/apps/todo/todo.service.ts
View File

@ -31,7 +31,7 @@ export class TodoService implements Resolve<any>
constructor(
private http: Http,
private location: Location
private location: Location // Set current todo
)
{
this.selectedTodos = [];
@ -320,7 +320,7 @@ export class TodoService implements Resolve<any>
return todo.id === id;
});
this.onCurrentTodoChanged.next(this.currentTodo);
this.onCurrentTodoChanged.next([this.currentTodo, 'edit']);
const tagHandle = this.routeParams.tagHandle,
filterHandle = this.routeParams.filterHandle;