From 7e4b635154df57068c93aef3713a8fe43a420d0b Mon Sep 17 00:00:00 2001
From: Suzana Dirla <suzana@dirla.ro>
Date: Wed, 8 May 2019 18:14:57 +0300
Subject: [PATCH] Upgrade to ADF 3.2.0 (#1100)

* Upgrade to ADF 3.2.0 version

* fixes login button color

* Revert "fixes login button color"

This reverts commit 29c529d

* include only button color styling for toolbar
---
 package-lock.json                           | 24 ++++++++++-----------
 package.json                                |  8 +++----
 src/app/ui/overrides/adf-toolbar.theme.scss |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 269c48f16..5a1fb5879 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,33 +5,33 @@
   "requires": true,
   "dependencies": {
     "@alfresco/adf-content-services": {
-      "version": "3.2.0-2f126fe7fd4bcb111f5aad788e01465d10c1d7d3",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.2.0-2f126fe7fd4bcb111f5aad788e01465d10c1d7d3.tgz",
-      "integrity": "sha512-9/iMz5vKwWXHSjfF+RONVlztwmsW6H6rBI1/o5n5l2cShnSYFxLvViMj11F0rNzXLQWhDSC6sjNaJhl0Yuj/wA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.2.0.tgz",
+      "integrity": "sha512-G8+vSL3GTGm2rAtvNgFpCctcX7WwRBoAkvkvwnIWETrl5zYb4ftzvCpSkrj8FKxueE8Ys59oTMOv1o22ev2+AA==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-core": {
-      "version": "3.2.0-2f126fe7fd4bcb111f5aad788e01465d10c1d7d3",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.2.0-2f126fe7fd4bcb111f5aad788e01465d10c1d7d3.tgz",
-      "integrity": "sha512-7RSGgP25uT900qvIHJabzwMcA4rJTUDnrmNIzyg3hogZRYUN8kMt5fV3nf8vs2rKUkfHDpO12+EVlAwJ0dXsXQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.2.0.tgz",
+      "integrity": "sha512-mgDNroAiKjDSOVS3nfc0vYrgGtWt2dUNLfLReU89jvMAiXLVCghA/Gufhjx0t64TOneWofD9hNGV0KuIXx0wFQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@alfresco/adf-extensions": {
-      "version": "3.2.0-2f126fe7fd4bcb111f5aad788e01465d10c1d7d3",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.2.0-2f126fe7fd4bcb111f5aad788e01465d10c1d7d3.tgz",
-      "integrity": "sha512-uGKUotJLyqvizh8yEn28Iuj8hw4xD+UBvYbhUUvqAD/v1vG3LEwrYW0aXvFsBaj+1Sh10PvKp16kg1Z9WNpoJA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.2.0.tgz",
+      "integrity": "sha512-nw7rzgG7WznekyzNQF+unsWITuBfQva2wvTiqRPtimpA1hZWIcxKUWhKf5nkw8nCb8qlgkVIimylZjNZFlsr7A==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@alfresco/js-api": {
-      "version": "3.2.0-fa5916ff413131513c3e382d7f27dd9b4cfa0e7e",
-      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.2.0-fa5916ff413131513c3e382d7f27dd9b4cfa0e7e.tgz",
-      "integrity": "sha512-3fhNh0+jqDzO6JavRhhYhGr2RZTLwSFIDF+uY2mcGCLWEiI0t81kyv4cYhO1hOHayfwXd6cn6hB7GZIChKrCZw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.2.0.tgz",
+      "integrity": "sha512-HgB/8M4mSi1mVx7ZDbgrNLP5xZiPUamkNzQI198DkWwQRxXh9V0khEavm82Rr9M5nrLw4VdPUARFLmxsNQwmng==",
       "requires": {
         "event-emitter": "0.3.4",
         "superagent": "3.8.2"
diff --git a/package.json b/package.json
index 55fa79406..7ac6bcbb5 100644
--- a/package.json
+++ b/package.json
@@ -37,10 +37,10 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "3.2.0-2f126fe7fd4bcb111f5aad788e01465d10c1d7d3",
-    "@alfresco/adf-core": "3.2.0-2f126fe7fd4bcb111f5aad788e01465d10c1d7d3",
-    "@alfresco/adf-extensions": "3.2.0-2f126fe7fd4bcb111f5aad788e01465d10c1d7d3",
-    "@alfresco/js-api": "3.2.0-fa5916ff413131513c3e382d7f27dd9b4cfa0e7e",
+    "@alfresco/adf-content-services": "3.2.0",
+    "@alfresco/adf-core": "3.2.0",
+    "@alfresco/adf-extensions": "3.2.0",
+    "@alfresco/js-api": "3.2.0",
     "@angular/animations": "7.2.14",
     "@angular/cdk": "^7.3.7",
     "@angular/common": "7.2.14",
diff --git a/src/app/ui/overrides/adf-toolbar.theme.scss b/src/app/ui/overrides/adf-toolbar.theme.scss
index 85e16b214..b975fc27e 100644
--- a/src/app/ui/overrides/adf-toolbar.theme.scss
+++ b/src/app/ui/overrides/adf-toolbar.theme.scss
@@ -1,5 +1,5 @@
 @mixin custom-adf-toolbar-theme($theme) {
   .adf-toolbar {
-    @include angular-material-theme($theme);
+    @include mat-button-theme($theme);
   }
 }