From 0638c5b9b83d5ceb5c0e8faac21728092b662665 Mon Sep 17 00:00:00 2001
From: Joe <49767913+joebudi@users.noreply.github.com>
Date: Thu, 4 Jun 2020 12:22:01 +0100
Subject: [PATCH] Transition fix, decoration added and dataform button font
 removed

---
 .../userInterface/propertyCategories.js        | 18 +++++++++++++++---
 .../standard-components/src/DataForm.svelte    |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/userInterface/propertyCategories.js b/packages/builder/src/components/userInterface/propertyCategories.js
index 59458edd49..73764404dd 100644
--- a/packages/builder/src/components/userInterface/propertyCategories.js
+++ b/packages/builder/src/components/userInterface/propertyCategories.js
@@ -292,7 +292,19 @@ export const typography = [
       },
     ],
   },
-  { label: "style", key: "font-style", control: Input },
+  {
+    label: "Decoration",
+    key: "text-decoration-line",
+    control: OptionSelect,
+    defaultValue: "Underline",
+    options: [
+      { label: "Underline", value: "underline" },
+      { label: "None", value: "none" },
+      { label: "Overline", value: "overline" },
+      { label: "Line-through", value: "line-through" },
+      { label: "Under Over", value: "underline overline" },
+    ],
+  },
 ]
 
 export const background = [
@@ -398,7 +410,7 @@ export const transitions = [
   },
   {
     label: "Duration",
-    key: "transition-timing-function",
+    key: "transition-duration",
     control: Input,
     width: "48px",
     textAlign: "center",
@@ -406,7 +418,7 @@ export const transitions = [
   },
   {
     label: "Ease",
-    key: "transition-ease",
+    key: "transition-timing-function:",
     control: OptionSelect,
     options: ["linear", "ease", "ease-in", "ease-out", "ease-in-out"],
   },
diff --git a/packages/standard-components/src/DataForm.svelte b/packages/standard-components/src/DataForm.svelte
index 0d1716b2bc..5836e250e9 100644
--- a/packages/standard-components/src/DataForm.svelte
+++ b/packages/standard-components/src/DataForm.svelte
@@ -125,7 +125,7 @@
   }
 
   button {
-    font-family: Inter;
+    font-family: roboto;
     font-size: 16px;
     padding: 0.4em;
     box-sizing: border-box;