Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
felixw committed Sep 22, 2023
2 parents 0cb7e4e + 8001a87 commit 1f3a7f9
Show file tree
Hide file tree
Showing 723 changed files with 857 additions and 940 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
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.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)


### Bug Fixes

* add font-display strategy for performance ([#2135](https://github.com/telekom/scale/issues/2135)) ([ae354cf](https://github.com/telekom/scale/commit/ae354cf0600f9e9329fb9e79fb7969d59b25d185))
* allow setting href on footer logo ([#2132](https://github.com/telekom/scale/issues/2132)) ([502f9ae](https://github.com/telekom/scale/commit/502f9ae7eb69ef7e1a049d34fb9d95da2f739f24))
* nav-item positioning ([#2141](https://github.com/telekom/scale/issues/2141)) ([0640ebc](https://github.com/telekom/scale/commit/0640ebcfdab8597ca846838678b57d39a2221bb4))
* remove default language from logo to avoid deprecation warning ([#2139](https://github.com/telekom/scale/issues/2139)) ([c1589e8](https://github.com/telekom/scale/commit/c1589e8d080ce3c2b0f74c39ea5ba1fb9ec79e1f))
* set scrolled attribute only when offset is larger than the header ([#2133](https://github.com/telekom/scale/issues/2133)) ([df45405](https://github.com/telekom/scale/commit/df454054bea2d2fb3da259d786cf112b9718433c))
* **radio-button:** polish click handling and hover/active states ([#2131](https://github.com/telekom/scale/issues/2131)) ([9ea4c6a](https://github.com/telekom/scale/commit/9ea4c6a96d4e0a0b5f8824fc144049baf548988d))





# [3.0.0-beta.140](https://github.com/telekom/scale/compare/v3.0.0-beta.139...v3.0.0-beta.140) (2023-09-13)


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.140",
"version": "3.0.0-beta.141",
"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.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)

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





# [3.0.0-beta.140](https://github.com/telekom/scale/compare/v3.0.0-beta.139...v3.0.0-beta.140) (2023-09-13)

**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.140",
"version": "3.0.0-beta.141",
"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.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)

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





# [3.0.0-beta.140](https://github.com/telekom/scale/compare/v3.0.0-beta.139...v3.0.0-beta.140) (2023-09-13)

**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.140",
"version": "3.0.0-beta.141",
"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.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)

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





# [3.0.0-beta.140](https://github.com/telekom/scale/compare/v3.0.0-beta.139...v3.0.0-beta.140) (2023-09-13)

**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.140",
"version": "3.0.0-beta.141",
"description": "Vue specific wrapper for @telekom/scale-components",
"license": "MPL-2.0",
"homepage": "https://github.com/telekom/scale",
Expand Down
16 changes: 16 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
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.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)


### Bug Fixes

* add font-display strategy for performance ([#2135](https://github.com/telekom/scale/issues/2135)) ([ae354cf](https://github.com/telekom/scale/commit/ae354cf0600f9e9329fb9e79fb7969d59b25d185))
* allow setting href on footer logo ([#2132](https://github.com/telekom/scale/issues/2132)) ([502f9ae](https://github.com/telekom/scale/commit/502f9ae7eb69ef7e1a049d34fb9d95da2f739f24))
* nav-item positioning ([#2141](https://github.com/telekom/scale/issues/2141)) ([0640ebc](https://github.com/telekom/scale/commit/0640ebcfdab8597ca846838678b57d39a2221bb4))
* remove default language from logo to avoid deprecation warning ([#2139](https://github.com/telekom/scale/issues/2139)) ([c1589e8](https://github.com/telekom/scale/commit/c1589e8d080ce3c2b0f74c39ea5ba1fb9ec79e1f))
* set scrolled attribute only when offset is larger than the header ([#2133](https://github.com/telekom/scale/issues/2133)) ([df45405](https://github.com/telekom/scale/commit/df454054bea2d2fb3da259d786cf112b9718433c))
* **radio-button:** polish click handling and hover/active states ([#2131](https://github.com/telekom/scale/issues/2131)) ([9ea4c6a](https://github.com/telekom/scale/commit/9ea4c6a96d4e0a0b5f8824fc144049baf548988d))





# [3.0.0-beta.140](https://github.com/telekom/scale/compare/v3.0.0-beta.139...v3.0.0-beta.140) (2023-09-13)


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.140",
"version": "3.0.0-beta.141",
"description": "Scale is the digital design system for Telekom products and experiences.",
"homepage": "https://github.com/telekom/scale",
"repository": {
Expand Down Expand Up @@ -72,7 +72,7 @@
"@floating-ui/dom": "^0.5.4",
"@stencil/core": "^2.17.0",
"@telekom/design-tokens": "1.0.0-beta.8",
"@telekom/scale-design-tokens": "^3.0.0-beta.140",
"@telekom/scale-design-tokens": "^3.0.0-beta.141",
"classnames": "^2.2.6",
"stencil-inline-svg": "^1.0.1"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/scripts/generate-icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const { parse } = require('svg-parser');
// const toHTML = require('hast-util-to-html');

const svgo = new SVGO({
plugins: [{ removeViewBox: false }, { removeXMLNS: true }],
plugins: [{ removeViewBox: false }, { removeXMLNS: true }, {cleanupIDs: false}],
});

const INPUT_GLOB = process.env.WHITELABEL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ scale-radio-button {
display: flex;
flex-wrap: wrap;
align-items: center;
cursor: pointer;
width: fit-content;
}

Expand Down Expand Up @@ -128,15 +127,15 @@ scale-icon-alert-error {
cursor: pointer;
}

.radio-button:hover input:not(:checked):not([disabled]) {
.radio-button input:not(:checked):not([disabled]):hover {
box-shadow: none;
border-color: var(--telekom-color-ui-border-hovered);
background-color: var(--telekom-color-ui-state-fill-hovered);
}
.radio-button:hover input:not(:checked):not([disabled]) ~ label {
.radio-button input:not(:checked):not([disabled]):hover ~ label {
color: var(--color-primary-hover);
}
.radio-button:active input:not(:checked):not([disabled]) {
.radio-button input:not(:checked):not([disabled]):active {
border-color: var(--telekom-color-ui-border-pressed);
background-color: var(--telekom-color-ui-state-fill-pressed);
}
Expand Down
15 changes: 2 additions & 13 deletions packages/components/src/components/radio-button/radio-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,6 @@ export class RadioButton {
}
};

// Prevent click event being fired twice when the target is the label.
handleClick = (event: any) => {
event.stopPropagation();
if (!this.disabled) {
this.checked = true;
this.uncheckSiblings();
}
};

// We manually set `checked` to false on sibling <scale-radio-button> elements,
// otherwise they stayed `checked` after being clicked once, forever.
uncheckSiblings() {
Expand Down Expand Up @@ -137,7 +128,7 @@ export class RadioButton {

return (
<Host>
<div class={this.getCssClassMap()} onClick={this.handleClick}>
<div class={this.getCssClassMap()}>
<input
type="radio"
name={this.name}
Expand All @@ -149,9 +140,7 @@ export class RadioButton {
{...ariaInvalidAttr}
{...(this.helperText ? ariaDescribedByAttr : {})}
/>
<label htmlFor={this.inputId} onClick={this.handleClick}>
{this.label}
</label>
<label htmlFor={this.inputId}>{this.label}</label>
{!!this.helperText && (
<div
class="radio-button__meta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,6 @@ export class Header {
) : (
<scale-logo
transparent
language={this.claimLang}
href={this.logoHref}
logoTitle={this.logoTitle}
logoHideTitle={this.logoHideTitle}
Expand Down
6 changes: 3 additions & 3 deletions packages/components/src/components/telekom/logo/logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export class Logo {
/** (optional) Set transparent background */
@Prop() transparent: boolean = false;
/** @deprecated; (optional) Language of the logo text/ claimOff showes just the T Logo */
@Prop() language:
@Prop() language?:
| 'de'
| 'en'
| 'cz'
Expand All @@ -36,7 +36,7 @@ export class Logo {
| 'mk_kyr'
| 'ro'
| 'sk'
| string = 'en';
| string;
/** (optional) The height in pixels */
@Prop() size?: number = 38;
/** (optional) Set a link */
Expand Down Expand Up @@ -93,7 +93,7 @@ export class Logo {
window.scrollTo({ top: 0 });
}
}}
title={this.logoHideTitle ? '' : this.logoTitle}
title={this.logoHideTitle ? undefined : this.logoTitle}
aria-describedby={this.logoAriaDescribedBy}
aria-hidden={this.logoAriaHidden}
tabindex={this.logoAriaHidden ? -1 : 0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
<!-- Auto Generated Below -->


## Properties

| Property | Attribute | Description | Type | Default |
| --------------- | ----------------- | ---------------------------------- | --------- | ----------------------- |
| `logoHideTitle` | `logo-hide-title` | (optional) set logo specific title | `boolean` | `false` |
| `logoHref` | `logo-href` | (optional) Logo link | `string` | `'javascript:void(0);'` |
| `logoTitle` | `logo-title` | (optional) set logo specific title | `string` | `'Telekom Logo'` |


## Shadow Parts

| Part | Description |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,21 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/

import { Component, h, Host } from '@stencil/core';
import { Component, h, Host, Prop } from '@stencil/core';

@Component({
tag: 'scale-telekom-footer-content',
styleUrl: 'telekom-footer-content.css',
shadow: true,
})
export class TelekomFooterContent {
/** (optional) Logo link */
@Prop() logoHref?: string = 'javascript:void(0);';
/** (optional) set logo specific title */
@Prop() logoTitle?: string = 'Telekom Logo';
/** (optional) set logo specific title */
@Prop() logoHideTitle?: boolean = false;

render() {
return (
<Host>
Expand All @@ -32,6 +39,9 @@ export class TelekomFooterContent {
'var(--telekom-line-weight-highlight) solid var(--telekom-color-functional-focus-on-dark-background)',
}}
transparent
href={this.logoHref}
logoHideTitle={this.logoHideTitle}
logoTitle={this.logoHideTitle ? undefined : this.logoTitle}
></scale-logo>
</div>
<div part="body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ export class TelekomHeader {

@Listen('scroll', { target: 'document' })
onScroll() {
this.scrolled = window.pageYOffset > 2;
// 48px is the height of the header, set scrolled when the user scrolls past it
// todo: calculate this value dynamically (for slim header, smaller viewports, etc)
this.scrolled = window.pageYOffset > 48;
this.scrolledBack =
this.pageYOffset !== window.pageYOffset && window.pageYOffset <= 0;
this.pageYOffset = pageYOffset;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
}

::slotted(a) {
position: absolute;
position: relative;
display: flex;
align-items: center;
height: var(--height);
Expand Down
Loading

0 comments on commit 1f3a7f9

Please sign in to comment.