Skip to content

Commit

Permalink
build: update Covalent UI library
Browse files Browse the repository at this point in the history 
Update @covalent/core to beta.2 and refactor accordingly.
See:
- https://github.com/Teradata/covalent/blob/develop/docs/UPGRADE.md#upgrade-from-100-beta1-to-100-beta2
- https://github.com/Teradata/covalent/blob/develop/docs/CHANGELOG.md#100-beta2-hotel-california-2017-02-23
- https://github.com/angular/material2/blob/master/CHANGELOG.md#200-beta2-flannel-papaya-2017-02-15
- angular/components#2790

Close #15
  • Loading branch information
@zuzust
zuzust committed Mar 14, 2017
1 parent 15812a9 commit a883f10
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 51 deletions.
7 changes: 4 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@
"@angular/common": "2.4.7",
"@angular/compiler": "2.4.7",
"@angular/core": "2.4.7",
"@angular/flex-layout": "2.0.0-rc.1",
"@angular/forms": "2.4.7",
"@angular/http": "2.4.7",
"@angular/material": "2.0.0-beta.1",
"@angular/material": "2.0.0-beta.2",
"@angular/platform-browser": "2.4.7",
"@angular/platform-browser-dynamic": "2.4.7",
"@angular/platform-server": "2.4.7",
"@angular/router": "3.4.7",
"@covalent/core": "1.0.0-beta.1-1",
"@covalent/core": "1.0.0-beta.2-1",
"@ngrx/core": "1.2.0",
"@ngrx/effects": "2.0.0",
"@ngrx/store": "2.2.1",
Expand All @@ -63,7 +64,7 @@
"@types/jasmine": "2.5.42",
"@types/leaflet": "1.0.55",
"@types/node": "6.0.63",
"codelyzer": "2.0.0",
"codelyzer": "3.0.0-beta.0",
"commitizen": "2.9.5",
"cz-conventional-changelog": "1.2.0",
"husky": "0.13.1",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { reducer } from './state-management/reducers/index';
BrowserModule,
AppRoutingModule,
AngularFireModule.initializeApp(firebaseConfig),
CovalentCoreModule.forRoot(),
CovalentCoreModule,
StoreModule.provideStore(reducer),
RouterStoreModule.connectRouter(),
EffectsModule.run(CurrentSearchEffectService),
Expand Down
4 changes: 2 additions & 2 deletions src/styles.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ md-toolbar-row {
}

@media (max-width: 960px) {
md-toolbar.md-primary {
md-toolbar.mat-primary {
min-height: 70px;
md-toolbar-row {
height: 70px;
Expand All @@ -15,7 +15,7 @@ md-toolbar-row {
}

@media (max-width: 600px) {
md-toolbar.md-primary {
md-toolbar.mat-primary {
min-height: 105px;
padding-bottom: 5px;
md-toolbar-row {
Expand Down
18 changes: 9 additions & 9 deletions src/theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@

// Include the base styles for Angular Material core. We include this here so that you only
// have to load a single css file for Angular Material in your app.
@include md-core();
@include mat-core();

// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue.
$primary: md-palette($md-blue, 700);
$accent: md-palette($md-orange, 800, A100, A400);
$primary: mat-palette($mat-blue, 700);
$accent: mat-palette($mat-orange, 800, A100, A400);

// The warn palette is optional (defaults to red).
$warn: md-palette($md-red, 600);
$warn: mat-palette($mat-red, 600);

// Create the theme object (a Sass map containing all of the palettes).
$theme: md-light-theme($primary, $accent, $warn);
$theme: mat-light-theme($primary, $accent, $warn);

// Include theme styles for core and each component used in your app.
// Alternatively, you can import and @include the theme mixins for each component
Expand All @@ -32,11 +32,11 @@ $theme: md-light-theme($primary, $accent, $warn);

// Custom theme examples
.white-orange {
$primary2: md-palette($md-grey, 50);
$accent2: md-palette($md-orange, 800);
$warn2: md-palette($md-red, 600);
$primary2: mat-palette($mat-grey, 50);
$accent2: mat-palette($mat-orange, 800);
$warn2: mat-palette($mat-red, 600);

$white-orange: md-light-theme($primary2, $accent2, $warn2);
$white-orange: mat-light-theme($primary2, $accent2, $warn2);

@include angular-material-theme($white-orange);
@include covalent-theme($white-orange);
Expand Down
90 changes: 54 additions & 36 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
webpack-merge "^2.4.0"
zone.js "^0.7.2"

"@angular/common@2.4.7", "@angular/common@^2.4.4":
"@angular/common@2.4.7":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.7.tgz#9316daf90e353e67187d2e0afec5521c2001bd4b"

Expand All @@ -81,68 +81,66 @@
minimist "^1.2.0"
reflect-metadata "^0.1.2"

"@angular/compiler@2.4.7", "@angular/compiler@>=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0", "@angular/compiler@^2.4.4":
"@angular/compiler@2.4.7", "@angular/compiler@>=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.7.tgz#008c1f0d1409c46fbba215fe8ab0d886252c7ff0"

"@angular/core@2.4.7", "@angular/core@>=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0", "@angular/core@^2.4.4":
"@angular/core@2.4.7", "@angular/core@>=2.3.1 <5.0.0 || >=4.0.0-beta <5.0.0":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.7.tgz#8bed9a2d37e81342bd41d189df88aa3e02393cfb"

"@angular/forms@2.4.7", "@angular/forms@^2.4.4":
"@angular/flex-layout@2.0.0-rc.1", "@angular/flex-layout@^2.0.0-beta.5":
version "2.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@angular/flex-layout/-/flex-layout-2.0.0-rc.1.tgz#96fa7f85b2c4bacf2784913a2d607e2ed23dc7f1"

"@angular/forms@2.4.7":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.4.7.tgz#d34a36110e10f641aa1e1420b5c2df65987fd8bb"

"@angular/http@2.4.7", "@angular/http@^2.4.4":
"@angular/http@2.4.7":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-2.4.7.tgz#b024b2b49ae0234258d42309e46f65862a42070d"

"@angular/material@2.0.0-beta.1":
version "2.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-2.0.0-beta.1.tgz#106a0b79fb2b48a7606a0682c4e5d0bbe03364a0"
"@angular/material@2.0.0-beta.2":
version "2.0.0-beta.2"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-2.0.0-beta.2.tgz#65ee8733990347b7518b7f42113e02e069dc109b"

"@angular/platform-browser-dynamic@2.4.7", "@angular/platform-browser-dynamic@^2.4.4":
"@angular/platform-browser-dynamic@2.4.7":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.7.tgz#9632586f9ce596186be4c124c3ea0a4a74b27b46"

"@angular/platform-browser@2.4.7", "@angular/platform-browser@^2.4.4":
"@angular/platform-browser@2.4.7":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.7.tgz#19f7996a70f07b34ce8d6d0e255544e62cae75f1"

"@angular/platform-server@2.4.7", "@angular/platform-server@^2.4.4":
"@angular/platform-server@2.4.7":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-2.4.7.tgz#e2a9f283b4eb25b967ab085c83350c0a08927617"
dependencies:
parse5 "^2.2.1"

"@angular/router@3.4.7", "@angular/router@^3.4.4":
"@angular/router@3.4.7":
version "3.4.7"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-3.4.7.tgz#e9583eed5a1d50cc1628b2526244555444a746b8"

"@angular/tsc-wrapped@0.5.2", "@angular/tsc-wrapped@>=0.5.0 <5.0.0 || >=4.0.0-beta <5.0.0":
"@angular/tsc-wrapped@0.5.2":
version "0.5.2"
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.2.tgz#2eddf472c467fcb334ea94deddaaa71990c5a482"
dependencies:
tsickle "^0.2"

"@covalent/core@1.0.0-beta.1-1":
version "1.0.0-beta.1-1"
resolved "https://registry.yarnpkg.com/@covalent/core/-/core-1.0.0-beta.1-1.tgz#9a22f2a33d82a64d6a7d18fcd1a4088bfb256683"
dependencies:
"@angular/common" "^2.4.4"
"@angular/compiler" "^2.4.4"
"@angular/core" "^2.4.4"
"@angular/forms" "^2.4.4"
"@angular/http" "^2.4.4"
"@angular/material" "2.0.0-beta.1"
"@angular/platform-browser" "^2.4.4"
"@angular/platform-browser-dynamic" "^2.4.4"
"@angular/platform-server" "^2.4.4"
"@angular/router" "^3.4.4"
core-js "^2.4.1"
hammerjs "^2.0.8"
rxjs "^5.0.1"
zone.js "^0.7.2"
"@angular/tsc-wrapped@>=0.5.0 <5.0.0 || >=4.0.0-beta <5.0.0":
version "4.0.0-rc.2"
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.0.0-rc.2.tgz#d7023d93f4576b6f776ffc7175ff760e7e133705"
dependencies:
tsickle "^0.21.0"

"@covalent/core@1.0.0-beta.2-1":
version "1.0.0-beta.2-1"
resolved "https://registry.yarnpkg.com/@covalent/core/-/core-1.0.0-beta.2-1.tgz#f16daeb6c6a6411853241f6d2497ac5b3d58cc10"
dependencies:
"@angular/flex-layout" "^2.0.0-beta.5"
"@angular/material" "2.0.0-beta.2"

"@ngrx/core@1.2.0":
version "1.2.0"
Expand All @@ -152,6 +150,10 @@
version "2.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-2.0.0.tgz#db4c3e1b69030229cb6b908477115b3479e4c4e0"

"@ngrx/router-store@^1.2.5":
version "1.2.5"
resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-1.2.5.tgz#1cff82c5488fab995872c6f0d57a29a7ac91e598"

"@ngrx/store-devtools@3.2.3":
version "3.2.3"
resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-3.2.3.tgz#3e89ac95ba7e96ebb20180a61d731954078728fb"
Expand Down Expand Up @@ -937,13 +939,14 @@ code-point-at@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"

codelyzer@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-2.0.0.tgz#212b9182ba9fe0fee325f08781b0d49521a1c987"
codelyzer@3.0.0-beta.0:
version "3.0.0-beta.0"
resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.0.0-beta.0.tgz#3debea2cb7b3c0a12e1e85e45c1d53a80a71e28d"
dependencies:
app-root-path "^2.0.1"
css-selector-tokenizer "^0.7.0"
cssauron "^1.4.0"
semver-dsl "^1.0.1"
source-map "^0.5.6"
sprintf-js "^1.0.3"

Expand Down Expand Up @@ -1134,7 +1137,7 @@ cookie@0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"

core-js@2.4.1, core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
core-js@2.4.1, core-js@^2.2.0, core-js@^2.4.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"

Expand Down Expand Up @@ -2263,7 +2266,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

hammerjs@2.0.8, hammerjs@^2.0.8:
hammerjs@2.0.8:
version "2.0.8"
resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"

Expand Down Expand Up @@ -4747,6 +4750,12 @@ semver-diff@^2.0.0:
dependencies:
semver "^5.0.3"

semver-dsl@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
dependencies:
semver "^5.3.0"

"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
Expand Down Expand Up @@ -5343,6 +5352,15 @@ tsickle@^0.2:
source-map "^0.5.6"
source-map-support "^0.4.2"

tsickle@^0.21.0:
version "0.21.5"
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.21.5.tgz#341c1834b9d293c8cbffc295a86a1e46268ed22f"
dependencies:
minimist "^1.2.0"
mkdirp "^0.5.1"
source-map "^0.5.6"
source-map-support "^0.4.2"

tslint@4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-4.5.0.tgz#12b384a339d456ee1d3cc665f13f4e759bbe5d64"
Expand Down

0 comments on commit a883f10

Please sign in to comment.