Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pladaria/WEB-2079_v…
Browse files Browse the repository at this point in the history
…elocho
  • Loading branch information
Pedro Ladaria committed Nov 19, 2024
2 parents 4ebc6d7 + b9b5d01 commit d10a960
Show file tree
Hide file tree
Showing 118 changed files with 2,314 additions and 503 deletions.
Binary file modified .storybook/css/fonts/vivo-type-bold.woff2
Binary file not shown.
Binary file modified .storybook/css/fonts/vivo-type-light.woff2
Binary file not shown.
Binary file added .storybook/css/fonts/vivo-type-medium.woff2
Binary file not shown.
Binary file modified .storybook/css/fonts/vivo-type-regular.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion .storybook/css/vivo-font.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
font-family: 'Vivo Type';
font-style: normal;
font-weight: 500;
src: url('./fonts/vivo-type-bold.woff2') format('woff2');
src: url('./fonts/vivo-type-medium.woff2') format('woff2');
}

/* Bold */
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# [16.5.0](https://github.com/Telefonica/mistica-web/compare/v16.4.0...v16.5.0) (2024-11-18)


### Features

* **Accordion, BoxedAccordion:** allow detail and right content in header ([#1290](https://github.com/Telefonica/mistica-web/issues/1290)) ([087c486](https://github.com/Telefonica/mistica-web/commit/087c4866757733339e51ed9de54b844fecf7aed5))
* **HorizontalMosaic, VerticalMosaic:** allow passing gridMode information to each item ([#1289](https://github.com/Telefonica/mistica-web/issues/1289)) ([bb8852c](https://github.com/Telefonica/mistica-web/commit/bb8852c439cb33b2ae7c877a2ac32760ec29180c))
* **MainNavigationBar:** add menu ([#1280](https://github.com/Telefonica/mistica-web/issues/1280)) ([3973ead](https://github.com/Telefonica/mistica-web/commit/3973ead1ebef7f613b1aebd3c18306fc88999de0))
* **vivo-type:** added medium weight ([#1291](https://github.com/Telefonica/mistica-web/issues/1291)) ([8a38d2c](https://github.com/Telefonica/mistica-web/commit/8a38d2c1c16a17b931f96c75b400d7ba8c036a93))

# [16.4.0](https://github.com/Telefonica/mistica-web/compare/v16.3.1...v16.4.0) (2024-11-04)


Expand Down
22 changes: 11 additions & 11 deletions css/vivo-new.css
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,13 @@
--mistica-line-height-4: 1.5rem;
--mistica-font-size-5: 1.25rem;
--mistica-line-height-5: 1.5rem;
--mistica-font-weight-5: 400;
--mistica-font-weight-5: 500;
--mistica-font-size-6: 1.5rem;
--mistica-line-height-6: 2rem;
--mistica-font-weight-6: 400;
--mistica-font-weight-6: 500;
--mistica-font-size-7: 1.75rem;
--mistica-line-height-7: 2rem;
--mistica-font-weight-7: 400;
--mistica-font-weight-7: 500;
--mistica-font-size-8: 2rem;
--mistica-line-height-8: 2.5rem;
--mistica-font-weight-8: 400;
Expand All @@ -218,18 +218,18 @@
--mistica-font-weight-10: 400;
--mistica-font-size-cardTitle: 1.25rem;
--mistica-line-height-cardTitle: 1.5rem;
--mistica-font-weight-cardTitle: 400;
--mistica-font-weight-button: 400;
--mistica-font-weight-cardTitle: 500;
--mistica-font-weight-button: 500;
--mistica-font-size-tabsLabel: 1.125rem;
--mistica-line-height-tabsLabel: 1.5rem;
--mistica-font-weight-tabsLabel: 400;
--mistica-font-weight-link: 400;
--mistica-font-weight-title1: 400;
--mistica-font-weight-title2: 400;
--mistica-font-weight-tabsLabel: 500;
--mistica-font-weight-link: 500;
--mistica-font-weight-title1: 500;
--mistica-font-weight-title2: 500;
--mistica-font-size-title3: 1.125rem;
--mistica-line-height-title3: 1.5rem;
--mistica-font-weight-title3: 400;
--mistica-font-weight-indicator: 400;
--mistica-font-weight-title3: 500;
--mistica-font-weight-indicator: 500;
--mistica-font-weight-navigationBar: 400;
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@telefonica/mistica",
"version": "16.4.0",
"version": "16.5.0",
"license": "MIT",
"repository": {
"type": "git",
Expand Down
299 changes: 272 additions & 27 deletions playroom/snippets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2584,33 +2584,278 @@ const navigationBarSnippets = [
group: 'NavigationBar',
name: 'MainNavigationBar',
code: `
<MainNavigationBar
sections={["Start", "Account", "Explore", "Support"].map((title, idx) => ({
title,
onPress: () => setState("index", idx),
}))}
selectedIndex={getState("index", 0)}
right={
<NavigationBarActionGroup>
<NavigationBarAction
onPress={() => {}}
aria-label="shopping cart with 2 items"
>
<Badge value={2}>
<IconShoppingCartRegular color="currentColor" />
</Badge>
</NavigationBarAction>
<NavigationBarAction onPress={() => {}} aria-label="Open profile">
<Avatar
size={isDesktopOrBigger ? 32 : 24}
initials="ML"
src="${imagePlaceholder}"
/>
{isDesktopOrBigger && "María López Serrano"}
</NavigationBarAction>
</NavigationBarActionGroup>
}
/>`,
<MainNavigationBar
sections={[
{
title: "Start",
onPress: () => setState("index", 0),
},
{
title: "Account",
onPress: () => setState("index", 1),
},
{
title: "Explore",
onPress: () => setState("index", 2),
},
{
title: "Support",
onPress: () => setState("index", 3),
},
]}
selectedIndex={getState("index", 0)}
right={
<NavigationBarActionGroup>
<NavigationBarAction
onPress={() => {}}
aria-label="shopping cart with 2 items"
>
<Badge value={2}>
<IconShoppingCartRegular color="currentColor" />
</Badge>
</NavigationBarAction>
<NavigationBarAction onPress={() => {}} aria-label="Open profile">
<Avatar
size={isDesktopOrBigger ? 32 : 24}
initials="ML"
src="${imagePlaceholder}"
/>
{isDesktopOrBigger && "María López Serrano"}
</NavigationBarAction>
</NavigationBarActionGroup>
}
/>`,
},
{
group: 'NavigationBar',
name: 'MainNavigationBar with menu',
code: `
<MainNavigationBar
sections={[
{
onPress: () => setState("index", 0),
title: "Start",
menu: {
columns: [
{
title: "Start 1",
items: [
{
title: "item 1",
onPress: () => {},
},
{
title: "item 2",
href: "https://www.google.com/",
},
{
title: "item 3",
to: "#",
},
],
},
],
},
},
{
onPress: () => setState("index", 1),
title: "Account",
menu: {
columns: [
{
title: "Account 1",
items: [
{
title: "item 1",
onPress: () => {},
},
],
},
],
},
},
{
onPress: () => setState("index", 2),
title: "Explore",
menu: {
columns: [
{
title: "Explore 1",
items: [
{
title: "item 1",
onPress: () => {},
},
{
title: "item 2",
href: "https://www.google.com/",
},
{
title: "item 3",
to: "#",
},
],
},
],
},
},
]}
selectedIndex={getState("index", 0)}
/>`,
},
{
group: 'NavigationBar',
name: 'MainNavigationBar with large menu',
code: `
<MainNavigationBar
desktopLargeMenu
sections={[
{
onPress: () => setState("index", 0),
title: "Start",
menu: {
columns: [
{
title: "Start 1",
items: [
{
title: "item 1",
onPress: () => {},
},
{
title: "item 2",
href: "https://www.google.com/",
},
{
title: "item 3",
to: "#",
},
],
},
{
title: "Start 2",
items: [
{
title: "item 1",
onPress: () => {},
},
{
title: "item 2",
href: "https://www.google.com/",
},
{
title: "item 3",
to: "#",
},
],
},
],
},
},
{
onPress: () => setState("index", 1),
title: "Account",
menu: {
columns: [
{
title: "Account 1",
items: [
{
title: "item 1",
onPress: () => {},
},
],
},
],
},
},
{
onPress: () => setState("index", 2),
title: "Explore",
menu: {
content: ({ closeMenu }) => (
<Stack space={16}>
<Text2 regular>Custom content</Text2>
<Placeholder />
<ButtonPrimary onPress={closeMenu}>Close menu</ButtonPrimary>
</Stack>
),
},
},
{
onPress: () => setState("index", 3),
title: "Support",
menu: {
content: isDesktopOrBigger ? (
<Grid columns={12} gap={24}>
{Array.from({ length: 3 }, (_, index) => (
<GridItem columnSpan={2} key={index}>
<Stack space={24}>
<Title1>Contenidos</Title1>
<Stack space={16}>
{[
"Destacados",
"Todo fútbol",
"#0",
"Cine",
"Oferta comercial",
"Mi Movistar",
"Movistar Cloud",
].map((title, index) => (
<TextLink
key={index}
onPress={() => {}}
style={{ color: colors.textPrimary }}
>
{title}
</TextLink>
))}
</Stack>
</Stack>
</GridItem>
))}
<GridItem columnSpan={5} columnStart={8}>
<DisplayMediaCard
headline={<Tag type="promo">Oferta</Tag>}
title="Movistar Plus+"
onPress={() => {}}
description="Contrata solo TV por 9,99 €"
backgroundImage="${imagePlaceholder}"
/>
</GridItem>
</Grid>
) : (
<Stack space={40}>
{Array.from({ length: 3 }, (_, index) => (
<Stack space={16} key={index}>
<Title1>Title</Title1>
<NegativeBox>
<RowList>
<Row title="Title" onPress={() => {}} />
<Row title="Title" onPress={() => {}} />
<Row title="Title" onPress={() => {}} />
<Row title="Title" onPress={() => {}} />
</RowList>
</NegativeBox>
</Stack>
))}
<DisplayMediaCard
headline={<Tag type="promo">Oferta</Tag>}
title="Movistar Plus+"
aspectRatio="1:1"
onPress={() => {}}
description="Contrata solo TV por 9,99 €"
backgroundImage="${imagePlaceholder}"
/>
</Stack>
),
},
},
]}
selectedIndex={getState("index", 0)}
/>`,
},
{
group: 'NavigationBar',
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d10a960

Please sign in to comment.