MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Transition fix, decoration added and dataform button font removed
This commit is contained in:
Joe 2020-06-04 12:40:33 +01:00 committed by GitHub
parent aaf1c0c1aa 0638c5b9b8
commit 87c7d698bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/builder/src/components/userInterface/propertyCategories.js
View File

@ -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 = [ export const background = [
@ -398,7 +410,7 @@ export const transitions = [
}, },
{ {
label: "Duration", label: "Duration",
key: "transition-timing-function", key: "transition-duration",
control: Input, control: Input,
width: "48px", width: "48px",
textAlign: "center", textAlign: "center",
@ -406,7 +418,7 @@ export const transitions = [
}, },
{ {
label: "Ease", label: "Ease",
key: "transition-ease", key: "transition-timing-function:",
control: OptionSelect, control: OptionSelect,
options: ["linear", "ease", "ease-in", "ease-out", "ease-in-out"], options: ["linear", "ease", "ease-in", "ease-out", "ease-in-out"],
}, },

2
packages/standard-components/src/DataForm.svelte
View File

@ -125,7 +125,7 @@
} }
button { button {
font-family: Inter; font-family: roboto;
font-size: 16px; font-size: 16px;
padding: 0.4em; padding: 0.4em;
box-sizing: border-box; box-sizing: border-box;