Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/10.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
elf-mouse committed Jun 15, 2023
2 parents 81b4472 + a9e942d commit cc25045
Show file tree
Hide file tree
Showing 302 changed files with 10,358 additions and 15,541 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

- [`balm-ui@8`](https://github.com/balmjs/balm-ui/tree/8.x) for Vue 2

## v10.22.0 / 2023-06-15

### Bug Fixes

- `<ui-editor>`: fix `readonly` bug

### Reverts

- revert deps `[email protected]` for SSR

## v10.21.3 / 2023-06-14

### Chore

- `<ui-tree>`: optimize tree node data for children

## v10.21.2 / 2023-06-06

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -312,5 +312,5 @@ We officially support the last two versions of every major browser. Specifically

[balm-ui-image]: https://img.shields.io/npm/v/balm-ui
[balm-ui-url]: https://www.npmjs.com/package/balm-ui
[mdc-web-image]: https://img.shields.io/badge/mdc--web-15.0.0-blue.svg
[mdc-web-image]: https://img.shields.io/badge/mdc--web-14.0.0-blue.svg
[mdc-web-url]: https://www.npmjs.com/package/material-components-web
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = function (api) {
? {
modules: false,
useBuiltIns: 'entry',
corejs: { version: '3.30', proposals: true }
corejs: { version: '3.31', proposals: true }
}
: {
modules: false
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "balm-ui",
"version": "10.21.2",
"version": "10.22.0",
"description": "A modular and customizable UI library based on Material Design and Vue 3",
"keywords": [
"balm",
Expand Down Expand Up @@ -58,7 +58,7 @@
"dependencies": {
"deepmerge": "^4.3.1",
"flatpickr": "^4.6.13",
"material-components-web": "15.0.0-canary.446734f27.0",
"material-components-web": "14",
"quill": "^1.3.7"
},
"devDependencies": {
Expand All @@ -80,9 +80,9 @@
"axios": "^1.4.0",
"babel-jest": "^29.0.0",
"babel-plugin-prismjs": "^2.1.0",
"balm": "^4.20.0",
"balm": "^4.21.0",
"clipboard": "^2.0.11",
"core-js": "^3.30.0",
"core-js": "^3.31.0",
"cross-env": "^7.0.3",
"eslint": "^8.0.0",
"eslint-config-prettier": "^8.0.0",
Expand All @@ -106,7 +106,7 @@
"vue-loader": "^17.0.0",
"vue-meta": "^3.0.0-alpha.10",
"vue-router": "^4.0.0",
"webpack": "^5.85.0"
"webpack": "^5.86.0"
},
"peerDependencies": {
"vue": ">=3"
Expand Down
3 changes: 1 addition & 2 deletions src/material-components-web/animation/util.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 3 additions & 13 deletions src/material-components-web/banner/_banner-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ $secondary-action-text-color: primary;

$mobile-breakpoint: 480px;
$z-index: 1;
$custom-property-prefix: 'banner';

$light-theme: (
action-focus-state-layer-color: theme-color.$primary,
Expand Down Expand Up @@ -83,13 +82,9 @@ $light-theme: (
);

@mixin theme($theme, $resolvers: resolvers.$material) {
// TODO(b/251881053): Replace with `validate-theme`.
@include theme.validate-theme-styles($light-theme, $theme);
@include theme.validate-theme-keys($light-theme, $theme);
$theme: _resolve-theme($theme, $resolvers);
@include keys.declare-custom-properties(
$theme,
$prefix: $custom-property-prefix
);
@include keys.declare-custom-properties($theme, banner);
}

@function _resolve-theme($theme, $resolvers) {
Expand Down Expand Up @@ -128,12 +123,7 @@ $light-theme: (
$resolver: resolvers.$material,
$query: feature-targeting.all()
) {
@include theme.validate-theme-styles($light-theme, $theme);
$theme: keys.create-theme-properties(
$theme,
$prefix: $custom-property-prefix
);

@include theme.validate-theme-keys($light-theme, $theme);
@include text-color(map.get($theme, supporting-text-color), $query: $query);
@include _supporting-text-typography(
(
Expand Down
2 changes: 1 addition & 1 deletion src/material-components-web/banner/component.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/material-components-web/banner/foundation.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 18 additions & 55 deletions src/material-components-web/base/component.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 11 additions & 17 deletions src/material-components-web/base/foundation.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions src/material-components-web/base/observer-foundation.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions src/material-components-web/base/observer.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cc25045

Please sign in to comment.