fix: resolve merge conflicts with origin/mbertamini/1597-remove-o2new-skin

Author: Copilot

.github/actions/audit-accessibility/main.js

@@ -250,11 +250,7 @@ const main = async () => {
     }
 
     const stories = getStories().filter((story) => !STORIES_BLACKLIST.has(story));
-<<<<<<< HEAD
     const skins = ['Movistar', 'O2', 'Vivo', 'Vivo-evolution', 'Blau'];
-=======
-    const skins = ['Movistar-new', 'O2', 'Vivo', 'Vivo-evolution', 'Blau'];
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
 
     /**
      * @type Array<[story: string, skin: string]>

.storybook/preview.tsx

@@ -134,11 +134,7 @@ const MisticaThemeProvider = ({
                         {(skin === MOVISTAR_SKIN || skin === O2_SKIN || skin === ESIMFLAG_SKIN) && (
                             <style>{`body {font-family: "On Air"}`}</style>
                         )}
-<<<<<<< HEAD
                         {skin === MOVISTAR_SKIN && <style>{`body {font-family: "Movistar Sans"}`}</style>}
-=======
-                        {skin === MOVISTAR_NEW_SKIN && <style>{`body {font-family: "Movistar Sans"}`}</style>}
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
                         <Story {...context} />
                     </OverscrollColorProvider>
                 </ThemeContextProvider>

doc/fonts.md

@@ -1,4 +1,4 @@
-\*\*\*\*# Fonts
+# Fonts
 
 Mistica does **not** inject a font family automatically. Without explicit setup, browsers fall back to their
 default serif font (Times New Roman on desktop). You must declare `@font-face` rules and set `font-family` on
@@ -8,28 +8,15 @@ default serif font (Times New Roman on desktop). You must declare `@font-face` r
 
 Each skin has a designated font family. Use the correct one for the skin your app is using:
 
-<<<<<<< HEAD
-| Skin                  | Getter function          | Font family         |
-| --------------------- | ------------------------ | ------------------- |
-| `movistar` _(legacy)_ | `getMovistarSkin()`      | `'On Air'`          |
-| `o2`                  | `getO2Skin()`            | `'On Air'`          |
-| `vivo`                | `getVivoSkin()`          | `'Vivo Type'`       |
-| `vivo-evolution`      | `getVivoEvolutionSkin()` | `'Vivo Type'`       |
-| `telefonica`          | `getTelefonicaSkin()`    | `'Telefonica Sans'` |
-| `blau`                | `getBlauSkin()`          | `'Roboto'`          |
-| `esimflag`            | `getEsimflagSkin()`      | `'On Air'`          |
-=======
-| Skin                         | Getter function          | Font family         |
-| ---------------------------- | ------------------------ | ------------------- |
-| `movistar-new` _(preferred)_ | `getMovistarNewSkin()`   | `'Movistar Sans'`   |
-| `movistar` _(legacy)_        | `getMovistarSkin()`      | `'On Air'`          |
-| `o2`                         | `getO2Skin()`            | `'On Air'`          |
-| `vivo`                       | `getVivoSkin()`          | `'Vivo Type'`       |
-| `vivo-evolution`             | `getVivoEvolutionSkin()` | `'Vivo Type'`       |
-| `telefonica`                 | `getTelefonicaSkin()`    | `'Telefonica Sans'` |
-| `blau`                       | `getBlauSkin()`          | `'Roboto'`          |
-| `esimflag`                   | `getEsimflagSkin()`      | `'On Air'`          |
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
+| Skin             | Getter function          | Font family         |
+| ---------------- | ------------------------ | ------------------- |
+| `movistar`       | `getMovistarSkin()`      | `'Movistar Sans'`   |
+| `o2`             | `getO2Skin()`            | `'On Air'`          |
+| `vivo`           | `getVivoSkin()`          | `'Vivo Type'`       |
+| `vivo-evolution` | `getVivoEvolutionSkin()` | `'Vivo Type'`       |
+| `telefonica`     | `getTelefonicaSkin()`    | `'Telefonica Sans'` |
+| `blau`           | `getBlauSkin()`          | `'Roboto'`          |
+| `esimflag`       | `getEsimflagSkin()`      | `'On Air'`          |
 
 ## Setting font-family
 

doc/llms/llms.md

@@ -152,24 +152,12 @@ type ThemeConfig = {
 };
 ```
 
-<<<<<<< HEAD
 Available skins: `getMovistarSkin()`, `getVivoSkin()`, `getVivoEvolutionSkin()`, `getO2Skin()`,
-`getTelefonicaSkin()`, `getBlauSkin()`, and others via `getSkinByName()`. The legacy Movistar variant without
-the `New` suffix also exists (`getMovistarSkin()`). You can also create a custom skin.
-
+`getTelefonicaSkin()`, `getBlauSkin()`, and others via `getSkinByName()`. You can also create a custom skin.
 If you need to customize default component colors, radii, or other visual tokens beyond the props exposed by a
 component, prefer extending a skin over overriding component styles. Built-in palette exports such as
 `movistarPalette`, `o2Palette`, `vivoPalette`, etc. are available for skin authoring, and custom skins may
 also define their own palette colors from scratch.
-=======
-Available skins: `getMovistarNewSkin()`, `getVivoSkin()`, `getVivoEvolutionSkin()`, `getO2Skin()`,
-`getTelefonicaSkin()`, `getBlauSkin()`, and others via `getSkinByName()`. The legacy Movistar variant without
-the `New` suffix also exists (`getMovistarSkin()`); prefer the `New` version for new projects. You can also
-create a custom skin. If you need to customize default component colors, radii, or other visual tokens beyond
-the props exposed by a component, prefer extending a skin over overriding component styles. Built-in palette
-exports such as `movistarNewPalette`, `o2Palette`, `vivoPalette`, etc. are available for skin authoring, and
-custom skins may also define their own palette colors from scratch.
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
 
 Built-in Link integrations: `Next12`, `Next13`, `Next14`, `ReactRouter5`, `ReactRouter6`.
 
@@ -299,11 +287,7 @@ All tokens via `skinVars` from `@telefonica/mistica`:
 
 - **Colors**: `skinVars.colors.*` (286 tokens for backgrounds, text, borders, controls, status, tags)
 - **Raw colors**: `skinVars.rawColors.*` (same tokens as RGB values, for use with `applyAlpha`)
-<<<<<<< HEAD
 - **Palettes for skin authoring**: built-in palette exports such as `movistarPalette`, `o2Palette`,
-=======
-- **Palettes for skin authoring**: built-in palette exports such as `movistarNewPalette`, `o2Palette`,
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
   `vivoPalette`, etc. Use these only when creating/extending a `Skin`, not for styling app components
   directly.
 - **Border radii**: `skinVars.borderRadii.*` (container, button, input, popup, chip, sheet, avatar, tag, etc.)

playroom/components/index.tsx

@@ -20,11 +20,7 @@ import {
     O2Logo,
     EsimflagLogo,
 } from '../../src';
-<<<<<<< HEAD
 import {Movistar, Telefonica, Blau, Vivo, Vivo_Evolution, O2, Esimflag} from '../themes';
-=======
-import {Movistar_New, Telefonica, Blau, Vivo, Vivo_Evolution, O2, Esimflag} from '../themes';
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
 import {useOverrideTheme} from '../frame-component';
 import IconSun from '../icons/icon-sun';
 import IconMoon from '../icons/icon-moon';
@@ -42,11 +38,7 @@ export * from '../../src/community';
 export {default as Loader} from './loader';
 export {default as Animation} from './animation';
 
-<<<<<<< HEAD
 type ValidSkinName = KnownSkinName;
-=======
-type ValidSkinName = Exclude<KnownSkinName, 'Movistar'>;
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
 
 const BrandIcon = ({Logo}: {Logo: React.ComponentType<{size: number; color?: string}>}) => {
     const {isDarkMode} = useTheme();

src/__stories__/logo-story.tsx

@@ -1,18 +1,5 @@
 import * as React from 'react';
-<<<<<<< HEAD
 import {BlauLogo, Logo, MovistarLogo, O2Logo, TelefonicaLogo, VivoLogo, EsimflagLogo} from '../logo';
-=======
-import {
-    BlauLogo,
-    Logo,
-    MovistarLogo,
-    MovistarNewLogo,
-    O2Logo,
-    TelefonicaLogo,
-    VivoLogo,
-    EsimflagLogo,
-} from '../logo';
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
 import {Box, ResponsiveLayout, useTheme} from '../index';
 
 import type {Variant} from '../theme-variant-context';
@@ -39,11 +26,7 @@ type Args = {
     variantOutside: Variant;
     action: 'none' | 'onPress' | 'href' | 'to';
     forceBrandLogo: boolean;
-<<<<<<< HEAD
     brand: 'Movistar' | 'O2' | 'Vivo' | 'Telefonica' | 'Blau' | 'Esimflag';
-=======
-    brand: 'Movistar' | 'Movistar-new' | 'O2' | 'Vivo' | 'Telefonica' | 'Blau' | 'Esimflag';
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
     color: (typeof COLOR_OPTIONS)[number];
 };
 
@@ -120,11 +103,7 @@ Default.args = {
 
 Default.argTypes = {
     brand: {
-<<<<<<< HEAD
         options: ['Movistar', 'O2', 'Vivo', 'Telefonica', 'Blau', 'Esimflag'],
-=======
-        options: ['Movistar', 'Movistar-new', 'O2', 'Vivo', 'Telefonica', 'Blau', 'Esimflag'],
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
         control: {type: 'select'},
         if: {arg: 'forceBrandLogo'},
     },

src/test-utils/index.tsx

@@ -185,20 +185,7 @@ export const openStoryPage = ({
     id: string;
     device?: Device;
     viewport?: TestViewport;
-<<<<<<< HEAD
     skin?: 'Movistar' | 'Vivo' | 'Vivo-evolution' | 'O2' | 'Telefonica' | 'Blau' | 'Esimflag' | 'Cyber';
-=======
-    skin?:
-        | 'Movistar'
-        | 'Movistar-new'
-        | 'Vivo'
-        | 'Vivo-evolution'
-        | 'O2'
-        | 'Telefonica'
-        | 'Blau'
-        | 'Esimflag'
-        | 'Cyber';
->>>>>>> origin/mbertamini/1597-remove-o2new-skin
     args?: StoryArgs;
     isDarkMode?: boolean;
 }): Promise<PageApi> =>