[ADF-1518] Update material2 beta 10 and angular 4.3.6 (#2304)

* ignore pkg lock

* update pkg json

* date picker update material beta.10

* isDateInstance moment adapter

* style and  datepicker update material2 beta 10

* update test dateitem to beta10

* regenerate style files

* use material icons web font

* fix data range material 2 beta 10

* minors cleaning

* recreate styles

* remove unused componentHandler var

* fix failing test checkbox
This commit is contained in:
Eugenio Romano
2017-09-15 11:39:27 +01:00
committed by Denys Vuika
parent ab9fbda53f
commit 3c1729b960
55 changed files with 4928 additions and 2761 deletions
+1
View File
@@ -17,3 +17,4 @@ src/environments/
.happypack/
.happypack/
.history
package-lock.*
@@ -51,8 +51,6 @@ import { Subscription } from 'rxjs/Rx';
import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component';
import { DemoFieldValidator } from './demo-field-validator';
declare var componentHandler;
const currentProcessIdNew = '__NEW__';
const currentTaskIdNew = '__NEW__';
@@ -384,11 +382,6 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
}
ngAfterViewInit() {
// workaround for MDL issues with dynamic components
if (componentHandler) {
componentHandler.upgradeAllRegistered();
}
this.loadStencilScriptsInPageFromActiviti();
}
-1
View File
@@ -38,7 +38,6 @@ require('script-loader!dialog-polyfill/dialog-polyfill');
import 'dialog-polyfill/dialog-polyfill.css';
// Google Material Design Lite
import 'material-design-icons/iconfont/material-icons.css';
import 'material-design-lite/dist/material.orange-blue.min.css';
import 'material-design-lite/material.js';
+1 -1
View File
@@ -7,7 +7,7 @@
<link rel="icon" type="image/png" href="favicon-96x96.png" sizes="96x96">
<link href="https://fonts.googleapis.com/css?family=Muli" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!--[if IE]>
<script src=js/shim.min.js></script>
<script src=//cdnjs.cloudflare.com/ajax/libs/dom4/1.8.3/dom4.js></script>
+16 -17
View File
@@ -55,27 +55,26 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/compiler-cli": "4.2.5",
"@angular/core": "4.2.5",
"@angular/flex-layout": "^2.0.0-beta.9",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6 ",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6 ",
"@angular/compiler": "4.3.6 ",
"@angular/compiler-cli": "4.3.6 ",
"@angular/core": "4.3.6 ",
"@angular/flex-layout": "2.0.0-beta.9",
"@angular/forms": "4.3.6 ",
"@angular/http": "4.3.6 ",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6 ",
"@angular/platform-browser-dynamic": "4.3.6 ",
"@angular/router": "4.3.6 ",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0-9feb5d0164d6c5f994df8758e41ed126a8f69db2",
"alfresco-js-api": "1.8.0",
"chart.js": "2.5.0",
"core-js": "2.4.1",
"dialog-polyfill": "0.4.7",
"element.scrollintoviewifneeded-polyfill": "1.0.1",
"intl": "1.2.5",
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
"minimatch": "3.0.4",
"moment": "2.15.1",
@@ -101,7 +100,7 @@
"raphael": "2.2.7",
"reflect-metadata": "0.1.9",
"rxjs": "5.1.0",
"zone.js": "0.8.11"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -111,7 +110,7 @@
"angular2-template-loader": "0.6.2",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.26.1",
"css-loader": "0.25.0",
"extract-text-webpack-plugin": "2.0.0-rc.3",
"file-loader": "0.10.0",
"fork-ts-checker-webpack-plugin": "0.2.4",
@@ -32,19 +32,19 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "^1.8.0-beta1",
"alfresco-js-api": "1.8.0",
"chart.js": "2.5.0",
"core-js": "2.4.1",
"hammerjs": "2.0.8",
@@ -56,7 +56,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.8.4"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -67,7 +67,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
@@ -215,7 +215,7 @@ describe('AnalyticsReportParametersComponent', () => {
it('Should render a checkbox with the value true when the definition parameter type is \'boolean\' ', (done) => {
component.onSuccessReportParams.subscribe(() => {
fixture.detectChanges();
let checkElement: any = element.querySelector('#input-typeFiltering');
let checkElement: any = element.querySelector('#typeFiltering-input');
expect(checkElement.checked).toBeTruthy();
done();
});
@@ -1,9 +1,9 @@
<label>{{field.nameKey | translate}}</label><br>
<div [formGroup]="dateRange">
<small *ngIf="isStartDateGreaterThanEndDate()" class="adf-text-danger">
<small *ngIf="isStartDateGreaterThanEndDate()" class="adf-date-range-analytics-text-danger">
{{'DATE-WIDGET.MESSAGES.START-LESS-THAN-END-DATE' | translate}}
</small>
<small *ngIf="isStartDateEmpty()" class="adf-text-danger">
<small *ngIf="isStartDateEmpty()" class="adf-date-range-analytics-text-danger">
{{'DATE-WIDGET.MESSAGES.START-DATE-REQUIRED' | translate}}
</small>
@@ -15,39 +15,39 @@
[min]="minDate"
[max]="maxDate"
formControlName="startDate"
[mdDatepicker]="startDatePicker"
[mdDatepicker]="startDate"
[value]="startDatePicker"
(keydown)="true"
(dateChange)="onGroupValueChanged()"
placeholder="{{'DATE-WIDGET.START-DATE' | translate}}"
id="startDate_id"
required>
<button mdSuffix [mdDatepickerToggle]="startDatePicker"></button>
<md-datepicker-toggle mdSuffix [for]="startDate" ></md-datepicker-toggle>
</md-input-container>
<md-datepicker
#startDatePicker
[touchUi]="true"
(selectedChanged)="onGroupValueChanged()">
#startDate
[touchUi]="true">
</md-datepicker>
</md-grid-tile>
<md-grid-tile>
<md-input-container class="adf-start-task-input-container">
<md-input-container>
<input
mdInput
[min]="minDate"
[max]="maxDate"
formControlName="endDate"
[mdDatepicker]="endDatePicker"
[mdDatepicker]="endDate"
[value]="endDatePicker"
(keydown)="true"
(dateChange)="onGroupValueChanged()"
placeholder="{{'DATE-WIDGET.END-DATE' | translate}}"
id="endDate_id"
required>
<button mdSuffix [mdDatepickerToggle]="endDatePicker"></button>
<md-datepicker-toggle mdSuffix [for]="endDate" ></md-datepicker-toggle>
</md-input-container>
<md-datepicker
#endDatePicker
[touchUi]="true"
(selectedChanged)="onGroupValueChanged()">
#endDate
[touchUi]="true">
</md-datepicker>
</md-grid-tile>
</md-grid-list>
@@ -1,7 +1,7 @@
.adf-text-danger {
color: #D8000C;
@mixin mat-analytics-date-range-widget-theme($theme) {
$warn: map-get($theme, warn);
.mat-input-container {
width: 80% !important;
.adf-date-range-analytics-text-danger {
color: mat-color($warn);
}
}
@@ -47,8 +47,8 @@ export class DateRangeWidgetComponent implements OnInit {
minDate: Moment;
maxDate: Moment;
startDatePicker: Moment;
endDatePicker: Moment;
startDatePicker: Moment = moment();
endDatePicker: Moment = moment();
constructor(public dateAdapter: DateAdapter<Moment>) {
}
@@ -15,14 +15,9 @@
* limitations under the License.
*/
import { AfterViewInit, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
let componentHandler: any;
/**
* Base widget component.
*/
export class WidgetComponent implements AfterViewInit, OnChanges {
export class WidgetComponent implements OnChanges {
@Input()
field: any;
@@ -52,17 +47,4 @@ export class WidgetComponent implements AfterViewInit, OnChanges {
this.fieldChanged.emit(field);
}
ngAfterViewInit() {
this.setupMaterialComponents(componentHandler);
}
setupMaterialComponents(handler?: any): boolean {
// workaround for MDL issues with dynamic components
if (handler) {
handler.upgradeAllRegistered();
return true;
}
return false;
}
}
@@ -1,5 +1,7 @@
@import '../src/components/analytics-report-list.component';
@import '../src/components/widgets/date-range/date-range.widget';
@mixin alfresco-activity-analytics-theme($theme) {
@include mat-analytics-report-list-theme($theme);
@include mat-analytics-date-range-widget-theme($theme);
}
@@ -28,19 +28,19 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "^1.8.0-beta1",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
"hammerjs": "2.0.8",
"ng2-alfresco-core": "1.8.0",
@@ -48,7 +48,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.8.4"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -59,7 +59,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
+13 -13
View File
@@ -35,17 +35,17 @@
"activiti"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -55,7 +55,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.8.4"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -66,7 +66,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
@@ -12,7 +12,7 @@
.mat-input-prefix {
position: absolute;
margin-top: 42px;
margin-top: 37px;
}
}
@@ -47,6 +47,10 @@
padding-right: 1%;
}
.mat-form-field {
width: 100%;
}
md-input-container {
width: 100%;
}
@@ -56,7 +60,7 @@
}
.mat-input-placeholder {
top: 2.2em !important;
top: 1.8em !important;
}
.mat-focused {
@@ -4,17 +4,18 @@
<input mdInput
[id]="field.id"
[mdDatepicker]="datePicker"
[(value)]="field.value"
[(value)]="displayDate"
[required]="isRequired()"
[disabled]="field.readOnly"
[min]="minDate"
[max]="maxDate"
(focusout)="onDateChanged($event.srcElement.value)"
(dateChange)="onDateChanged($event)"
placeholder="{{field.placeholder}}">
<button class="adf-date-widget-button" mdSuffix [mdDatepickerToggle]="datePicker" [disabled]="field.readOnly"></button>
<md-datepicker-toggle mdSuffix [for]="datePicker" [disabled]="field.readOnly" ></md-datepicker-toggle>
</md-input-container>
<error-widget [error]="field.validationSummary" ></error-widget>
<error-widget *ngIf="isInvalidFieldRequired()" required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget>
<md-datepicker #datePicker [touchUi]="true" [startAt]="startAt" (selectedChanged)="onDateChanged($event)"></md-datepicker>
<md-datepicker #datePicker [touchUi]="true" [startAt]="startAt" ></md-datepicker>
</div>
@@ -5,29 +5,31 @@
&-date-widget {
.mat-input-suffix {
text-align: right;
position: absolute;
margin-top: 42px;
margin-top: 30px;
width: 100%;
}
&-date-widget-button {
position: relative;
float: right;
}
&-date-input {
padding-top: 5px;
padding-bottom: 5px;
}
&-grid-date-widget {
align-items: center;
padding: 0;
}
&-date-widget-button__cell {
margin-top: 0;
margin-bottom: 0;
}
}
&-date-widget-button {
position: relative;
float: right;
}
&-date-input {
padding-top: 5px;
padding-bottom: 5px;
}
&-grid-date-widget {
align-items: center;
padding: 0;
}
&-date-widget-button__cell {
margin-top: 0;
margin-bottom: 0;
}
}
@@ -40,6 +40,8 @@ export class DateWidgetComponent extends WidgetComponent implements OnInit {
minDate: Moment;
maxDate: Moment;
displayDate: Moment;
constructor(public formService: FormService, public dateAdapter: DateAdapter<Moment>) {
super(formService);
}
@@ -57,6 +59,9 @@ export class DateWidgetComponent extends WidgetComponent implements OnInit {
this.maxDate = moment(this.field.maxValue, this.field.dateDisplayFormat);
}
}
this.displayDate = moment(this.field.value, this.field.dateDisplayFormat, true);
}
onDateChanged(newDateValue) {
@@ -67,10 +72,11 @@ export class DateWidgetComponent extends WidgetComponent implements OnInit {
if (!momentDate.isValid()) {
this.field.validationSummary = this.field.dateDisplayFormat;
this.field.value = null;
}else {
} else {
this.field.value = newDateValue;
this.displayDate = moment(this.field.value, this.field.dateDisplayFormat, true);
}
}else {
} else {
this.field.value = null;
}
this.checkVisibility(this.field);
@@ -4,15 +4,25 @@
.adf {
&-dropdown-widget {
width: 100%;
padding-top: 16px;
}
margin-top: 13px;
&-select {
width: 100%;
}
.adf-select{
padding-top: 0 !important;
width: 100%;
}
.mat-select-value-text{
font-size: 14px;
}
&-select {
width: 100%;
}
&-dropdown-required-message .adf-error-text-container{
margin-top: 1px !important;
}
&-dropdown-required-message .adf-error-text-container{
margin-top: 1px !important;
}
}
@@ -10,8 +10,7 @@
[required]="column.required"
[disabled]="!column.editable"
(focusout)="onDateChanged($event.srcElement.value)">
<button mdSuffix *ngIf="column.editable"
[mdDatepickerToggle]="datePicker" class="adf-date-editor-button"></button>
<md-datepicker-toggle *ngIf="column.editable" mdSuffix [for]="datePicker" class="adf-date-editor-button" ></md-datepicker-toggle>
</md-input-container>
<md-datepicker #datePicker (selectedChanged)="onDateChanged($event)" [touchUi]="true"></md-datepicker>
<md-datepicker #datePicker (dateChange)="onDateChanged($event)" [touchUi]="true"></md-datepicker>
</div>
@@ -1,4 +1,10 @@
.adf-error-text-container {
margin-top: -14px !important;
width: 50%;
position: relative;
width: 100%;
}
.adf-error-text{
width: 85%;
}
@@ -17,7 +17,6 @@
.adf {
&-error-text-container {
width: 95%;
height: 20px;
margin-top: -12px;
}
@@ -17,7 +17,6 @@
overflow: hidden;
transition: all .3s cubic-bezier(.55,0,.55,.2);
opacity: 1;
margin-top: 0;
padding-top: 5px;
text-align: right;
padding-right: 2px;
@@ -36,7 +36,7 @@
background: #ff9800;
display: inline-block;
width: 30px;
padding: 0px 9px;
padding: 0 9px;
border-radius: 100px;
color: #fff;
text-align: center;
@@ -56,7 +56,7 @@
height: 50px;
vertical-align: middle;
display: inline-block;
padding: 0px 0px;
padding: 0 0;
}
&-people-widget-image-row {
@@ -34,17 +34,17 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -57,7 +57,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -68,7 +68,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
@@ -38,18 +38,18 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/flex-layout": "^2.0.0-beta.9",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/flex-layout": "2.0.0-beta.9",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -61,7 +61,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -72,7 +72,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
@@ -30,10 +30,10 @@
(focusout)="onDateChanged($event.srcElement.value)"
placeholder="{{'START_TASK.FORM.LABEL.DATE'|translate}}"
[(ngModel)]="startTaskmodel.dueDate" id="date_id">
<button mdSuffix [mdDatepickerToggle]="taskDatePicker"></button>
<md-datepicker-toggle mdSuffix [for]="taskDatePicker"></md-datepicker-toggle>
</md-input-container>
<md-datepicker #taskDatePicker [touchUi]="true"
(selectedChanged)="onDateChanged($event)"></md-datepicker>
(onDateChanged)="onDateChanged($event)"></md-datepicker>
<div class="adf-error-text-container">
<div *ngIf="dateError">
<div class="adf-error-text">{{'START_TASK.FORM.DATE.ERROR'|translate}}</div>
+14 -15
View File
@@ -42,29 +42,28 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/compiler-cli": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/compiler-cli": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
"hammerjs": "2.0.8",
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
"moment": "2.15.1",
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -75,7 +74,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -1,24 +1,24 @@
<div class="adf-property-label">{{ property.label }}</div>
<div class="adf-property-value">
<span *ngIf="!isEditble()">
<span *ngIf="!isEditable()">
<span [attr.data-automation-id]="'card-dateitem-' + property.key">{{ property.displayValue }}</span>
</span>
<span *ngIf="isEditble()" class="adf-dateitem-editable">
<input class="adf-invisible-date-input" [mdDatepicker]="picker" value="{{property.value}}">
<span *ngIf="isEditable()" class="adf-dateitem-editable">
<input class="adf-invisible-date-input" [mdDatepicker]="picker" [value]="valueDate"
(dateChange)="onDateChanged($event)">
<span
class="adf-datepicker-toggle"
[attr.data-automation-id]="'datepicker-label-toggle-' + property.key"
(click)="showDatePicker($event)">{{ property.displayValue }}
</span>
<button
<md-datepicker-toggle
[attr.data-automation-id]="'datepickertoggle-' + property.key"
[mdDatepickerToggle]="picker">
</button>
[for]="picker">
</md-datepicker-toggle>
<md-datepicker #picker
[attr.data-automation-id]="'datepicker-' + property.key"
(selectedChanged)="dateChanged($event)"
[startAt]="property.value"
[touchUi]="true">
[attr.data-automation-id]="'datepicker-' + property.key"
[startAt]="valueDate"
[touchUi]="true">
</md-datepicker>
</span>
</div>
@@ -14,14 +14,14 @@
&-dateitem-editable {
cursor: pointer;
button {
md-icon {
width: 16px;
height: 16px;
opacity: 0.5;
margin-left: 4px;
}
&:hover button {
&:hover md-icon {
opacity: 1;
}
}
@@ -18,6 +18,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdDatepickerModule, MdInputModule, MdNativeDateModule } from '@angular/material';
import { By } from '@angular/platform-browser';
import * as moment from 'moment';
import { CardViewDateItemModel } from '../../models/card-view-dateitem.model';
import { CardViewUpdateService } from '../../services/card-view-update.service';
import { CardViewDateItemComponent } from './card-view-dateitem.component';
@@ -46,7 +47,7 @@ describe('CardViewDateItemComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(CardViewDateItemComponent);
component = fixture.componentInstance;
component.property = new CardViewDateItemModel ({
component.property = new CardViewDateItemModel({
label: 'Date label',
value: new Date('07/10/2017'),
key: 'datekey',
@@ -131,17 +132,17 @@ describe('CardViewDateItemComponent', () => {
component.editable = true;
component.property.editable = true;
const cardViewUpdateService = TestBed.get(CardViewUpdateService);
const expectedDate = new Date('11/11/2017');
const expectedDate = moment('Jul 10 2017', 'MMM DD YY');
fixture.detectChanges();
cardViewUpdateService.itemUpdated$.subscribe(
(updateNotification) => {
expect(updateNotification.target).toBe(component.property);
expect(updateNotification.changed).toEqual({ datekey: expectedDate });
expect(updateNotification.changed).toEqual({datekey: expectedDate.toDate()});
done();
}
);
component.datepicker.selectedChanged.next(expectedDate);
component.onDateChanged({value: expectedDate});
});
});
@@ -15,17 +15,27 @@
* limitations under the License.
*/
import { Component, Input, ViewChild } from '@angular/core';
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { MdDatepicker } from '@angular/material';
import { DateAdapter, MD_DATE_FORMATS } from '@angular/material';
import * as moment from 'moment';
import { Moment } from 'moment';
import { CardViewDateItemModel } from '../../models/card-view-dateitem.model';
import { CardViewUpdateService } from '../../services/card-view-update.service';
import { MOMENT_DATE_FORMATS, MomentDateAdapter } from '../../utils/momentDateAdapter';
@Component({
providers: [
{provide: DateAdapter, useClass: MomentDateAdapter},
{provide: MD_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}],
selector: 'adf-card-view-dateitem',
templateUrl: './card-view-dateitem.component.html',
styleUrls: ['./card-view-dateitem.component.scss']
})
export class CardViewDateItemComponent {
export class CardViewDateItemComponent implements OnInit {
public SHOW_FORMAT: string = 'MMM DD YY';
@Input()
property: CardViewDateItemModel;
@@ -35,9 +45,22 @@ export class CardViewDateItemComponent {
@ViewChild(MdDatepicker)
public datepicker: MdDatepicker<any>;
constructor(private cardViewUpdateService: CardViewUpdateService) {}
valueDate: Moment;
isEditble() {
constructor(private cardViewUpdateService: CardViewUpdateService, public dateAdapter: DateAdapter<Moment>) {
}
ngOnInit() {
let momentDateAdapter = <MomentDateAdapter> this.dateAdapter;
momentDateAdapter.overrideDisplyaFormat = this.SHOW_FORMAT;
if (this.property.value) {
this.valueDate = moment(this.property.value, this.SHOW_FORMAT);
}
}
isEditable() {
return this.editable && this.property.editable;
}
@@ -45,7 +68,14 @@ export class CardViewDateItemComponent {
this.datepicker.open();
}
dateChanged(changed) {
this.cardViewUpdateService.update(this.property, { [this.property.key]: changed });
onDateChanged(newDateValue) {
if (newDateValue) {
let momentDate = moment(newDateValue.value, this.SHOW_FORMAT, true);
if (momentDate.isValid()) {
this.valueDate = momentDate;
this.cardViewUpdateService.update(this.property, {[this.property.key]: momentDate.toDate()});
}
}
}
}
@@ -190,4 +190,19 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
return date;
}
}
isDateInstance(date: any) {
let isValidDateInstance = false;
if (date) {
isValidDateInstance = date._isAMomentObject;
}
return isValidDateInstance;
}
isValid(date: Moment): boolean {
return date.isValid();
}
}
@@ -34,17 +34,17 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -53,7 +53,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -64,7 +64,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
@@ -42,19 +42,19 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "^1.8.0-9feb5d0164d6c5f994df8758e41ed126a8f69db2",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
"hammerjs": "2.0.8",
"ng2-alfresco-core": "1.8.0",
@@ -62,7 +62,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -73,7 +73,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
+14 -14
View File
@@ -46,25 +46,25 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "^1.8.0-9feb5d0164d6c5f994df8758e41ed126a8f69db2",
"alfresco-js-api": "1.8.0",
"hammerjs": "2.0.8",
"ng2-alfresco-core": "1.8.0",
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -75,7 +75,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
+13 -13
View File
@@ -42,17 +42,17 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -63,7 +63,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -74,7 +74,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
+13 -13
View File
@@ -22,17 +22,17 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -41,7 +41,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.6.26"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -52,7 +52,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
+13 -13
View File
@@ -22,17 +22,17 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -41,7 +41,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -52,7 +52,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
+13 -13
View File
@@ -43,17 +43,17 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -63,7 +63,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -74,7 +74,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
@@ -22,17 +22,17 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -41,7 +41,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -52,7 +52,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
@@ -10,15 +10,15 @@
border-radius: 90%;
width: 40px;
height: 40px;
margin-right: 0%;
margin-right: 0;
cursor: pointer;
vertical-align: middle;
}
&-userinfo-menu_button.mat-button {
margin-right: 0%;
margin-right: 0;
border-radius: 90%;
padding: 0px;
padding: 0;
min-width: 40px;
height: 40px;
}
@@ -47,7 +47,7 @@
}
&-userinfo-card.mat-card {
padding: 0px;
padding: 0;
}
&-userinfo-supporting-text {
@@ -55,7 +55,6 @@
font-weight: 400;
letter-spacing: 0;
line-height: 18px;
display: block;
overflow: hidden;
padding: 32px;
-webkit-column-count: 2;
@@ -66,7 +65,7 @@
}
&-userinfo-title {
font: 500 20px/32px Roboto,"Helvetica Neue",sans-serif;
font: 500 20px/32px Roboto, "Helvetica Neue", sans-serif;
margin: 0;
align-self: flex-end;
display: flex;
@@ -76,21 +75,19 @@
padding: 0;
-webkit-margin-before: 0.83em;
-webkit-margin-after: 0.83em;
-webkit-margin-start: 0px;
-webkit-margin-end: 0px;
-webkit-margin-start: 0;
-webkit-margin-end: 0;
}
&-userinfo__detail-profile {
align-items: flex-start;
font-size: 14px;
font-size: 14px;
font-weight: 400;
letter-spacing: 0;
line-height: 18px;
display: block;
padding: 0;
align-items: flex-start;
margin: 0px;
margin: 0;
color: mat-color($primary, A100);
}
@@ -117,13 +114,13 @@
height: 80px;
width: 80px;
z-index: 3;
margin-left: 0px;
margin-left: 0;
margin-right: 8px;
}
&-userinfo-button-profile {
display: inline-block;
border: 0px;
border: 0;
vertical-align: middle;
}
@@ -139,15 +136,15 @@
@media only screen and (min-device-width: 480px) {
.mat-menu-panel.adf-userinfo-menu {
max-height: 450px;
min-width: 450px;
overflow: auto;
padding: 0px;
max-height: 450px;
min-width: 450px;
overflow: auto;
padding: 0;
}
}
.mat-menu-panel.adf-userinfo-menu .mat-menu-content{
padding: 0px;
.mat-menu-panel.adf-userinfo-menu .mat-menu-content {
padding: 0;
}
}
+13 -13
View File
@@ -37,17 +37,17 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -57,7 +57,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -68,7 +68,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
@@ -22,17 +22,17 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"core-js": "2.4.1",
@@ -42,7 +42,7 @@
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.7.6"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -53,7 +53,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
+28 -29
View File
@@ -61,40 +61,39 @@
"6": "bpm"
},
"dependencies": {
"@angular/animations": "4.2.5",
"@angular/cdk": "2.0.0-beta.8",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/compiler-cli": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/http": "4.2.5",
"@angular/material": "2.0.0-beta.8",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/compiler-cli": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.8.0",
"chart.js": "2.5.0",
"core-js": "2.4.1",
"hammerjs": "2.0.8",
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
"minimatch": "3.0.4",
"moment": "2.15.1",
"ng2-activiti-diagrams": "1.8.0",
"ng2-activiti-form": "1.8.0",
"ng2-activiti-tasklist": "1.8.0",
"ng2-alfresco-core": "1.8.0",
"ng2-alfresco-datatable": "1.8.0",
"ng2-alfresco-documentlist": "1.8.0",
"ng2-charts": "1.6.0",
"pdfjs-dist": "1.5.404",
"raphael": "2.2.7",
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"systemjs": "0.19.27",
"zone.js": "0.6.26",
"ng2-alfresco-core": "1.8.0",
"raphael": "2.2.7",
"chart.js": "2.5.0",
"ng2-activiti-diagrams": "1.8.0",
"ng2-charts": "1.6.0",
"ng2-activiti-form": "1.8.0",
"ng2-alfresco-datatable": "1.8.0",
"ng2-activiti-tasklist": "1.8.0",
"ng2-alfresco-documentlist": "1.8.0",
"minimatch": "3.0.4",
"pdfjs-dist": "1.5.404"
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
@@ -105,7 +104,7 @@
"autoprefixer": "6.5.4",
"codelyzer": "3.1.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.23.1",
"css-loader": "0.25.0",
"css-to-string-loader": "0.1.2",
"cssnano": "3.8.1",
"extract-text-webpack-plugin": "2.0.0-rc.3",
@@ -129,6 +128,8 @@
"karma-systemjs": "0.16.0",
"karma-webpack": "2.0.3",
"loader-utils": "1.1.0",
"markdown-toc": "1.1.0",
"markdownlint-cli": "^0.3.1",
"merge-stream": "1.0.1",
"node-sass": "4.5.3",
"null-loader": "0.1.1",
@@ -152,9 +153,7 @@
"webpack": "2.2.1",
"webpack-dev-server": "2.3.0",
"webpack-merge": "2.6.1",
"wsrv": "0.1.7",
"markdown-toc": "1.1.0",
"markdownlint-cli": "^0.3.1"
"wsrv": "0.1.7"
},
"license": "Apache-2.0",
"module": "./index.js",