Merge branch 'master' into bundev/fix-double-font-sizes

bundyo · web-flow · commit 781875cd6ad2 · 2019-11-08T10:48:28.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,14 +14,14 @@
   "nativescript": {
     "id": "org.nativescript.theme",
     "tns-ios": {
-      "version": "6.2.0-rc-2019-10-21-153440-02"
+      "version": "6.2.0"
     },
     "tns-android": {
-      "version": "6.2.0-rc-2019-10-23-094316-01"
+      "version": "6.2.0"
     }
   },
   "dependencies": {
-    "@nativescript/core": "rc",
+    "@nativescript/core": "6.2.0",
     "@nativescript/theme": "./src",
     "bootstrap": "4.3.1",
     "nativescript-picker": "2.1.2",
@@ -31,7 +31,7 @@
     "nativescript-ui-sidedrawer": "7.0.3",
     "nativescript-ui-dataform": "5.1.1",
     "nativescript-ui-listview": "7.1.0",
-    "tns-core-modules": "rc"
+    "tns-core-modules": "6.2.0"
   },
   "devDependencies": {
     "@babel/core": "7.6.4",
@@ -41,7 +41,7 @@
     "eslint": "6.4.0",
     "glob": "7.1.4",
     "lazy": "1.0.11",
-    "nativescript-dev-webpack": "rc",
+    "nativescript-dev-webpack": "1.3.0",
     "resolve-url-loader": "3.1.0",
     "sass": "1.23.0",
     "sass-lint": "1.13.1",
diff --git a/src/scss/core/colors/_dark.scss b/src/scss/core/colors/_dark.scss
@@ -33,7 +33,7 @@ $dark-colors: (
         complementary: $card-cap-bg,
         primary: alternate(dark(background), 70%),
         border-color: lighten($background, 3%),
-        btn-color: $secondary
+        btn-color: mix($secondary, $charcoal, 30%)
     ));
 }
 
@@ -46,7 +46,7 @@ $dark-colors: (
         complementary: $accent,
         primary: alternate(dark(background), 70%),
         border-color: rgba(255,255,255,.08),
-        btn-color: $base-bg
+        btn-color: mix($base-bg, $charcoal, 10%)
     ));
 }
 
