Browse Source

Merge pull request #325 from Budibase/transition,-dataform,-decoration-fix

Transition fix, decoration added and dataform button font removed
pull/327/head
Joe 6 years ago
committed by GitHub
parent
commit
87c7d698bc
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      packages/builder/src/components/userInterface/propertyCategories.js
  2. 2
      packages/standard-components/src/DataForm.svelte

18
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"],
},

2
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;

Loading…
Cancel
Save