From bce7a65e4824bbdc39a8e58b93aed72a04f377d3 Mon Sep 17 00:00:00 2001
From: bundyo <bundyo@gmail.com>
Date: Tue, 17 Mar 2020 17:46:01 +0200
Subject: [PATCH] Fix wrong ActionBar colors, introduced with node-sass fix in
 2.3.2 Fix .bg-primary not set background after accent changes Update versions

---
 CHANGELOG.md                    |  8 ++++++++
 package.json                    | 18 +++++++++---------
 src/package.json                |  2 +-
 src/scss/_bootstrap.scss        |  2 +-
 src/scss/mixins/_utilities.scss |  5 +++++
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd1fe13..245f918 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="2.3.3"></a>
+## [2.3.3](https://github.com/NativeScript/theme/compare/v2.3.2...v2.3.3) (2020-03-17)
+
+### Fixes
+
+* Fix wrong ActionBar colors, introduced with node-sass fix
+* Fix missing bootstrap bg-primary accented background-color 
+
 <a name="2.3.2"></a>
 ## [2.3.2](https://github.com/NativeScript/theme/compare/v2.2.1...v2.3.2) (2020-02-20)
 
diff --git a/package.json b/package.json
index e6e6b94..56096cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/theme",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Telerik NativeScript Core Theme",
   "author": "Telerik <support@telerik.com>",
   "homepage": "https://www.nativescript.org",
@@ -14,24 +14,24 @@
   "nativescript": {
     "id": "org.nativescript.theme",
     "tns-ios": {
-      "version": "6.4.0"
+      "version": "6.4.2"
     },
     "tns-android": {
       "version": "6.4.1"
     }
   },
   "dependencies": {
-    "@nativescript/core": "~6.4.1",
+    "@nativescript/core": "~6.5.0",
     "@nativescript/theme": "./src",
     "bootstrap": "4.3.1",
     "nativescript-picker": "~2.1.2",
     "nativescript-datetimepicker": "~1.2.2",
     "nativescript-themes": "2.0.1",
-    "nativescript-ui-autocomplete": "~6.0.0",
+    "nativescript-ui-autocomplete": "~6.0.1",
     "nativescript-ui-sidedrawer": "~8.0.0",
     "nativescript-ui-dataform": "~6.0.0",
     "nativescript-ui-listview": "~8.0.1",
-    "tns-core-modules": "~6.4.1"
+    "tns-core-modules": "~6.5.0"
   },
   "devDependencies": {
     "@babel/core": "7.7.7",
@@ -42,14 +42,14 @@
     "eslint": "6.4.0",
     "glob": "7.1.4",
     "lazy": "1.0.11",
-    "nativescript-dev-webpack": "1.4.1",
-    "resolve-url-loader": "3.1.0",
-    "sass": "1.25.0",
+    "nativescript-dev-webpack": "1.5.1",
+    "resolve-url-loader": "3.1.1",
+    "sass": "1.26.3",
     "sass-lint": "1.13.1",
     "sass-loader": "8.0.2",
     "speed-measure-webpack-plugin": "1.3.1",
     "webpack": "4.40.2",
-    "webpack-bundle-analyzer": "3.5.0",
+    "webpack-bundle-analyzer": "3.6.1",
     "webpack-cli": "3.3.9",
     "webpack-sources": "1.4.3"
   },
diff --git a/src/package.json b/src/package.json
index 98a6023..50dc294 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/theme",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Telerik NativeScript Core Theme",
   "author": "Telerik <support@telerik.com>",
   "main": "index",
diff --git a/src/scss/_bootstrap.scss b/src/scss/_bootstrap.scss
index 89edd3e..af05419 100644
--- a/src/scss/_bootstrap.scss
+++ b/src/scss/_bootstrap.scss
@@ -8,7 +8,7 @@
 }
 
 .bg-primary {
-  @include colorize($color: accent);
+  @include colorize($background-color: accent);
   color: $white;
 }
 
diff --git a/src/scss/mixins/_utilities.scss b/src/scss/mixins/_utilities.scss
index 36c477e..eb00b77 100644
--- a/src/scss/mixins/_utilities.scss
+++ b/src/scss/mixins/_utilities.scss
@@ -7,6 +7,11 @@
 // Functions
 
 @function const($const) {
+    // Workarounds for node-sass color bug
+    @if $const == white { $const: "white"; }
+    @if $const == black { $const: "black"; }
+    @if $const == transparent { $const: "transparent"; }
+
     @return map-get($constants, $const);
 }