Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
acstll committed Dec 11, 2023
2 parents cbae532 + 9510a80 commit 149cbd0
Show file tree
Hide file tree
Showing 17 changed files with 97 additions and 12 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.0.0-beta.145](https://github.com/telekom/scale/compare/v3.0.0-beta.144...v3.0.0-beta.145) (2023-12-11)


### Bug Fixes

* **telekom-header:** prevent flicker that could make the footer unreachable ([#2230](https://github.com/telekom/scale/issues/2230)) ([03cdd4c](https://github.com/telekom/scale/commit/03cdd4ce049121edae9acda38235389464bfb785))





# [3.0.0-beta.144](https://github.com/telekom/scale/compare/v3.0.0-beta.143...v3.0.0-beta.144) (2023-11-30)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"--pure-lockfile"
],
"useWorkspaces": true,
"version": "3.0.0-beta.144",
"version": "3.0.0-beta.145",
"command": {
"version": {
"allowBranch": "main"
Expand Down
8 changes: 8 additions & 0 deletions packages/components-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.0.0-beta.145](https://github.com/telekom/scale/compare/v3.0.0-beta.144...v3.0.0-beta.145) (2023-12-11)

**Note:** Version bump only for package @telekom/scale-components-angular





# [3.0.0-beta.144](https://github.com/telekom/scale/compare/v3.0.0-beta.143...v3.0.0-beta.144) (2023-11-30)

**Note:** Version bump only for package @telekom/scale-components-angular
Expand Down
2 changes: 1 addition & 1 deletion packages/components-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@telekom/scale-components-angular",
"version": "3.0.0-beta.144",
"version": "3.0.0-beta.145",
"description": "Angular specific wrapper for @telekom/scale-components",
"license": "MPL-2.0",
"homepage": "https://github.com/telekom/scale",
Expand Down
8 changes: 8 additions & 0 deletions packages/components-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.0.0-beta.145](https://github.com/telekom/scale/compare/v3.0.0-beta.144...v3.0.0-beta.145) (2023-12-11)

**Note:** Version bump only for package @telekom/scale-components-react





# [3.0.0-beta.144](https://github.com/telekom/scale/compare/v3.0.0-beta.143...v3.0.0-beta.144) (2023-11-30)

**Note:** Version bump only for package @telekom/scale-components-react
Expand Down
2 changes: 1 addition & 1 deletion packages/components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@telekom/scale-components-react",
"sideEffects": false,
"version": "3.0.0-beta.144",
"version": "3.0.0-beta.145",
"description": "React proxy for @telekom/scale-components",
"license": "MPL-2.0",
"homepage": "https://github.com/telekom/scale",
Expand Down
8 changes: 8 additions & 0 deletions packages/components-vue/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.0.0-beta.145](https://github.com/telekom/scale/compare/v3.0.0-beta.144...v3.0.0-beta.145) (2023-12-11)

**Note:** Version bump only for package @telekom/scale-components-vue





# [3.0.0-beta.144](https://github.com/telekom/scale/compare/v3.0.0-beta.143...v3.0.0-beta.144) (2023-11-30)

**Note:** Version bump only for package @telekom/scale-components-vue
Expand Down
2 changes: 1 addition & 1 deletion packages/components-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@telekom/scale-components-vue",
"sideEffects": false,
"version": "3.0.0-beta.144",
"version": "3.0.0-beta.145",
"description": "Vue specific wrapper for @telekom/scale-components",
"license": "MPL-2.0",
"homepage": "https://github.com/telekom/scale",
Expand Down
11 changes: 11 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.0.0-beta.145](https://github.com/telekom/scale/compare/v3.0.0-beta.144...v3.0.0-beta.145) (2023-12-11)


### Bug Fixes

* **telekom-header:** prevent flicker that could make the footer unreachable ([#2230](https://github.com/telekom/scale/issues/2230)) ([03cdd4c](https://github.com/telekom/scale/commit/03cdd4ce049121edae9acda38235389464bfb785))





# [3.0.0-beta.144](https://github.com/telekom/scale/compare/v3.0.0-beta.143...v3.0.0-beta.144) (2023-11-30)


Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@telekom/scale-components",
"version": "3.0.0-beta.144",
"version": "3.0.0-beta.145",
"description": "Scale is the digital design system for Telekom products and experiences.",
"homepage": "https://github.com/telekom/scale",
"repository": {
Expand Down Expand Up @@ -73,7 +73,7 @@
"@floating-ui/dom": "^1.2.8",
"@stencil/core": "^2.17.0",
"@telekom/design-tokens": "1.0.0-beta.10",
"@telekom/scale-design-tokens": "^3.0.0-beta.144",
"@telekom/scale-design-tokens": "^3.0.0-beta.145",
"classnames": "^2.2.6",
"composed-offset-position": "^0.0.4",
"stencil-inline-svg": "^1.0.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
--font-weight-app-name: var(--telekom-typography-font-weight-extra-bold);

--_height: 60px;
--_base-height: 60px;
--_height-logo-svg: 36px;
--_height-bottom-bar: 60px;
--_height-top-bar: 0;
Expand Down Expand Up @@ -68,6 +69,8 @@
:host,
:host([scrolled-back]) {
--_height: 84px;
--_base-height: 84px;

--_height-logo-svg: 44px;
--_height-top-bar: 30px;
--_height-bottom-bar: 54px;
Expand Down Expand Up @@ -96,6 +99,7 @@
--telekom-spacing-composition-space-07
);
}

:host([type='slim'][scrolled]) {
--_spacing-right-bottom-app-name: var(
--telekom-spacing-composition-space-07
Expand All @@ -104,6 +108,7 @@
:host([type='slim']),
:host([scrolled]) {
--_height: 72px;

--_height-logo-svg: 40px;
--_height-top-bar: 0;
--_height-bottom-bar: 72px;
Expand All @@ -130,6 +135,8 @@
:host,
:host([scrolled-back]) {
--_height: 96px;
--_base-height: 96px;

--_height-logo-svg: 48px;
--_height-top-bar: 30px;
--_height-bottom-bar: 66px;
Expand All @@ -139,6 +146,8 @@

:host([type='slim']) {
--_height: 84px;
--_base-height: 84px;

--_height-logo-svg: 44px;
--_height-top-bar: 0;
--_height-bottom-bar: 84px;
Expand All @@ -163,6 +172,8 @@
:host,
:host([scrolled-back]) {
--_height: 120px;
--_base-height: 120px;

--_height-logo-svg: 60px;
--_height-top-bar: 30px;
--_height-bottom-bar: 90px;
Expand All @@ -181,6 +192,8 @@

:host([type='slim']) {
--_height: 96px;
--_base-height: 96px;

--_height-logo-svg: 48px;
--_height-top-bar: 0;
--_height-bottom-bar: 96px;
Expand All @@ -202,6 +215,7 @@

:host([type='slim'][scrolled]) {
--_height: 72px;

--_height-logo-svg: 40px;
--_height-top-bar: 0;
--_height-bottom-bar: 72px;
Expand Down Expand Up @@ -269,7 +283,8 @@ slot[name='functions'] {
}

[part~='base'] {
height: var(--_height);
/* height: var(--_height); */
height: var(--_base-height);
width: 100%;
transition: var(--transition-common-scrolled);
}
Expand Down
8 changes: 8 additions & 0 deletions packages/design-tokens/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.0.0-beta.145](https://github.com/telekom/scale/compare/v3.0.0-beta.144...v3.0.0-beta.145) (2023-12-11)

**Note:** Version bump only for package @telekom/scale-design-tokens





# [3.0.0-beta.144](https://github.com/telekom/scale/compare/v3.0.0-beta.143...v3.0.0-beta.144) (2023-11-30)

**Note:** Version bump only for package @telekom/scale-design-tokens
Expand Down
2 changes: 1 addition & 1 deletion packages/design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@telekom/scale-design-tokens",
"version": "3.0.0-beta.144",
"version": "3.0.0-beta.145",
"type": "module",
"description": "Design Tokens for the Scale Design System",
"homepage": "https://github.com/telekom/scale",
Expand Down
8 changes: 8 additions & 0 deletions packages/storybook-vue/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.0.0-beta.145](https://github.com/telekom/scale/compare/v3.0.0-beta.144...v3.0.0-beta.145) (2023-12-11)

**Note:** Version bump only for package @telekom/scale-storybook-vue





# [3.0.0-beta.144](https://github.com/telekom/scale/compare/v3.0.0-beta.143...v3.0.0-beta.144) (2023-11-30)


Expand Down
6 changes: 3 additions & 3 deletions packages/storybook-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"homepage": "https://telekom.github.io/scale",
"name": "@telekom/scale-storybook-vue",
"private": true,
"version": "3.0.0-beta.144",
"version": "3.0.0-beta.145",
"main": "index.js",
"license": "MPL-2.0",
"devDependencies": {
Expand Down Expand Up @@ -32,8 +32,8 @@
"dependencies": {
"@storybook/addon-viewport": "^6.4.22",
"@telekom/design-tokens": "^1.0.0-beta.2",
"@telekom/scale-components": "^3.0.0-beta.144",
"@telekom/scale-components-vue": "^3.0.0-beta.144"
"@telekom/scale-components": "^3.0.0-beta.145",
"@telekom/scale-components-vue": "^3.0.0-beta.145"
},
"scripts": {
"prestart": "rm -rf node_modules/.cache/ && yes | cp -a ../components/dist/scale-components/fonts/* public/fonts/ && yes | cp -a ../components/dist/scale-components/scale-components.css public/",
Expand Down
8 changes: 8 additions & 0 deletions packages/visual-tests/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.0.0-beta.145](https://github.com/telekom/scale/compare/v3.0.0-beta.144...v3.0.0-beta.145) (2023-12-11)

**Note:** Version bump only for package @telekom/scale-visual-tests





# [3.0.0-beta.144](https://github.com/telekom/scale/compare/v3.0.0-beta.143...v3.0.0-beta.144) (2023-11-30)

**Note:** Version bump only for package @telekom/scale-visual-tests
Expand Down
2 changes: 1 addition & 1 deletion packages/visual-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@telekom/scale-visual-tests",
"private": true,
"version": "3.0.0-beta.144",
"version": "3.0.0-beta.145",
"main": "index.js",
"license": "MPL-2.0",
"scripts": {
Expand Down

0 comments on commit 149cbd0

Please sign in to comment.