Merge pull request #93 from mendix/develop

hotfix(FAB): add borderRadius
mendix · Oct 2, 2020 · 1c38bf4 · 1c38bf4
2 parents d0affd1 + e30a4bd
commit 1c38bf4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "atlas-ui-framework",
-    "version": "2.6.2",
+    "version": "2.6.3",
     "description": "Mendix Atlas UI is the foundation of making beautiful apps with Mendix. For more information about the framework go to https://atlas.mendix.com.",
     "main": "",
     "scripts": {

diff --git a/styles/native/js/core/manifest.json b/styles/native/js/core/manifest.json
@@ -1,4 +1,4 @@
 {
     "name": "Atlas-UI-Framework",
-    "version": "2.6.2"
+    "version": "2.6.3"
 }
diff --git a/styles/native/js/core/widgets/floatingactionbutton.js b/styles/native/js/core/widgets/floatingactionbutton.js
@@ -19,8 +19,11 @@ export const com_mendix_widget_native_floatingactionbutton_FloatingActionButton
     button: {
         // Size, ripplecolor and all ViewStyle properties are allowed
         size: 50,
+        height: 50,
+        width: 50,
         rippleColor: contrast.lowest,
         backgroundColor: brand.primary,
+        borderRadius: 25,
         elevation: 2,
         shadowColor: "#000",
         shadowOpacity: 0.3,
@@ -54,7 +57,10 @@ export const com_mendix_widget_native_floatingactionbutton_FloatingActionButton
         color: contrast.high,
     },
     secondaryButtonCaption: {
-    // All TextStyle properties are allowed
+        // All TextStyle properties are allowed
+        color: font.color,
+        fontSize: font.size,
+        fontFamily: font.family,
     },
     secondaryButtonCaptionContainer: {
         // All ViewStyle properties are allowed

diff --git a/styles/native/ts/core/manifest.json b/styles/native/ts/core/manifest.json
@@ -1,4 +1,4 @@
 {
     "name": "Atlas-UI-Framework",
-    "version": "2.6.2"
+    "version": "2.6.3"
 }
diff --git a/styles/native/ts/core/widgets/floatingactionbutton.ts b/styles/native/ts/core/widgets/floatingactionbutton.ts
@@ -1,5 +1,5 @@
+import { FloatingActionButtonType } from "../../types/widgets";
 import { background, brand, contrast, font } from "../variables";
-import { FloatingActionButtonType }          from "../../types/widgets";
 /*
 
 DISCLAIMER:
@@ -20,8 +20,11 @@ export const com_mendix_widget_native_floatingactionbutton_FloatingActionButton:
     button: {
         // Size, ripplecolor and all ViewStyle properties are allowed
         size: 50,
+        height: 50,
+        width: 50,
         rippleColor: contrast.lowest,
         backgroundColor: brand.primary,
+        borderRadius: 25,
         elevation: 2,
         shadowColor: "#000",
         shadowOpacity: 0.3,
@@ -56,6 +59,9 @@ export const com_mendix_widget_native_floatingactionbutton_FloatingActionButton:
     },
     secondaryButtonCaption: {
         // All TextStyle properties are allowed
+        color: font.color,
+        fontSize: font.size,
+        fontFamily: font.family,
     },
     secondaryButtonCaptionContainer: {
         // All ViewStyle properties are allowed

diff --git a/styles/web/sass/core/manifest.json b/styles/web/sass/core/manifest.json
@@ -1,4 +1,4 @@
 {
     "name": "Atlas-UI-Framework",
-    "version": "2.6.2"
+    "version": "2.6.3"
 }