Add BottomNav and Tabs styling, unfortunately not everything works yet

bundyo · bundyo · commit 5bf39d57cb0c · 2019-07-29T14:19:08.000+03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,10 +12,10 @@
   "nativescript": {
     "id": "org.nativescript.theme",
     "tns-ios": {
-      "version": "6.0.0-rc-2019-06-19-131834-02"
+      "version": "6.0.0"
     },
     "tns-android": {
-      "version": "6.0.0-rc-2019-07-04-174325-01"
+      "version": "6.0.0"
     }
   },
   "dependencies": {
@@ -26,7 +26,7 @@
     "nativescript-themes": "2.0.1",
     "nativescript-ui-sidedrawer": "^7.0.0-androidx",
     "nativescript-ui-dataform": "^5.0.0-androidx",
-    "tns-core-modules": "^6.0.0-rc-2019-07-10-160558-04"
+    "tns-core-modules": "^6.0.1-rc-2019-07-11-133202-02"
   },
   "devDependencies": {
     "babel-eslint": "10.0.2",
@@ -35,7 +35,7 @@
     "eslint": "6.0.1",
     "glob": "7.1.4",
     "lazy": "1.0.11",
-    "nativescript-dev-webpack": "^1.0.0-rc-2019-07-10-161902-03",
+    "nativescript-dev-webpack": "^1.0.0-rc-2019-07-10-215625-05",
     "postcss": "7.0.17",
     "postcss-custom-properties": "9.0.1",
     "postcss-loader": "3.0.0",
diff --git a/src/styles/scss/mixins/components/_controls.scss b/src/styles/scss/mixins/components/_controls.scss
@@ -106,20 +106,28 @@
 
 @mixin tab($selectors) {
     #{$selectors} {
-        font-size: 18;
+        font-size: 13;
 
-        TabStrip {
-            @include colorize($scale-alternate-background: background 5%);
+        TabStripItem,
+        .nt-tab-strip__item {
+            @include colorize($color: primary);
         }
 
-        TabStripItem {
-            @include colorize($color: primary);
+        TabStrip,
+        .nt-tab-strip {
+            @include colorize($scale-alternate-background: background 5%);
         }
 
-        TabContentItem {
+        TabContentItem,
+        .nt-tab-content__item {
             @include colorize($background: background);
         }
     }
+
+    BottomNavigation,
+    .nt-bottom-navigation {
+        font-size: 14;
+    }
 }
 
 // Skin
@@ -188,11 +196,18 @@
 }
 
 @mixin tab-skin($selectors) {
+    TabStrip,
+    .nt-tab-strip {
+        @include colorize(
+            $highlight-color: focus
+        );
+    }
+
     #{$selectors} {
-        TabStripItem:active {
+        TabStripItem:active,
+        .nt-tab-strip__item:active {
             @include colorize(
-                $color: focus,
-                $highlight-color: focus
+                $color: focus
             );
         }
     }
