@@ -47,18 +47,18 @@
-
+
-
-
+
+
{{range.value}}
-
-
+
+
-
- more_vert
+
+ more_vert
@@ -78,10 +78,10 @@
-
-
+
- close
+ close
@@ -97,12 +97,12 @@
-
+
- more_vert
+
+ more_vert
@@ -121,10 +121,10 @@
-
{{widgets.widget2.title}}
-
-
+
- close
+ close
@@ -140,12 +140,12 @@
-
+
- more_vert
+
+ more_vert
@@ -164,10 +164,10 @@
-
{{widgets.widget3.title}}
-
-
+
- close
+ close
@@ -183,12 +183,12 @@
-
+
- more_vert
+
+ more_vert
@@ -206,10 +206,10 @@
-
{{widgets.widget4.title}}
-
-
+
- close
+ close
@@ -226,14 +226,14 @@
-
+
{{widgets.widget5.title}}
-
@@ -302,17 +302,17 @@
-
+
@@ -352,19 +352,19 @@
-
- more_vert
+
+ more_vert
@@ -393,9 +393,9 @@
-
+
-
+
{{widgets.widget6.title}}
-
-
+
+
{{range.value}}
-
-
+
+
+
@@ -378,8 +378,8 @@
- {{widgets.widget7.title}}
-
-
+
+
{{range.value}}
-
-
+
+
@@ -404,12 +404,12 @@
-
+
+
-
diff --git a/src/app/main/content/apps/dashboards/project/project.component.scss b/src/app/main/content/apps/dashboards/project/project.component.scss
index 4cd2735d..ad0d5dda 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.scss
+++ b/src/app/main/content/apps/dashboards/project/project.component.scss
@@ -1,6 +1,6 @@
#dashboard-project {
- md-sidenav-container {
+ mat-sidenav-container {
.center {
@@ -23,7 +23,7 @@
border-radius: 0;
background: rgba(0, 0, 0, 0.12);
- md-icon {
+ mat-icon {
color: #FFFFFF;
}
}
@@ -32,7 +32,7 @@
> .content {
flex: 1;
- md-tab-group {
+ mat-tab-group {
height: 100%;
.mat-tab-body-wrapper {
diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.html b/src/app/main/content/apps/file-manager/file-list/file-list.component.html
index b98db1fa..5e793c0f 100644
--- a/src/app/main/content/apps/file-manager/file-list/file-list.component.html
+++ b/src/app/main/content/apps/file-manager/file-list/file-list.component.html
@@ -1,60 +1,60 @@
-
+
-
-
-
-
+
+
+
+
- Name
- {{row.name}}
+ Name
+ {{row.name}}
- Type
- {{row.type}}
+ Type
+ {{row.type}}
- Owner
- {{row.owner}}
+ Owner
+ {{row.owner}}
- Size
- {{row.size === '' ? '-': row.size}}
+ Size
+ {{row.size === '' ? '-': row.size}}
- Modified
- {{row.modified}}
+ Modified
+ {{row.modified}}
-
-
-
- info
+
+
+
+ info
-
+
-
-
+
-
-
+
+
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html
index f49416be..364f978d 100644
--- a/src/app/main/content/apps/file-manager/file-manager.component.html
+++ b/src/app/main/content/apps/file-manager/file-manager.component.html
@@ -1,33 +1,33 @@
{{widgets.widget8.title}}
-
+
@@ -549,7 +549,7 @@
-
+
@@ -751,28 +751,28 @@
+
@@ -826,9 +826,9 @@
-
+
-
+
{{widgets.widget9.title}}
-
-
+
+
{{range.value}}
-
-
+
+
+
+
-
+
+
@@ -691,7 +691,7 @@
-
+
-
@@ -572,7 +572,7 @@
{{cell.value}}
- {{cell.icon}}
+ {{cell.icon}}
@@ -588,9 +588,9 @@
-
+
-
@@ -599,7 +599,7 @@
-
-
+
-
+
-
-
+
+
-
+
- Name
-
+ Name
+
+
- Position
-
+ Position
+
+
- Office
-
+ Office
+
+
- Email
-
+ Email
+
+
- Phone
-
+ Phone
+
+
-
-
-
-
+
+
+
+
@@ -681,8 +681,8 @@
{{widgets.widget11.title}}
@@ -608,70 +608,70 @@
{{contact.name}} {{contact.lastName}}
-{{contact.position}}
-{{contact.office}}
-{{contact.email}}
-{{contact.phone}}
-
@@ -709,15 +709,15 @@
@@ -735,7 +735,7 @@
{{dateNow | date: 'EEEE, h:m:ss'}}
-
- more_vert
+
+ more_vert
-
-
+
+
Details
-
+
- place
+ place
{{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].name}}
-
- more_vert
+
+ more_vert
-
-
+
+
Details
-
+
-
+
{{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].temp[widgets.weatherWidget.tempUnit]}}
@@ -783,7 +783,7 @@
@@ -806,7 +806,7 @@
*ngFor="let day of widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].next3Days">
{{day.name}}
-
-
+
{{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].windSpeed[widgets.weatherWidget.speedUnit]}}
@@ -791,12 +791,12 @@
-
+
{{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].windDirection}}
-
+
{{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].rainProbability}}
-
+
{{day.temp[widgets.weatherWidget.tempUnit]}}
°
{{widgets.weatherWidget.tempUnit}}
@@ -814,7 +814,7 @@
-
+
-
+
-
+
-
+
@@ -38,7 +38,7 @@
*fuseIfOnDom [@animate]="{value:'*',params:{x:'50px'}}">
@@ -46,12 +46,12 @@
-
- menu
+
+ menu
-
- search
+
+ search
{{path}}
- chevron_right
+ chevron_right
-
- add
+ add
@@ -60,7 +60,7 @@
-
+
@@ -69,11 +69,11 @@
-
+
-
+
-
+
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.scss b/src/app/main/content/apps/file-manager/file-manager.component.scss
index 73462f07..7148980a 100644
--- a/src/app/main/content/apps/file-manager/file-manager.component.scss
+++ b/src/app/main/content/apps/file-manager/file-manager.component.scss
@@ -2,7 +2,7 @@
#file-manager {
- md-sidenav-container {
+ mat-sidenav-container {
.sidenav {
width: 320px !important;
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
index 9c4b4cf7..58a0f95c 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
+++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
@@ -1,18 +1,18 @@
-
+
-
- more_vert
+ more_vert
-
-
- reply
+
+
+ reply
Reply
-
- forward
+
+ forward
Forward
-
- print
+
+ print
Print
-
+
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
index 1f5b486e..2ed29aab 100644
--- a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
+++ b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
@@ -1,7 +1,7 @@
-
- delete
+
+ delete
-
- file_download
+
+ file_download
-
- more_vert
+
+ more_vert
@@ -27,17 +27,17 @@
-
+
- ,
- @Inject(MD_DIALOG_DATA) private data: any
+ public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) private data: any
)
{
this.composeForm = this.createComposeForm();
diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.html b/src/app/main/content/apps/mail/mail-details/mail-details.component.html
index ee29da61..c85a005f 100644
--- a/src/app/main/content/apps/mail/mail-details/mail-details.component.html
+++ b/src/app/main/content/apps/mail/mail-details/mail-details.component.html
@@ -1,5 +1,5 @@
@@ -84,27 +84,27 @@
-
+
- Available Offline
+ Available Offline
Info
diff --git a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
index 26021601..0e17eb64 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
+++ b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
@@ -2,7 +2,7 @@
- folder
+ folder
File Manager
@@ -15,36 +15,36 @@
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
index ac423a74..26e46f24 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
@@ -1,62 +1,62 @@
-
+
+
-
- close
+
+ close
New Message
-
- close
+ close
-
+
@@ -77,17 +77,17 @@
(350 Kb)
-
+
- delete
+ matTooltip="Delete">
+ delete
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss b/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
index c9487a7e..87d41f50 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
@@ -5,7 +5,7 @@
.compose-form {
- .mat-input-container {
+ .mat-form-field {
width: 100%;
}
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.ts b/src/app/main/content/apps/mail/dialogs/compose/compose.component.ts
index 647cabdd..25b0ed21 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.ts
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.ts
@@ -1,5 +1,5 @@
import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
-import { MD_DIALOG_DATA, MdDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { FormControl, FormGroup } from '@angular/forms';
@Component({
@@ -13,8 +13,8 @@ export class FuseMailComposeDialogComponent implements OnInit
composeForm: FormGroup;
constructor(
- public dialogRef: MdDialogRef
-
-
- attach_file
+
+ attach_file
-
- email
+ email
Select a message to read
@@ -21,14 +21,14 @@
-
- star
- star_outline
+
+ star
+ star_outline
-
- label
- label_outline
+
+ label
+ label_outline
-
+
@@ -11,7 +11,7 @@
attachment
+ attachment
{{mail.from?.name[0]}}
{{mail.from?.name}}
-
@@ -20,15 +20,15 @@
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.html b/src/app/main/content/apps/mail/mail-list/mail-list.component.html
index 467fac48..4fbf9b80 100644
--- a/src/app/main/content/apps/mail/mail-list/mail-list.component.html
+++ b/src/app/main/content/apps/mail/mail-list/mail-list.component.html
@@ -1,9 +1,9 @@
-
+
There are no messages!
-
diff --git a/src/app/main/content/apps/mail/mail.component.html b/src/app/main/content/apps/mail/mail.component.html
index fd95af52..2ade9fd3 100644
--- a/src/app/main/content/apps/mail/mail.component.html
+++ b/src/app/main/content/apps/mail/mail.component.html
@@ -1,16 +1,16 @@
-
+
-
+
-
+
-
+
@@ -21,14 +21,14 @@
-
- menu
+ menu
-
- search
+
@@ -37,57 +37,57 @@
-
+ search
+
@@ -109,6 +109,6 @@
-
+
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
index a00fbb05..01dd3013 100644
--- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
@@ -1,20 +1,20 @@
-
+
-
- arrow_drop_down
+
+ arrow_drop_down
-
- All
- None
- Read
- Unread
- Starred
- Unstarred
- Important
- Unimportant
-
+
+ All
+ None
+ Read
+ Unread
+ Starred
+ Unstarred
+ Important
+ Unimportant
+
-
- delete
+
+ delete
-
- folder
+
+ folder
-
-
+ {{folder.title}}
-
+
-
- label
+
+ label
-
-
+ {{label.title}}
-
+
-
- arrow_back
+
+ arrow_back
+ class="header p-24 mat-accent-bg" class.gt-md="header p-24 white-fg">
-
+
+
{{account.value}}
-
-
+
+
@@ -24,7 +24,7 @@
- mail
+ mail
Mailbox
John Doe
-
-
@@ -37,8 +37,8 @@
+
FOLDERS
@@ -46,8 +46,8 @@
FILTERS
@@ -55,8 +55,8 @@
LABELS
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts
index 54b1d3bc..1776b428 100644
--- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts
+++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts
@@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
import { MailService } from '../../mail.service';
import { Subscription } from 'rxjs/Subscription';
import { FuseMailComposeDialogComponent } from '../../dialogs/compose/compose.component';
-import { MdDialog } from '@angular/material';
+import { MatDialog } from '@angular/material';
import { FormGroup } from '@angular/forms';
import { fuseAnimations } from '../../../../../../core/animations';
@@ -27,7 +27,7 @@ export class FuseMailMainSidenavComponent implements OnInit, OnDestroy
constructor(
private mailService: MailService,
- public dialog: MdDialog
+ public dialog: MatDialog
)
{
// Data
diff --git a/src/app/main/content/apps/scrumboard/board.model.ts b/src/app/main/content/apps/scrumboard/board.model.ts
index 8c109de6..c1b35513 100644
--- a/src/app/main/content/apps/scrumboard/board.model.ts
+++ b/src/app/main/content/apps/scrumboard/board.model.ts
@@ -6,17 +6,17 @@ const sampleLabels = [
{
'id' : '56027e4119ad3a5dc28b36cd',
'name' : 'Design',
- 'color': 'md-red-500-bg'
+ 'color': 'mat-red-500-bg'
},
{
'id' : '5640635e19ad3a5dc21416b2',
'name' : 'App',
- 'color': 'md-blue-500-bg'
+ 'color': 'mat-blue-500-bg'
},
{
'id' : '6540635g19ad3s5dc31412b2',
'name' : 'Feature',
- 'color': 'md-green-400-bg'
+ 'color': 'mat-green-400-bg'
}
];
diff --git a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.html b/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.html
index 5103cd74..f687c113 100644
--- a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.html
+++ b/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.html
@@ -1,8 +1,8 @@
-
+
@@ -12,11 +12,11 @@
-
- check
+
+ check
-
- close
+
+ close
diff --git a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.scss b/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.scss
index 9f53dafc..72c4d609 100644
--- a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.scss
+++ b/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.scss
@@ -11,7 +11,7 @@
margin: 0;
width: 100%;
- md-icon {
+ mat-icon {
border-radius: 50%;
height: 40px;
width: 40px;
diff --git a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts b/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts
index 0d7f6713..0af6c819 100644
--- a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnInit, Output, ViewChild} from '@angular/core';
+import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
@Component({
diff --git a/src/app/main/content/apps/scrumboard/board/board.component.html b/src/app/main/content/apps/scrumboard/board/board.component.html
index 1bb4f21c..3b954971 100644
--- a/src/app/main/content/apps/scrumboard/board/board.component.html
+++ b/src/app/main/content/apps/scrumboard/board/board.component.html
@@ -1,31 +1,31 @@
-
- add
+ add
Add a list
- ;
+ confirmDialogRef: MatDialogRef;
constructor(
private route: ActivatedRoute,
private scrumboardService: ScrumboardService,
- public dialog: MdDialog
+ public dialog: MatDialog
)
{
}
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.html b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.html
index 678dbf0d..b27131a5 100644
--- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.html
+++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.html
@@ -1,15 +1,15 @@
-
+
-
+
check
-
- delete
+ check
+
+ delete
-
+
-
+
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
index 756a57a9..2e3c126b 100644
--- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
+++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
@@ -3,7 +3,7 @@
+
access_time
+ access_time
{{card.due | date:'mediumDate'}}
@@ -50,7 +50,7 @@
class="badge check-items"
[ngClass]="{'completed': card.checkItemsChecked === card.checkItems}"
fxLayout="row" fxLayoutAlign="start center">
- check_circle
+ check_circle
{{card.checkItemsChecked}}
/
{{card.checkItems}}
@@ -69,7 +69,7 @@
+ [matTooltip]="board.members | getById:memberId:'name'">
@@ -86,14 +86,14 @@
- remove_red_eye
+ remove_red_eye
- description
+ description
@@ -105,7 +105,7 @@
- attachment
+ attachment
{{card.attachments.length}}
@@ -114,7 +114,7 @@
- comment
+ comment
{{card.comments.length}}
diff --git a/src/app/main/content/apps/scrumboard/board/list/card/card.component.scss b/src/app/main/content/apps/scrumboard/board/list/card/card.component.scss
index 7673454c..e57dce32 100644
--- a/src/app/main/content/apps/scrumboard/board/list/card/card.component.scss
+++ b/src/app/main/content/apps/scrumboard/board/list/card/card.component.scss
@@ -53,7 +53,7 @@
background-color: rgba(0, 0, 0, 0.4);
color: #FFFFFF;
- md-icon {
+ mat-icon {
margin-right: 4px;
}
diff --git a/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.html b/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.html
index 9f742826..786f1ed8 100644
--- a/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.html
+++ b/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.html
@@ -8,10 +8,10 @@
-
- check
+
+ check
-
- close
+
+ close
diff --git a/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts b/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts
index f480c7cd..b2b38b9b 100644
--- a/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
@Component({
diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.html b/src/app/main/content/apps/scrumboard/board/list/list.component.html
index 63487391..2899c33c 100644
--- a/src/app/main/content/apps/scrumboard/board/list/list.component.html
+++ b/src/app/main/content/apps/scrumboard/board/list/list.component.html
@@ -10,12 +10,12 @@
diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.ts b/src/app/main/content/apps/scrumboard/board/list/list.component.ts
index e5c7d2e1..aa9735fc 100644
--- a/src/app/main/content/apps/scrumboard/board/list/list.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/list/list.component.ts
@@ -3,7 +3,7 @@ import { FuseUtils } from '../../../../../../core/fuseUtils';
import { ScrumboardService } from 'app/main/content/apps/scrumboard/scrumboard.service';
import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs/Subscription';
-import { MdDialog, MdDialogRef } from '@angular/material';
+import { MatDialog, MatDialogRef } from '@angular/material';
import { FuseScrumboardCardDialogComponent } from '../dialogs/card/card.component';
import { FuseConfirmDialogComponent } from '../../../../../../core/components/confirm-dialog/confirm-dialog.component';
import { Card } from '../../card.model';
@@ -25,12 +25,12 @@ export class FuseScrumboardBoardListComponent implements OnInit, OnDestroy
onBoardChanged: Subscription;
- confirmDialogRef: MdDialogRef
-
- assessment
+ assessment
BOARDS
-
- remove_red_eye
+ remove_red_eye
@@ -37,9 +37,9 @@
-
-
- settings
+
+ settings
@@ -50,10 +50,10 @@
+
@@ -39,7 +39,7 @@
-
-
+
-
+
-
+
diff --git a/src/app/main/content/apps/scrumboard/board/board.component.scss b/src/app/main/content/apps/scrumboard/board/board.component.scss
index edb67fc6..f0030971 100644
--- a/src/app/main/content/apps/scrumboard/board/board.component.scss
+++ b/src/app/main/content/apps/scrumboard/board/board.component.scss
@@ -2,19 +2,19 @@
:host {
- md-sidenav-container {
+ mat-sidenav-container {
width: 100%;
height: 100%;
- md-sidenav {
+ mat-sidenav {
width: 320px !important;
min-width: 320px !important;
max-width: 320px !important;
}
#board {
- flex-direction: column;
display: flex;
+ flex-direction: column !important;
height: 100%;
> .header {
@@ -38,7 +38,7 @@
.editable-buttons {
- md-icon {
+ mat-icon {
color: #FFFFFF !important;
}
}
@@ -46,7 +46,7 @@
.right-side {
- > .md-button:last-child {
+ > .mat-button:last-child {
margin-right: 0;
}
}
diff --git a/src/app/main/content/apps/scrumboard/board/board.component.ts b/src/app/main/content/apps/scrumboard/board/board.component.ts
index b9e4e5bc..91c9ec7a 100644
--- a/src/app/main/content/apps/scrumboard/board/board.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/board.component.ts
@@ -10,7 +10,7 @@ import { fuseAnimations } from '../../../../../core/animations';
selector : 'fuse-scrumboard-board',
templateUrl: './board.component.html',
styleUrls : ['./board.component.scss'],
- animations : fuseAnimations
+ animations : fuseAnimations
})
export class FuseScrumboardBoardComponent implements OnInit, OnDestroy
{
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
index 2b7ca5d4..f62a7053 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
@@ -1,5 +1,5 @@
+
@@ -297,21 +297,21 @@
-
+
+
@@ -80,8 +80,8 @@
-
-
+
- close
+
+ close
-
+
-
@@ -8,123 +8,123 @@
- attachment
+
+ attachment
-
-
- today
+
+ today
-
- Remove Due Date
-
+
+ Remove Due Date
+
-
+
-
- label
+
+ label
-
+
-
+
-
- account_circle
+
+ account_circle
-
+
+
-
- -1"
- *ngFor="let member of board.members"
- (change)="toggleInArray(member.id, card.idMembers);updateCard()">
+ -1"
+ *ngFor="let member of board.members"
+ (change)="toggleInArray(member.id, card.idMembers);updateCard()">
-
+
- {{ member.name }}
-
- check_box
+
+ check_box
-
+
-
+
-
- remove_red_eye
+
+ remove_red_eye
-
-
+
+
Unsubscribe
-
+
Subscribe
-
+
-
- more_horiz
+
+ more_horiz
-
-
+
+
Remove Card
-
+
+
@@ -279,9 +279,9 @@
-
@@ -132,7 +132,7 @@
@@ -219,7 +219,7 @@
{{board.name}}
- chevron_right
+ chevron_right
{{list.name}}
@@ -140,10 +140,10 @@
-
+
-
- close
+
+ close
@@ -152,20 +152,20 @@
- remove_red_eye
+ remove_red_eye
-
-
-
+
+
+
-
-
-
+
+
+
@@ -178,36 +178,36 @@
- label
+ label
Labels
-
-
+
+
{{board.labels|getById:labelId:'name'}}
- close
-
-
+ close
+
+
- supervisor_account
+ supervisor_account
Members
-
-
+
+
- close
-
-
+ [matTooltip]="board.members | getById:memberId:'name'">
+ close
+
+
- attachment
+ attachment
Attachments
@@ -239,29 +239,29 @@
{{item.name}}
- star
-
+ star
+
{{item.time}}
-
+
Actions
- arrow_drop_down
+ arrow_drop_down
-
-
+
+
Make Cover
Remove Cover
-
+
Remove Attachment
-
+
- add
+ add
Add an attachment
- check_box
+ check_box
{{checklist.name}}
@@ -324,9 +324,9 @@
{{checklist.checkItemsChecked}} / {{checklist.checkItems.length}}
-
-
- more_vert
+
+ more_vert
-
-
- delete
+
+
+ delete
Remove Checklist
-
+
@@ -334,17 +334,17 @@
- delete
+
+ delete
@@ -354,14 +354,14 @@
fxLayout="row" fxLayoutAlign="start center">
Add
@@ -379,7 +379,7 @@
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts
index dc031d81..8f0f6f8a 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts
@@ -23,7 +23,7 @@ export class FuseScrumboardLabelSelectorComponent implements OnInit, OnDestroy
newLabel = {
'id' : '',
'name' : '',
- 'color': 'md-blue-400-bg'
+ 'color': 'mat-blue-400-bg'
};
toggleInArray = FuseUtils.toggleInArray;
diff --git a/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.html b/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.html
index 28ca94a5..0b69eb04 100644
--- a/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.html
+++ b/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.html
@@ -1,7 +1,7 @@
- check
+
+ check
-
- close
+
+ close
diff --git a/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts b/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts
index d35face2..8bea5dca 100644
--- a/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
@Component({
diff --git a/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.html b/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.html
index 82c4bdbd..b8f62035 100644
--- a/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.html
+++ b/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.html
@@ -2,7 +2,7 @@
(click)="openForm()"
fxLayout="row" fxLayoutAlign="start center">
@@ -11,19 +11,19 @@
diff --git a/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.scss b/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.scss
index 80fd08b3..65219f1c 100644
--- a/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.scss
+++ b/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.scss
@@ -12,7 +12,7 @@
cursor: pointer;
border-radius: 2px;
- md-icon {
+ mat-icon {
margin-right: 8px;
color: rgba(0, 0, 0, 0.6);
}
@@ -29,7 +29,7 @@
padding: 8px;
border-top: 1px solid rgba(0, 0, 0, 0.12);
- md-input-container {
+ mat-form-field {
width: 100%;
margin: 0;
padding: 12px 8px;
diff --git a/src/app/main/content/apps/scrumboard/board/list/card/card.component.html b/src/app/main/content/apps/scrumboard/board/list/card/card.component.html
index fd772ed0..a852891d 100644
--- a/src/app/main/content/apps/scrumboard/board/list/card/card.component.html
+++ b/src/app/main/content/apps/scrumboard/board/list/card/card.component.html
@@ -10,7 +10,7 @@
-
-
-
-
-
+
+
+
+
+
-
- add
+ add
-
-
-
+
+
+
-
- comment
+ comment
Comments
@@ -390,14 +390,14 @@
-
-
+
-
+
-
Add
@@ -429,7 +429,7 @@
;
+ confirmDialogRef: MatDialogRef;
constructor(
- public dialogRef: MdDialogRef,
- @Inject(MD_DIALOG_DATA) private data: any,
- public dialog: MdDialog,
+ public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) private data: any,
+ public dialog: MatDialog,
private scrumboardService: ScrumboardService
)
{
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
index a39ed54b..f7d35c4c 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
@@ -4,8 +4,8 @@
- add
+
+ add
Add
@@ -15,13 +15,13 @@
@@ -31,15 +31,15 @@
- arrow_back
+
+ arrow_back
- arrow_back
+
+ arrow_back
- list
+ list
Activity
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss
index e8333209..c29752a4 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss
@@ -107,7 +107,7 @@
.section-header {
font-size: 16px;
- md-icon {
+ mat-icon {
margin-right: 8px;
color: rgba(0, 0, 0, 0.6);
}
@@ -206,7 +206,7 @@
margin: 12px 0 0 0;
padding-left: 12px;
- md-icon {
+ mat-icon {
margin-left: 8px;
color: rgba(0, 0, 0, 0.6);
}
@@ -217,7 +217,7 @@
.add-attachment-button {
margin: 0;
- md-icon {
+ mat-icon {
color: rgba(0, 0, 0, 0.6);
margin-right: 8px;
}
@@ -253,16 +253,16 @@
.check-item {
- md-checkbox {
+ mat-checkbox {
margin-bottom: 0;
- .md-label {
+ .mat-label {
font-size: 14px;
}
- &.md-checked {
+ &.mat-checked {
- .md-label {
+ .mat-label {
text-decoration: line-through;
color: rgba(0, 0, 0, 0.6);
}
@@ -274,11 +274,11 @@
.new-check-item-form {
padding-top: 16px;
- md-input-container {
+ mat-form-field {
margin: 0;
}
- .md-button {
+ .mat-button {
margin: 0 0 0 16px;
}
}
@@ -342,7 +342,7 @@
&.new-comment {
- md-input-container {
+ mat-form-field {
margin: 0;
}
}
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts
index 1951a62e..9a190ddd 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts
@@ -1,5 +1,5 @@
import { Component, Inject, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
-import { MD_DIALOG_DATA, MdDialog, MdDialogRef, MdMenuTrigger } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogRef, MatMenuTrigger } from '@angular/material';
import { Subscription } from 'rxjs/Subscription';
import { ScrumboardService } from '../../../scrumboard.service';
import { NgForm } from '@angular/forms/src/forms';
@@ -21,15 +21,15 @@ export class FuseScrumboardCardDialogComponent implements OnInit, OnDestroy
onBoardChanged: Subscription;
toggleInArray = FuseUtils.toggleInArray;
- @ViewChild('checklistMenuTrigger') checklistMenu: MdMenuTrigger;
+ @ViewChild('checklistMenuTrigger') checklistMenu: MatMenuTrigger;
@ViewChild('newCheckListTitleField') newCheckListTitleField;
- confirmDialogRef: MdDialogRefLabels
-
- -1"
- (change)="toggleInArray(label.id, card.idLabels);cardLabelsChanged()">
+ -1"
+ (change)="toggleInArray(label.id, card.idLabels);cardLabelsChanged()">
{{label.name}}
-
+
-
- mode_edit
+
+ mode_edit
Edit Label
-
-
-
-
+
+
+
@@ -50,22 +50,22 @@
Add Label
-
{{board.name}}
-
- edit_mode
+
+ edit_mode
@@ -12,10 +12,10 @@
-
- add
+ add
Add a card
-
+
@@ -22,7 +22,7 @@
+ [matTooltip]="board.labels | getById:labelId:'name'">
-
- more_vert
+
+ more_vert
-
- Remove List
-
+
+ Remove List
+
{{color.key}}
-
-
+
@@ -13,43 +13,43 @@
Settings
-
- format_color_fill
+
+ format_color_fill
Board Color
-
- photo
+
+ photo
check
+ check
Card Cover Images
-
-
- remove_red_eye
+
+ remove_red_eye
check
+ check
Subscribe
-
-
@@ -58,10 +58,10 @@
- content_copy
+
+ content_copy
Copy Board
-
+
- delete
+
-
+ delete
Delete Board
-
+
- arrow_back
+
+ arrow_back
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.html b/src/app/main/content/apps/scrumboard/scrumboard.component.html
index 9aea1c88..0a856db9 100644
--- a/src/app/main/content/apps/scrumboard/scrumboard.component.html
+++ b/src/app/main/content/apps/scrumboard/scrumboard.component.html
@@ -1,7 +1,7 @@
-
Background Color
-
+
-
+
@@ -14,7 +14,7 @@
[routerLink]="'/apps/scrumboard/boards/'+board.id+'/'+board.uri"
fxLayout="column" fxLayoutAlign="center center"
[@animate]="{value:'*',params:{y:'100%'}}">
- assessment
+ assessment
@@ -23,7 +23,7 @@
Scrumboard App
{{board.name}}
- add_circle
+ add_circle
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.scss b/src/app/main/content/apps/scrumboard/scrumboard.component.scss
index 067b0ea0..55953a9a 100644
--- a/src/app/main/content/apps/scrumboard/scrumboard.component.scss
+++ b/src/app/main/content/apps/scrumboard/scrumboard.component.scss
@@ -9,7 +9,7 @@
.board-list {
padding: 32px 0;
- max-height: none!important;
+ max-height: none !important;
.board-list-item {
min-width: 210px;
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
index 4eda7b40..95fd1459 100644
--- a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
@@ -1,20 +1,20 @@
Add new board
+ class="header p-24 mat-accent-bg" class.gt-md="header p-24 white-fg">
-
+
+
{{account.value}}
-
-
+
+
@@ -24,7 +24,7 @@
- check_box
+ check_box
To-do
John Doe
-
-
@@ -35,8 +35,8 @@
@@ -44,8 +44,8 @@
FILTERS
@@ -53,8 +53,8 @@
TAGS
diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.html b/src/app/main/content/apps/todo/todo-details/todo-details.component.html
index b16980c6..964f347c 100644
--- a/src/app/main/content/apps/todo/todo-details/todo-details.component.html
+++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.html
@@ -1,7 +1,7 @@
- check_box
-
+ check_box
+
Select
a todo
@@ -11,40 +11,40 @@
-
- check_box
- check_box_outline_blank
+ check_box
+ check_box_outline_blank
Mark as Done
@@ -53,18 +53,18 @@
-
- delete_forever
- delete
+
+ delete_forever
+ delete
-
- error
- error_outline
+
+ error
+ error_outline
-
- star
- star_outline
+
+ star
+ star_outline
-
- label
+
+ label
-
-
+
{{tag.title}}
-
+