From 875e75239ca4286d79645361d1aeb948cd572e15 Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:55:32 +0200 Subject: [PATCH 1/4] export font family in variable (#627) --- packages/uui-css/lib/custom-properties.css | 1 + packages/uui-css/lib/custom-properties/fonts.css | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 packages/uui-css/lib/custom-properties/fonts.css diff --git a/packages/uui-css/lib/custom-properties.css b/packages/uui-css/lib/custom-properties.css index 2b2e34518..530079fc4 100644 --- a/packages/uui-css/lib/custom-properties.css +++ b/packages/uui-css/lib/custom-properties.css @@ -6,3 +6,4 @@ UUI - Mapping-level or specific component name - State - Name - Part - Overwrite @import './custom-properties/shadow.css'; @import './custom-properties/palette.css'; @import './custom-properties/colors.css'; +@import './custom-properties/fonts.css'; diff --git a/packages/uui-css/lib/custom-properties/fonts.css b/packages/uui-css/lib/custom-properties/fonts.css new file mode 100644 index 000000000..e5d428d48 --- /dev/null +++ b/packages/uui-css/lib/custom-properties/fonts.css @@ -0,0 +1,5 @@ +@import '../typography/lato.css'; + +:root { + --uui-font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif; +} From 6c4cec764fea718fb93707ea38e92bc3bb9363dc Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Sat, 28 Oct 2023 15:59:39 +0200 Subject: [PATCH 2/4] Added missing bracket to uui-radio story --- packages/uui-radio/lib/uui-radio.story.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/uui-radio/lib/uui-radio.story.ts b/packages/uui-radio/lib/uui-radio.story.ts index 76bc2cbec..fc6425518 100644 --- a/packages/uui-radio/lib/uui-radio.story.ts +++ b/packages/uui-radio/lib/uui-radio.story.ts @@ -161,7 +161,7 @@ RadioGroup.parameters = { label="Other (Please state)" > - `, }, }, From 957daae696e08a816e4586a196c812c44d7b1aa1 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Sat, 28 Oct 2023 16:12:56 +0200 Subject: [PATCH 3/4] Updated contributing link in pull request template --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 7e6ddf7e8..dd0c492cf 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -26,5 +26,5 @@ - [ ] If my change requires a change to the documentation, I have updated the documentation in this pull request. -- [ ] I have read the **[CONTRIBUTING](<(https://github.com/umbraco/Umbraco.UI/blob/dev/docs/CONTRIBUTING.md)>)** document. +- [ ] I have read the **[CONTRIBUTING](<(https://github.com/umbraco/Umbraco.UI/blob/v1/contrib/docs/CONTRIBUTING.md)>)** document. - [ ] I have added tests to cover my changes. From 39ecf000051dc7c17d25a0b6402b0cb3b6e5d8fb Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Mon, 30 Oct 2023 10:32:53 +0100 Subject: [PATCH 4/4] Accept input type search as well --- packages/uui-input/lib/uui-input.element.ts | 3 ++- packages/uui-input/lib/uui-input.story.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/uui-input/lib/uui-input.element.ts b/packages/uui-input/lib/uui-input.element.ts index f80871404..645abbfe0 100644 --- a/packages/uui-input/lib/uui-input.element.ts +++ b/packages/uui-input/lib/uui-input.element.ts @@ -12,10 +12,11 @@ export type InputType = | 'url' | 'email' | 'password' - | 'date' + | 'search' | 'month' | 'week' | 'time' + | 'date' | 'datetime-local' | 'number' | 'color'; diff --git a/packages/uui-input/lib/uui-input.story.ts b/packages/uui-input/lib/uui-input.story.ts index 149febbfe..93b0ce857 100644 --- a/packages/uui-input/lib/uui-input.story.ts +++ b/packages/uui-input/lib/uui-input.story.ts @@ -28,10 +28,11 @@ const meta: Meta = { 'url', 'email', 'password', - 'date', + 'search', 'month', 'week', 'time', + 'date', 'datetime-local', 'number', 'color',