Skip to content

Commit

Permalink
Merge branch 'master' into BPenkov/styling
Browse files Browse the repository at this point in the history
  • Loading branch information
@bazal4o
bazal4o committed Nov 7, 2018
2 parents 9604a34 + 35bce28 commit a1c8066
Show file tree
Hide file tree
Showing 23 changed files with 102 additions and 89 deletions.
2 changes: 1 addition & 1 deletion spec/acceptance/add-spec.ts
View file
Expand Up @@ -301,7 +301,7 @@ describe("Add command", () => {
` ],` + EOL +
` imports: [` + EOL +
` BrowserModule,` + EOL +
` IgxGridModule.forRoot()` + EOL +
` IgxGridModule` + EOL +
` ],` + EOL +
` bootstrap: [AppComponent]` + EOL +
`})` + EOL +
Expand Down
2 changes: 1 addition & 1 deletion templates/angular/igx-ts/custom-templates/awesome-grid/index.ts
View file
Expand Up @@ -10,7 +10,7 @@ class IgxGridAwesomeTemplate extends IgniteUIForAngularTemplate {
this.name = "Awesome Grid";
this.description = "Awesome IgxGrid";
this.dependencies = [
{ import: "IgxGridModule", from: "igniteui-angular", root: true },
{ import: "IgxGridModule", from: "igniteui-angular" },
{
from: "igniteui-angular",
import: [
Expand Down
12 changes: 6 additions & 6 deletions ...s/angular/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__name__.component.html
View file
Expand Up @@ -31,15 +31,15 @@
<div class="caseSensitiveButton">
<button igxButton="icon" igxRipple igxRippleCentered="true" (click)="updateSearch()"
[igxButtonBackground]="caseSensitive? 'rgb(73, 180, 254)' : 'transparent'">
<igx-icon class="caseSensitiveIcon" fontSet="material" name="text_fields"></igx-icon>
<igx-icon class="caseSensitiveIcon" fontSet="material">text_fields</igx-icon>
</button>
</div>
<div class="searchButtons">
<button igxButton="icon" igxRipple igxRippleCentered="true" (click)="grid1.findPrev(searchText, caseSensitive)">
<igx-icon fontSet="material" name="navigate_before"></igx-icon>
<igx-icon fontSet="material">navigate_before</igx-icon>
</button>
<button igxButton="icon" igxRipple igxRippleCentered="true" (click)="grid1.findNext(searchText, caseSensitive)">
<igx-icon fontSet="material" name="navigate_next"></igx-icon>
<igx-icon fontSet="material">navigate_next</igx-icon>
</button>
</div>
</igx-suffix>
Expand All @@ -48,7 +48,7 @@
<div class="operationsContainer">
<div class="relative-container">
<button #hidingButton class="toggle-button" igxButton="flat" igxRipple="#09f" (click)="toggleHiding()">
<igx-icon class="header-icon">visibility_off</igx-icon><span>{{hiddenColsLength}}</span><igx-icon class="header-icon">arrow_drop_down</igx-icon></button>
<igx-icon class="header-icon">visibility_off</igx-icon><span>{{hiddenColsLength}}</span><igx-icon class="header-icon">arrow_drop_down</igx-icon></button>
<div class="toggle-content" igxToggle #toggleRefHiding="toggle">
<div class="toggle-section">
<h4 class="dd-title">Hidden columns:</h4>
Expand All @@ -63,7 +63,7 @@ <h4 class="dd-title">Hidden columns:</h4>

<div class="relative-container">
<button #pinningButton class="toggle-button" igxButton="flat" igxRipple="#09f" (click)="togglePinning()">
<igx-icon class="pin-icon" fontSet="fas" iconName="fa-thumbtack"></igx-icon><span>{{pinnedColsLength}}</span><igx-icon class="header-icon">arrow_drop_down</igx-icon></button>
<igx-icon class="pin-icon" fontSet="fas" name="fa-thumbtack"></igx-icon><span>{{pinnedColsLength}}</span><igx-icon class="header-icon">arrow_drop_down</igx-icon></button>
<div class="toggle-content" igxToggle #toggleRefPinning="toggle">
<div class="toggle-section">
<h4 class="dd-title">Pinned columns:</h4>
Expand All @@ -77,7 +77,7 @@ <h4 class="dd-title">Pinned columns:</h4>
</div>

<button class="toggle-button" igxButton="icon" igxRipple="#09f" (click)="exportData()">
<igx-icon class="header-icon">file_download</igx-icon></button>
<igx-icon class="header-icon">file_download</igx-icon></button>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion templates/angular/igx-ts/custom-templates/crm-grid/index.ts
View file
Expand Up @@ -10,7 +10,7 @@ class IgxGridCRMTemplate extends IgniteUIForAngularTemplate {
this.name = "CRM Grid";
this.description = "CRM IgxGrid";
this.dependencies = [
{ import: "IgxGridModule", from: "igniteui-angular", root: true },
{ import: "IgxGridModule", from: "igniteui-angular" },
{ provide: "IgxExcelExporterService", from: "igniteui-angular" },
{
from: "igniteui-angular",
Expand Down
2 changes: 1 addition & 1 deletion templates/angular/igx-ts/grid/default/index.ts
View file
Expand Up @@ -11,7 +11,7 @@ class IgxGridTemplate extends IgniteUIForAngularTemplate {
this.name = "Grid";
this.description = "basic IgxGrid";
this.dependencies = [
{ import: "IgxGridModule", from: "igniteui-angular", root: true }
{ import: "IgxGridModule", from: "igniteui-angular" }
];
}
}
Expand Down
6 changes: 3 additions & 3 deletions templates/angular/igx-ts/grid/grid-custom/index.ts
View file
Expand Up @@ -14,7 +14,7 @@ class IgxCustomGridTemplate extends IgniteUIForAngularTemplate {
this.name = "Custom Grid";
this.description = "IgxGrid with optional features like sorting, filtering, editing, etc.";
this.dependencies = [
{ import: "IgxGridModule", from: "igniteui-angular", root: true },
{ import: "IgxGridModule", from: "igniteui-angular" },
{ import: "IgxCheckboxModule", from: "igniteui-angular" }
];

Expand Down Expand Up @@ -80,9 +80,9 @@ class IgxCustomGridTemplate extends IgniteUIForAngularTemplate {
this.dependencies.push({ import: "FormsModule", from: "@angular/forms" });
datePickerEditor = EOL +
`<ng-template igxCellEditor let-cell="cell">` + EOL +
` <igx-datePicker cancelButtonLabel="cancel" todayButtonLabel="today" [(ngModel)]="cell.value"` +
` <igx-date-picker cancelButtonLabel="cancel" todayButtonLabel="today" [(ngModel)]="cell.value"` +
` (onOpen)="pickerOpen()" (onClose)="pickerClose()">` + EOL +
` </igx-datePicker>` + EOL +
` </igx-date-picker>` + EOL +
`</ng-template>`;
// TODO: make a Util .pad()
datePickerEditor = datePickerEditor.replace(/([\r\n]+)/g, `$&${" ".repeat(3)}`);
Expand Down
12 changes: 6 additions & 6 deletions templates/angular/igx-ts/grid/grid-summaries/files/src/app/__path__/__name__.component.html
View file
Expand Up @@ -7,38 +7,38 @@
<igx-column field="FirstName" header="First Name" [resizable]="true" [hasSummary]="true">
<ng-template igxHeader let-col>
<span style="float:left">{{col.field}}</span>
<igx-icon name="functions" class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
</ng-template>
</igx-column>
<igx-column field="LastName" header="Last Name" [resizable]="true" [hasSummary]="true">
<ng-template igxHeader let-col>
<span style="float:left">{{col.field}}</span>
<igx-icon name="functions" class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
</ng-template>
</igx-column>
<igx-column field="Country" header="Country" [resizable]="true" [hasSummary]="true">
<ng-template igxHeader let-col>
<span style="float:left">{{col.field}}</span>
<igx-icon name="functions" class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
</ng-template>
</igx-column>
<igx-column field="Age" header="Age" [resizable]="true" [editable]="true" [dataType]="'number'" [hasSummary]="true">
<ng-template igxHeader let-col>
<span style="float:left">{{col.field}}</span>
<igx-icon name="functions" class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
</ng-template>
</igx-column>
<igx-column field="RegistererDate" header="Registerer Date" [formatter]="formatDate" [resizable]="true" [dataType]="'date'"
[hasSummary]="true" [summaries]="customDateSummary">
<ng-template igxHeader let-col>
<span style="float:left">{{col.field}}</span>
<igx-icon name="functions" class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
</ng-template>
</igx-column>
<igx-column field="IsActive" header="IsActive" [dataType]="'boolean'" [resizable]="true" [hasSummary]="true">
<ng-template igxHeader let-col>
<span style="float:left">{{col.field}}</span>
<igx-icon name="functions" class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#731963' : '' }}" (click)="toggleSummary(col.field)">functions</igx-icon>
</ng-template>
</igx-column>
</igx-grid>
2 changes: 1 addition & 1 deletion templates/angular/igx-ts/grid/grid-summaries/index.ts
View file
Expand Up @@ -11,7 +11,7 @@ class IgxGridTemplate extends IgniteUIForAngularTemplate {
this.name = "Grid Summaries";
this.description = "Sample IgxGrid with summaries feature";
this.dependencies = [
{ import: "IgxGridModule", from: "igniteui-angular", root: true },
{ import: "IgxGridModule", from: "igniteui-angular" },
{ import: "IgxIconModule", from: "igniteui-angular" }
];
}
Expand Down
2 changes: 1 addition & 1 deletion templates/angular/igx-ts/grid/multi-column-headers/index.ts
View file
Expand Up @@ -13,7 +13,7 @@ class IgxMultiColumnHeadersTemplate extends IgniteUIForAngularTemplate {
this.name = "Multi Column Headers";
this.description = "IgxGrid with multiple header columns.";
this.dependencies = [
{ import: "IgxGridModule", from: "igniteui-angular", root: true },
{ import: "IgxGridModule", from: "igniteui-angular" },
{ import: "IgxCheckboxModule", from: "igniteui-angular" }
];

Expand Down
8 changes: 4 additions & 4 deletions templates/angular/igx-ts/input-group/default/files/src/app/__path__/__name__.component.html
View file
Expand Up @@ -12,23 +12,23 @@ <h4 class="sample-title">Book your movie ticket</h4>
<input igxInput name="fullName" type="text" [(ngModel)]="user.fullName" required="required" />
<label igxLabel for="fullName">Full Name</label>
<igx-suffix>
<igx-icon name="person"></igx-icon>
<igx-icon>person</igx-icon>
</igx-suffix>
</igx-input-group>
<igx-input-group>
<igx-prefix>+359</igx-prefix>
<label igxLabel for="phone">Phone</label>
<input igxInput name="phone" type="text" [(ngModel)]="user.phone" />
<igx-suffix>
<igx-icon name="phone"></igx-icon>
<igx-icon>phone</igx-icon>
</igx-suffix>
<igx-hint position="start">Ex.: +359 888 123 456</igx-hint>
</igx-input-group>
<igx-input-group>
<label igxLabel for="email">Email address</label>
<input igxInput name="email" type="email" [(ngModel)]="user.email" required />
<igx-suffix>
<igx-icon name="email"></igx-icon>
<igx-icon>email</igx-icon>
</igx-suffix>
</igx-input-group>
<div class="igx-combo">
Expand All @@ -37,7 +37,7 @@ <h4 class="sample-title">Book your movie ticket</h4>
</igx-combo>
</div>
<div class="igx-datePicker">
<igx-datePicker name="date" (onSelection)="onDateSelection($event)"></igx-datePicker>
<igx-date-picker name="date" (onSelection)="onDateSelection($event)"></igx-date-picker>
</div>
<div class="igx-time-picker">
<igx-time-picker name="dateTime" (onValueChanged)="onTimeSelection($event)"></igx-time-picker>
Expand Down
2 changes: 1 addition & 1 deletion templates/angular/igx-ts/list/default/files/src/app/__path__/__name__.component.html
View file
Expand Up @@ -22,7 +22,7 @@
<span class="phone">{{ contact.phone }}</span>
</div>
</div>
<igx-icon name="star" [color]="contact.isFavorite ? 'orange' : 'lightgray'" (click)="toggleFavorite(item)"></igx-icon>
<igx-icon [color]="contact.isFavorite ? 'orange' : 'lightgray'" (click)="toggleFavorite(item)">star</igx-icon>
</div>
</igx-list-item>
</igx-list>
50 changes: 25 additions & 25 deletions templates/angular/igx-ts/projects/_base/files/package.json
View file
Expand Up @@ -12,44 +12,44 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^6.0.3",
"@angular/common": "^6.0.3",
"@angular/compiler": "^6.0.3",
"@angular/core": "^6.0.3",
"@angular/forms": "^6.0.3",
"@angular/http": "^6.0.3",
"@angular/platform-browser": "^6.0.3",
"@angular/platform-browser-dynamic": "^6.0.3",
"@angular/router": "^6.0.3",
"@angular/animations": "^6.1.0",
"@angular/common": "^6.1.0",
"@angular/compiler": "^6.1.0",
"@angular/core": "^6.1.0",
"@angular/forms": "^6.1.0",
"@angular/http": "^6.1.0",
"@angular/platform-browser": "^6.1.0",
"@angular/platform-browser-dynamic": "^6.1.0",
"@angular/router": "^6.1.0",
"core-js": "^2.5.4",
"hammerjs": "^2.0.8",
"igniteui-angular": "^6.1.1",
"igniteui-angular": "~6.2.0",
"jszip": "^3.1.5",
"rxjs": "^6.0.0",
"rxjs": "~6.2.0",
"web-animations-js": "^2.3.1",
"zone.js": "^0.8.26"
"zone.js": "~0.8.26"
},
"devDependencies": {
"@angular/compiler-cli": "^6.0.3",
"@angular-devkit/build-angular": "~0.6.8",
"@angular/cli": "~6.0.8",
"@angular/language-service": "^6.0.3",
"@angular-devkit/build-angular": "~0.8.0",
"@angular/cli": "~6.2.7",
"@angular/compiler-cli": "^6.1.0",
"@angular/language-service": "^6.1.0",
"@types/hammerjs": "^2.0.35",
"@types/jasmine": "~2.8.6",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.2.1",
"codelyzer": "~4.3.0",
"igniteui-cli": "~$(cliVersion)",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma": "~3.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.0",
"karma-jasmine": "~1.1.1",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.3.0",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "~2.7.2"
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tslint": "~5.11.0",
"typescript": "~2.9.2"
}
}
12 changes: 12 additions & 0 deletions templates/angular/igx-ts/projects/_base/files/src/app/home/home.component.css
View file
@@ -1,5 +1,17 @@
a {
color: #731963;
text-decoration: none;
}

h1 {
font-size: 3rem;
font-weight: 600;
color: rgba(0, 0, 0, .74);
}

h3 {
font-size: 1.75rem;
font-weight: 600;
}

.links{
Expand Down
11 changes: 6 additions & 5 deletions templates/angular/igx-ts/projects/_base/files/src/environments/environment.ts
View file
@@ -1,15 +1,16 @@
// This file can be replaced during build by using the `fileReplacements` array.
// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.

export const environment = {
production: false
};

/*
* In development mode, to ignore zone related error stack frames such as
* `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
* import the following file, but please comment it out in production mode
* because it will have performance impact when throw error
* For easier debugging in development mode, you can import the following file
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
*
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
4 changes: 2 additions & 2 deletions templates/angular/igx-ts/projects/_base/files/src/index.html
View file
Expand Up @@ -3,15 +3,15 @@
<head>
<meta charset="utf-8">
<title>Ignite UI for Angular</title>
<base href="/" />
<base href="/">

<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">

<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Titillium+Web:300,400,600,700" rel="stylesheet">
</head>
<body>
<body class="igx-typography">
<app-root></app-root>
</body>
</html>
2 changes: 1 addition & 1 deletion templates/angular/igx-ts/projects/_base/files/src/main.ts
View file
Expand Up @@ -9,4 +9,4 @@ if (environment.production) {
}

platformBrowserDynamic().bootstrapModule(AppModule)
.catch(err => console.log(err));
.catch(err => console.error(err));
3 changes: 1 addition & 2 deletions templates/angular/igx-ts/projects/_base/files/src/tsconfig.app.json
View file
Expand Up @@ -2,11 +2,10 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "es2015",
"types": []
},
"exclude": [
"src/test.ts",
"test.ts",
"**/*.spec.ts"
]
}
1 change: 0 additions & 1 deletion templates/angular/igx-ts/projects/_base/files/src/tsconfig.spec.json
View file
Expand Up @@ -2,7 +2,6 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"module": "commonjs",
"types": [
"jasmine",
"node"
Expand Down
1 change: 1 addition & 0 deletions templates/angular/igx-ts/projects/_base/files/tsconfig.json
View file
Expand Up @@ -5,6 +5,7 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2015",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
Expand Down
1 change: 1 addition & 0 deletions templates/angular/igx-ts/projects/_base/files/tslint.json
View file
Expand Up @@ -65,6 +65,7 @@
],
"no-misused-new": true,
"no-non-null-assertion": true,
"no-redundant-jsdoc": true,
"no-shadowed-variable": true,
"no-string-literal": false,
"no-string-throw": true,
Expand Down

0 comments on commit a1c8066

Please sign in to comment.