Skip to content

Commit ee3953b

Browse files
authored
Merge pull request #11 from edcarroll/develop
v0.3.1 into Master
2 parents 8e1a462 + f0b03ed commit ee3953b

File tree

18 files changed

+114
-101
lines changed

18 files changed

+114
-101
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ Next include the Semantic UI CSS file in your `index.html` (you can include a ma
2020

2121
Once installed you need to import the main module:
2222
```ts
23-
import {SuiModule} from 'ng2-semantic-ui';
23+
import {SuiModule} from 'ng2-semantic-ui/ng2-semantic-ui';
2424
```
2525

2626
Finally import the main module into your application module:
2727
```ts
28-
import {SuiModule} from 'ng2-semantic-ui';
28+
import {SuiModule} from 'ng2-semantic-ui/ng2-semantic-ui';
2929

3030
@NgModule({
3131
declarations: [AppComponent, ...],

angular-cli.json

Lines changed: 43 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,46 @@
11
{
2-
"project": {
3-
"version": "1.0.0-beta.11-webpack.2",
4-
"name": "ng2-semantic-ui"
5-
},
6-
"apps": [
7-
{
8-
"main": "demo/main.ts",
9-
"tsconfig": "demo/tsconfig.json",
10-
"mobile": false
11-
}
12-
],
13-
"addons": [],
14-
"packages": [],
15-
"e2e": {
16-
"protractor": {
17-
"config": "demo/config/protractor.conf.js"
18-
}
19-
},
20-
"test": {
21-
"karma": {
22-
"config": "demo/config/karma.conf.js"
23-
}
24-
},
25-
"defaults": {
26-
"prefix": "demo",
27-
"sourceDir": "demo",
28-
"styleExt": "css",
29-
"prefixInterfaces": false,
30-
"lazyRoutePrefix": "+"
2+
"project": {
3+
"version": "1.0.0-beta.11-webpack.8",
4+
"name": "ng2-semantic-ui"
5+
},
6+
"apps": [
7+
{
8+
"root": "demo",
9+
"outDir": "dist",
10+
"assets": "assets",
11+
"index": "index.html",
12+
"main": "main.ts",
13+
"test": "test.ts",
14+
"tsconfig": "tsconfig.json",
15+
"prefix": "app",
16+
"mobile": false,
17+
"styles": [
18+
"css/style.css",
19+
"css/code.css"
20+
],
21+
"scripts": [],
22+
"environments": {
23+
"source": "environments/environment.ts",
24+
"prod": "environments/environment.prod.ts",
25+
"dev": "environments/environment.dev.ts"
26+
}
3127
}
28+
],
29+
"addons": [],
30+
"packages": [],
31+
"e2e": {
32+
"protractor": {
33+
"config": "./protractor.conf.js"
34+
}
35+
},
36+
"test": {
37+
"karma": {
38+
"config": "./karma.conf.js"
39+
}
40+
},
41+
"defaults": {
42+
"styleExt": "css",
43+
"prefixInterfaces": false,
44+
"lazyRoutePrefix": "+"
45+
}
3246
}

demo/app/app.routing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ const appRoutes: Routes = [
7777

7878
export const appRoutingProviders: any[] = [];
7979

80-
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);
80+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes, { useHash: true });

demo/app/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export * from './environments/environment';
1+
export * from '../environments/environment';
22
export * from './app.component';
33
export * from './app.module';

demo/app/pages/getting-started/getting-started.page.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { Component } from '@angular/core';
88
export class GettingStartedPage {
99
public installCode:string = `$ npm install ng2-semantic-ui --save`;
1010
public includeCssCode:string = `<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.4/semantic.min.css">`;
11-
public importCode:string = `import {SuiModule} from 'ng2-semantic-ui';`;
11+
public importCode:string = `import {SuiModule} from 'ng2-semantic-ui/ng2-semantic-ui';`;
1212
public moduleImportCode:string = `
13-
import {SuiModule} from 'ng2-semantic-ui';
13+
import {SuiModule} from 'ng2-semantic-ui/ng2-semantic-ui';
1414
1515
@NgModule({
1616
declarations: [AppComponent, ...],
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)