Export CSS variables in Core CSS

Fix divider colors Add 5pt Button default padding Remove default font-weight from .ns-root Fix vertical SideDrawer header centering in iOS - remove height, use padding Remove default FontAwesome 4 rule as it doesn't belong in the theme. Leave it for compat mode. Update CHANGELOG Update dependencies Up the version
NativeScript · Oct 14, 2019 · 9c67c4d · 9c67c4d
1 parent 8fcac57
commit 9c67c4d
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+<a name="2.1.1"></a>
+## [2.1.1](https://github.com/NativeScript/theme/compare/v2.1.0...v2.1.1) (2019-10-14)
+
+### Features
+
+* Export CSS variables in Core CSS
+
+### Fixes
+
+* Fix divider colors
+* Add 5pt Button default padding
+* Remove default font-weight from .ns-root
+* Fix vertical SideDrawer header centering in iOS - remove height, use padding
+
+### Breaking changes
+
+* Remove default FontAwesome 4 rule as it doesn't belong in the theme. Leave it for compat mode.
+
+<a name="2.1.0"></a>
+## [2.1.0](https://github.com/NativeScript/theme/compare/v2.0.24...v2.1.0) (2019-10-11)
+
+Version 2.0.24 Beta was promoted to stable and was published as a scoped @nativescript/theme package.
+
 <a name="2.0.24 beta"></a>
 ## [2.0.24 beta](https://github.com/NativeScript/theme/compare/v2.0.23...v2.0.24) (2019-10-10)
 

diff --git a/app-compat/app.scss b/app-compat/app.scss
@@ -5,6 +5,10 @@
 
 @import '~/assets/css/font-awesome.scss';
 
+.fa {
+    font-family: FontAwesome, fontawesome-webfont;
+}
+
 FlexboxLayout {
     padding: 0 12;
 }

diff --git a/app/app.scss b/app/app.scss
@@ -5,6 +5,10 @@
 
 @import '~/assets/css/font-awesome.scss';
 
+.fa {
+    font-family: FontAwesome, fontawesome-webfont;
+}
+
 @import './app-vars.css';
 
 FlexboxLayout {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/theme",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Telerik NativeScript Core Theme",
   "author": "Telerik <[email protected]>",
   "homepage": "https://www.nativescript.org",
@@ -27,10 +27,10 @@
     "nativescript-datetimepicker": "1.2.1",
     "nativescript-themes": "2.0.1",
     "nativescript-ui-autocomplete": "5.1.1",
-    "nativescript-ui-sidedrawer": "7.0.2",
+    "nativescript-ui-sidedrawer": "7.0.3",
     "nativescript-ui-dataform": "5.1.1",
     "nativescript-ui-listview": "7.1.0",
-    "tns-core-modules": "6.2.0-next-2019-10-10-143928-03"
+    "tns-core-modules": "6.2.0-next-2019-10-10-163621-04"
   },
   "devDependencies": {
     "babel-core": "6.26.3",
@@ -42,7 +42,7 @@
     "lazy": "1.0.11",
     "nativescript-dev-webpack": "1.2.1",
     "resolve-url-loader": "3.1.0",
-    "sass": "1.22.12",
+    "sass": "1.23.0",
     "sass-lint": "1.13.1",
     "sass-loader": "8.0.0",
     "speed-measure-webpack-plugin": "1.3.1",

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/theme",
-  "version": "2.0.20",
+  "version": "2.1.1",
   "description": "Telerik NativeScript Core Theme",
   "author": "Telerik <[email protected]>",
   "main": "index",
@@ -11,8 +11,8 @@
   },
   "nativescript": {
     "platforms": {
-      "android": "6.1.0",
-      "ios": "6.1.0"
+      "android": "6.1.2",
+      "ios": "6.1.1"
     }
   },
   "keywords": [

diff --git a/src/scss/core/_controls.scss b/src/scss/core/_controls.scss
@@ -107,4 +107,4 @@
     @include action-bar('.action-bar', '.action-item');
 }
 
-@import '../controls';
+@import '../index';
diff --git a/src/scss/core/primitives/_index.scss b/src/scss/core/primitives/_index.scss
@@ -4,8 +4,10 @@
 @import './headings';
 @import './bootstrap';
 
-.fa {
-  font-family: FontAwesome, fontawesome-webfont;
+@if $compat {
+    .fa {
+        font-family: FontAwesome, fontawesome-webfont;
+    }
 }
 
 .ns-root {
@@ -14,7 +16,6 @@
     );
 
     font-family: sans-serif;
-    font-weight: normal;
     font-size: const(font-size);
 }
 

diff --git a/src/scss/mixins/components/_list-view.scss b/src/scss/mixins/components/_list-view.scss
@@ -1,6 +1,5 @@
 @mixin list-view($selectors) {
     #{$selectors} {
-        min-height: 100;
         background-color: transparent;
 
         StackLayout {

diff --git a/src/scss/mixins/components/_side--drawer.scss b/src/scss/mixins/components/_side--drawer.scss
@@ -33,13 +33,12 @@
         }
 
         #{if($compat, '.sidedrawer-header', '.nt-drawer__header')} {
-            height: 148;
             width: 100%;
-            vertical-align: center;
+            vertical-align: top;
+            padding: 25 0;
 
             Label {
                 padding: 0;
-                vertical-align: center;
             }
 
             > Label {
@@ -50,8 +49,6 @@
                 height: 74;
                 width: 74;
                 border-radius: const(border-radius-lg);
-                vertical-align: center;
-                margin-bottom: 0;
             }
 
             &-footnote {
@@ -63,6 +60,7 @@
                 margin-left: 15;
                 margin-right: 15;
                 horizontal-align: center;
+                text-align: center;
             }
 
             @if not $compat {

diff --git a/src/scss/variables/_index.scss b/src/scss/variables/_index.scss
@@ -22,7 +22,7 @@ $btn-color-disabled: #a4a4a4 !default;
 $btn-font-size: $font-size + 2 !default;
 $btn-min-width: 64 !default;
 $btn-height: 52 !default;
-$btn-padding-x: 0 !default;
+$btn-padding-x: 5 !default;
 $btn-padding-y: 0 !default;
 $btn-margin-x: 16 !default;
 $btn-margin-y: 8 !default;