diff --git a/commitlint.config.cjs b/commitlint.config.cjs index 9efbd6fc..7e03ed9c 100644 --- a/commitlint.config.cjs +++ b/commitlint.config.cjs @@ -1,6 +1,6 @@ module.exports = { extends: ['@commitlint/config-conventional'], rules: { - 'header-max-length': [2, 'always', 150] + 'header-max-length': [2, 'always', 300] } }; diff --git a/packages/components/icon/src/icon.ts b/packages/components/icon/src/icon.ts index 57f16a37..7f07657f 100644 --- a/packages/components/icon/src/icon.ts +++ b/packages/components/icon/src/icon.ts @@ -6,6 +6,7 @@ export interface IconProps { nodeType?: string fontSize?: string | number color?: string + fill?: number isDisabled?: boolean dataTest?: string ariaLabel?: string diff --git a/packages/components/icon/src/icon.vue b/packages/components/icon/src/icon.vue index 01bc7f2e..36e32cd5 100644 --- a/packages/components/icon/src/icon.vue +++ b/packages/components/icon/src/icon.vue @@ -24,7 +24,8 @@ defineOptions({ const props = withDefaults(defineProps(), { nodeType: 'div', fontSize: '1rem', - color: '#00000' + color: '#00000', + fill: 1 }); const fontSize = computed(() => { @@ -37,7 +38,8 @@ const fontSize = computed(() => { const style = computed(() => { return { fontSize: fontSize.value, - color: props.color + color: props.color, + 'font-variation-settings': `'FILL' ${props.fill}` }; }); diff --git a/packages/components/rating-card/src/rating-card.ts b/packages/components/rating-card/src/rating-card.ts index 783e4c57..a745a94b 100644 --- a/packages/components/rating-card/src/rating-card.ts +++ b/packages/components/rating-card/src/rating-card.ts @@ -5,15 +5,10 @@ export enum PuikRatingCardVariants { Extended = 'extended', Compact = 'compact', } -export enum PuikRatingSize { - Small = 'small', - large = 'large', -} export interface RatingCardProps { id: string variant?: `${PuikRatingCardVariants}` - size?: `${PuikRatingSize}` totalRatings: number[] showTotalRatings?: boolean dataTest?: string diff --git a/packages/components/rating-card/src/rating-card.vue b/packages/components/rating-card/src/rating-card.vue index 94ba385a..219c9577 100644 --- a/packages/components/rating-card/src/rating-card.vue +++ b/packages/components/rating-card/src/rating-card.vue @@ -2,7 +2,6 @@
@@ -34,7 +33,7 @@ v-else class="puik-rating-card_star" icon="star" - :font-size="props.size === PuikRatingSize.large ? '24px' : '16px'" + font-size="16px" color="#FFA000" node-type="span" /> @@ -49,7 +48,7 @@ diff --git a/packages/tailwind-preset/theme.ts b/packages/tailwind-preset/theme.ts index 424e8b5e..18aafe55 100644 --- a/packages/tailwind-preset/theme.ts +++ b/packages/tailwind-preset/theme.ts @@ -85,7 +85,7 @@ export default { fontFamily: { primary: ['IBM Plex Sans', 'Verdana', 'Arial', 'sans-serif'], secondary: ['Prestafont', 'Verdana', 'Arial', 'sans-serif'], - materialIcons: ['Material Icons Round'] + materialIcons: ['Material Symbols Rounded'] }, fontSize: { xs: ['0.75rem', { lineHeight: '1.125rem' }], diff --git a/packages/theme/src/common/font.scss b/packages/theme/src/common/font.scss index 68d81a83..31dbf575 100755 --- a/packages/theme/src/common/font.scss +++ b/packages/theme/src/common/font.scss @@ -4,4 +4,4 @@ } @import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,300;0,400;0,500;0,700;0,900;1,300;1,400;1,500;1,700;1,900&display=swap'); -@import url('https://fonts.googleapis.com/icon?family=Material+Icons+Round&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200'); diff --git a/packages/theme/src/puik-rating-card.scss b/packages/theme/src/puik-rating-card.scss index 7e24cc9b..7ca4850a 100644 --- a/packages/theme/src/puik-rating-card.scss +++ b/packages/theme/src/puik-rating-card.scss @@ -8,4 +8,7 @@ &_average-value { @extend .puik-body-default-bold; } + &_total-ratings { + @extend .puik-body-small-medium; + } } \ No newline at end of file