Merge remote-tracking branch 'origin/v1/contrib' into feature/popover…

…-container-firefox-polyfill
umbraco · Nov 2, 2023 · 4f98b71 · 4f98b71
2 parents 3115e85 + c571131
commit 4f98b71
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -26,5 +26,5 @@
 <!--- Go over all the following points, and put an `x` in all the boxes that apply.  If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 
 - [ ] 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.
diff --git 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
@@ -0,0 +1,5 @@
+@import '../typography/lato.css';
+
+:root {
+  --uui-font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
diff --git 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
@@ -28,10 +28,11 @@ const meta: Meta<UUIInputElement> = {
         'url',
         'email',
         'password',
-        'date',
+        'search',
         'month',
         'week',
         'time',
+        'date',
         'datetime-local',
         'number',
         'color',