Skip to content

Commit 1d21a8d

Browse files
authored
Merge branch 'main' into feature/drag-handle
2 parents cfba737 + e7e9413 commit 1d21a8d

File tree

275 files changed

+2584
-2576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+2584
-2576
lines changed

.storybook/main.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ const config: StorybookConfig = {
2222
},
2323
},
2424
'@storybook/addon-links',
25-
'@storybook/addon-essentials',
26-
'@chromatic-com/storybook',
2725
'@storybook/addon-a11y',
26+
'@chromatic-com/storybook',
2827
'../storyhelpers/storybook-readme',
2928
],
3029

.storybook/manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addons } from '@storybook/manager-api';
1+
import { addons } from 'storybook/manager-api';
22
import umbracoTheme from './umbraco-theme';
33

44
addons.setConfig({

.storybook/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
setCustomElementsManifest,
33
type Preview,
4-
} from '@storybook/web-components';
4+
} from '@storybook/web-components-vite';
55
import '../packages/uui-css/dist/uui-css.css';
66
import customElements from '../custom-elements.json';
77
import { html } from 'lit';

.storybook/umbraco-theme.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.14.0](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.4...v1.14.0) (2025-06-11)
7+
8+
### Bug Fixes
9+
10+
- line-height set to 1 on uui-button ([#1114](https://github.com/umbraco/Umbraco.UI/issues/1114)) ([9c528f0](https://github.com/umbraco/Umbraco.UI/commit/9c528f004686924ad9874c3b4f429c9c1a3126c4))
11+
12+
# [1.14.0-rc.4](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.3...v1.14.0-rc.4) (2025-05-30)
13+
14+
### Bug Fixes
15+
16+
- installs postcss-import and postcss-url to ensure asset paths are correct ([04e5033](https://github.com/umbraco/Umbraco.UI/commit/04e503310b3a95043bd7df22395e4bdbc70b106c))
17+
618
# [1.14.0-rc.3](https://github.com/umbraco/Umbraco.UI/compare/v1.14.0-rc.2...v1.14.0-rc.3) (2025-05-28)
719

820
### Bug Fixes

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
33
"packages": ["packages/*"],
4-
"version": "1.14.0-rc.3",
4+
"version": "1.14.0",
55
"preid": "rc",
66
"exact": true,
77
"noPush": true,

0 commit comments

Comments
 (0)