Skip to content

Commit 6a5f60f

Browse files
authored
Merge pull request #1112 from mfranzke/feature-uikit-ratio-width-height
feature: UIKit - logo: replaced ratio property #1111
2 parents b9ba7a1 + b0cb3fc commit 6a5f60f

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

packages/uikit-workshop/src/scripts/lit-components/pl-header/pl-header.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable no-unused-vars, no-param-reassign */
22
import { store } from '../../store.js'; // connect to redux
3+
import { ifDefined } from 'lit-html/directives/if-defined';
34
import { html } from 'lit-html';
45
import { BaseLitComponent } from '../../components/base-component';
56
import { customElement } from 'lit-element';
@@ -116,7 +117,8 @@ class Header extends BaseLitComponent {
116117
: window.config?.theme?.logo?.url || '/'}"
117118
alt-text="${window.config?.theme?.logo?.altText || ''}"
118119
theme="${this.themeMode}"
119-
ratio="${window.config?.theme?.logo?.ratio || ''}"
120+
width="${ifDefined(window.config?.theme?.logo?.width)}"
121+
height="${ifDefined(window.config?.theme?.logo?.height)}"
120122
text="${window.config?.theme?.logo?.text === '' ||
121123
window.config?.theme?.logo?.text === false ||
122124
window.config?.theme?.logo?.text === 'none'

packages/uikit-workshop/src/scripts/lit-components/pl-logo/pl-logo.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { store } from '../../store.js'; // connect to redux
2+
import { ifDefined } from 'lit-html/directives/if-defined';
23
import { html } from 'lit-html';
34
import { customElement } from 'lit-element';
45
import { BaseLitComponent } from '../../components/base-component';
@@ -20,7 +21,8 @@ class Logo extends BaseLitComponent {
2021

2122
static get properties() {
2223
return {
23-
ratio: String,
24+
width: String,
25+
height: String,
2426
theme: String,
2527
url: String,
2628
text: String,
@@ -48,6 +50,8 @@ class Logo extends BaseLitComponent {
4850
alt=${this.altText || 'Pattern Lab Logo'}
4951
src=${imageSrc}
5052
class="pl-c-logo__img"
53+
width="${ifDefined(this.width)}"
54+
height="${ifDefined(this.height)}"
5155
/>
5256
${this.text && this.text !== ''
5357
? html`

0 commit comments

Comments
 (0)