From 630b28906b647c2f52284bc15a8e42d733b55a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Copin?= Date: Sat, 28 May 2016 17:06:13 +0200 Subject: [PATCH] fix: lock to material2 alpha 4 temporarily - closes #244, #240 --- .gitignore | 4 ++++ modules/site/package.json | 17 +++++++++-------- modules/site/public/version.json | 16 ++++++++-------- package.json | 14 +++++++------- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 47b14233..9da84c58 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,10 @@ # compiled output /dist /tmp +public/font/font.css +public/font/font.css.map +src/all.css +src/all.css.map # dependencies /node_modules diff --git a/modules/site/package.json b/modules/site/package.json index e55d4627..5408ef99 100644 --- a/modules/site/package.json +++ b/modules/site/package.json @@ -21,14 +21,14 @@ "@angular/platform-browser": "2.0.0-rc.1", "@angular/platform-browser-dynamic": "2.0.0-rc.1", "@angular/router": "2.0.0-rc.1", - "@angular2-material/checkbox": "^2.0.0-alpha.4", - "@angular2-material/core": "^2.0.0-alpha.4", - "@angular2-material/input": "^2.0.0-alpha.4", - "@angular2-material/progress-bar": "^2.0.0-alpha.4", - "@angular2-material/progress-circle": "^2.0.0-alpha.4", - "@angular2-material/radio": "^2.0.0-alpha.4", - "@angular2-material/sidenav": "^2.0.0-alpha.4", - "@angular2-material/toolbar": "^2.0.0-alpha.4", + "@angular2-material/checkbox": "2.0.0-alpha.4", + "@angular2-material/core": "2.0.0-alpha.4", + "@angular2-material/input": "2.0.0-alpha.4", + "@angular2-material/progress-bar": "2.0.0-alpha.4", + "@angular2-material/progress-circle": "2.0.0-alpha.4", + "@angular2-material/radio": "2.0.0-alpha.4", + "@angular2-material/sidenav": "2.0.0-alpha.4", + "@angular2-material/toolbar": "2.0.0-alpha.4", "es6-shim": "^0.35.0", "highlightjs": "^8.7.0", "ng2-material": "file:../../dist", @@ -48,6 +48,7 @@ "karma-jasmine": "^0.3.8", "node-sass": "^3.7.0", "protractor": "^3.3.0", + "reflect-metadata": "^0.1.3", "ts-node": "^0.5.5", "tslint": "^3.6.0", "typescript": "^1.8.10", diff --git a/modules/site/public/version.json b/modules/site/public/version.json index 9ac4ad89..cf23a2e2 100644 --- a/modules/site/public/version.json +++ b/modules/site/public/version.json @@ -1,19 +1,19 @@ { "version": "0.4.1", - "readme": "

ng2-material

\n

\"Build\n\"Coverage \n\"npm \n\"Join\n\"Sauce

\n

ng2-material is a set of components, built on top of @angular2-material/core, and a site full of examples of how to use them. The site contains examples for community \ndeveloped components as well as the official material2 components.

\n

Check out the examples site for demos and instructions on getting started.

\n

Getting Help

\n

IMPORTANT: This project is provided as-is, and no commercial level of support is given to it. If you need perfect compatbility with IE or great getting started materials for your specific use-case, you may be better off waiting for an official release of material2.

\n

That being said, if something is wrong with your installation or with the existing examples or materials, please try to provide a Plunkr example reproducing your problem, and file an issue.

\n

Credits

\n

This project is based on the components and styles defined in the \nAngular Material and Angular 2 projects.

\n

Sponsors

\n

ng2-material is an open source project sponsored by JetBrains. Most of ng2-material has been built in WebStorm, an excellent IDE for angular2 and Typescript development.

\n

Major project contributors are eligible to be granted an all-products JetBrains license, for development of ng2-material.

\n

<a href="https://www.jetbrains.com/" target="_blank"><img src="https://rawgit.com/justindujardin/ng2-material/master/public/images/logo_jetbrains.svg" width="256"></a>\n<a href="https://www.jetbrains.com/webstorm/" target="_blank"><img src="https://rawgit.com/justindujardin/ng2-material/master/public/images/logo_webstorm.svg" width="256"></a>

\n

License

\n

This project is MIT licensed.

\n\n", + "readme": "

ng2-material

\n

\"Build\n\"Coverage \n\"npm \n\"Join\n\"Sauce

\n

ng2-material is a set of components, built on top of @angular2-material/core, and a site full of examples of how to use them. The site contains examples for community \ndeveloped components as well as the official material2 components.

\n

Check out the examples site for demos and instructions on getting started.

\n

Getting Help

\n

IMPORTANT: This project is provided as-is, and no commercial level of support is given to it. If you need perfect compatbility with IE or great getting started materials for your specific use-case, you may be better off waiting for an official release of material2.

\n

That being said, if something is wrong with your installation or with the existing examples or materials, please try to provide a Plunkr example reproducing your problem, and file an issue.

\n

Credits

\n

This project is based on the components and styles defined in the \nAngular Material and Angular 2 projects.

\n

Sponsors

\n

ng2-material is an open source project sponsored by JetBrains. Most of ng2-material has been built in WebStorm, an excellent IDE for angular2 and Typescript development.

\n

Major project contributors are eligible to be granted an all-products JetBrains license, for development of ng2-material.

\n

<a href="https://www.jetbrains.com/" target="_blank"><img src="https://rawgit.com/justindujardin/ng2-material/0ccd658914fc3d0a5e04560d2d58a529e93c6649/public/images/logo_jetbrains.svg" width="256"></a>\n<a href="https://www.jetbrains.com/webstorm/" target="_blank"><img src="https://rawgit.com/justindujardin/ng2-material/0ccd658914fc3d0a5e04560d2d58a529e93c6649/public/images/logo_webstorm.svg" width="256"></a>

\n

License

\n

This project is MIT licensed.

\n\n", "@angular/common": "2.0.0-rc.1", "@angular/compiler": "2.0.0-rc.1", "@angular/core": "2.0.0-rc.1", "@angular/platform-browser": "2.0.0-rc.1", "@angular/platform-browser-dynamic": "2.0.0-rc.1", "@angular/router": "2.0.0-rc.1", - "@angular2-material/checkbox": "^2.0.0-alpha.4", - "@angular2-material/core": "^2.0.0-alpha.4", - "@angular2-material/progress-bar": "^2.0.0-alpha.4", - "@angular2-material/progress-circle": "^2.0.0-alpha.4", - "@angular2-material/radio": "^2.0.0-alpha.4", - "@angular2-material/sidenav": "^2.0.0-alpha.4", - "@angular2-material/toolbar": "^2.0.0-alpha.4", + "@angular2-material/checkbox": "2.0.0-alpha.4", + "@angular2-material/core": "2.0.0-alpha.4", + "@angular2-material/progress-bar": "2.0.0-alpha.4", + "@angular2-material/progress-circle": "2.0.0-alpha.4", + "@angular2-material/radio": "2.0.0-alpha.4", + "@angular2-material/sidenav": "2.0.0-alpha.4", + "@angular2-material/toolbar": "2.0.0-alpha.4", "es6-promise": ">=3.0.2", "es6-shim": "^0.35.0", "rxjs": "5.0.0-beta.6", diff --git a/package.json b/package.json index 315289b8..9d67b2d5 100644 --- a/package.json +++ b/package.json @@ -21,13 +21,13 @@ "@angular/platform-browser": "2.0.0-rc.1", "@angular/platform-browser-dynamic": "2.0.0-rc.1", "@angular/router": "2.0.0-rc.1", - "@angular2-material/checkbox": "^2.0.0-alpha.4", - "@angular2-material/core": "^2.0.0-alpha.4", - "@angular2-material/progress-bar": "^2.0.0-alpha.4", - "@angular2-material/progress-circle": "^2.0.0-alpha.4", - "@angular2-material/radio": "^2.0.0-alpha.4", - "@angular2-material/sidenav": "^2.0.0-alpha.4", - "@angular2-material/toolbar": "^2.0.0-alpha.4", + "@angular2-material/checkbox": "2.0.0-alpha.4", + "@angular2-material/core": "2.0.0-alpha.4", + "@angular2-material/progress-bar": "2.0.0-alpha.4", + "@angular2-material/progress-circle": "2.0.0-alpha.4", + "@angular2-material/radio": "2.0.0-alpha.4", + "@angular2-material/sidenav": "2.0.0-alpha.4", + "@angular2-material/toolbar": "2.0.0-alpha.4", "es6-promise": ">=3.0.2", "es6-shim": "^0.35.0", "rxjs": "5.0.0-beta.6",