Merge branch 'master' into development

Conflicts:
	docs/contents/articles/002-installation-guidelines/index.md
This commit is contained in:
nixa 2016-08-22 19:26:09 +03:00
commit 59c1c547c3
12 changed files with 8 additions and 48 deletions

View file

@ -34,11 +34,6 @@ npm install --global webpack-dev-server
npm install --global typescript@beta
```
* bower
```
npm install --global bower
```
## Clone repository and install dependencies
You will need to clone the source code of ng2-admin GitHub repository:
@ -52,9 +47,6 @@ npm install
```
This will setup a working copy of ng2-admin on your local machine.
**Note**: If you have any issues after the installation, additionally run the following:
```bash
bower install
```
## Running local copy

View file

@ -54,8 +54,6 @@ ng2-admin/
├──typedoc.json * typescript documentation generator
├──tsconfig.json * config that webpack uses for typescript
├──typings.json * our typings manager
├──package.json * what npm uses to manage it's dependencies
├──bower.json * DEPRECATED - moving to npm as primary package manager for all dependenties
└──.bowerrc * DEPRECARD - temporary bower configuration
└──package.json * what npm uses to manage it's dependencies
```
In our template we tried to separate theme layer and presentation layer. We believe most of other templates have them combined. That's why when you start developing using them, it gets very hard for you to remove things you don't need.