Skip to content

Commit

Permalink
Merge pull request #180 from mmz-srf/noref-add-thomy
Browse files Browse the repository at this point in the history
Thomy! Thomy! Thomy!
  • Loading branch information
pchr-srf authored Dec 4, 2024
2 parents 816bb8c + 3dfe3e3 commit 0ac2b4f
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "srf-feathers",
"version": "1.7.6",
"version": "1.7.7",
"main": "build/index.js",
"module": "build/index.esm.js",
"files": [
Expand Down
32 changes: 22 additions & 10 deletions src/elements/AppSwitcher/AppSwitcher.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,27 @@ export const AppSwitcherWithCustomAppSwitcherButtonChild =
AppSwitcherWithCustomAppSwitcherButtonChild.args = {
currentBirdId: 'tweety',
children: (
<a href="https://www.srf.ch/">
<AppSwitcherButton
bird={{
id: 'schorsch',
path: '',
label: 'Schorsch',
hint: 'Ich bin custom!',
}}
/>
</a>
<>
<a href="https://www.srf.ch/">
<AppSwitcherButton
bird={{
id: 'schorsch',
path: '',
label: 'Schorsch',
hint: 'Ich bin custom!',
}}
/>
</a>
<a href="https://www.srf.ch/">
<AppSwitcherButton
bird={{
id: 'thomy',
path: '',
label: 'Thomy die Taube',
hint: 'Ich bin auch custom!',
}}
/>
</a>
</>
),
};
1 change: 1 addition & 0 deletions src/elements/AppSwitcher/AppSwitcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const BirdsModifiers = [
'karl',
'pitt',
'tweety',
'thomy',
] as const;

export type BirdsModifiersType = (typeof BirdsModifiers)[number];
Expand Down
3 changes: 2 additions & 1 deletion src/elements/Logo/Logo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

// some images are not cut perfectly:
.f-logo__image--globi,
.f-logo__image--woody {
.f-logo__image--woody,
.f-logo__image--thomy {
padding: 6px;
}

Expand Down
3 changes: 3 additions & 0 deletions src/elements/Logo/Logo.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,6 @@ Woody.args = { bird: 'woody' };

export const Edith = ModifierTemplate.bind({});
Edith.args = { bird: 'edith' };

export const Thomy = ModifierTemplate.bind({});
Thomy.args = { bird: 'thomy' };
5 changes: 5 additions & 0 deletions src/elements/Logo/Logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ import roebiImage from './images/Roebi.png';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
import waltraudImage from './images/Waltraud.png';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
import thomyImage from './images/Thomy.png';

import './Logo.scss';

Expand All @@ -49,6 +52,7 @@ const images = {
woody: woodyImage,
edith: edithImage,
waltraud: waltraudImage,
thomy: thomyImage,
};

export const LogoBirds = [
Expand All @@ -63,6 +67,7 @@ export const LogoBirds = [
'woody',
'edith',
'waltraud',
'thomy',
] as const;

export type LogoBirdsType = (typeof LogoBirds)[number];
Expand Down
Binary file added src/elements/Logo/images/Thomy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0ac2b4f

Please sign in to comment.