diff --git a/components/lib/themes/primeone/base/button/index.js b/components/lib/themes/primeone/base/button/index.js index 86297e85b..8713c9d8e 100644 --- a/components/lib/themes/primeone/base/button/index.js +++ b/components/lib/themes/primeone/base/button/index.js @@ -13,6 +13,8 @@ export default { border: 1px solid ${dt('button.primary.border.color')}; padding: 0.5rem 1rem; font-size: 1rem; + font-family: inherit; + font-feature-settings: inherit; transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')}; border-radius: ${dt('rounded.base')}; outline-color: transparent; diff --git a/components/lib/themes/primeone/base/global/index.js b/components/lib/themes/primeone/base/global/index.js index 7c286b6b2..5186fb3ec 100644 --- a/components/lib/themes/primeone/base/global/index.js +++ b/components/lib/themes/primeone/base/global/index.js @@ -129,8 +129,6 @@ export default { } .p-component { - font-family: ${dt('font.family')}; - font-feature-settings: ${dt('font.feature.settings')}; font-size: 1rem; font-weight: normal; } @@ -163,8 +161,8 @@ export default { } .p-link { - font-family: ${dt('font.family')}; - font-feature-settings: ${dt('font.feature.settings')}; + font-family: inherit; + font-feature-settings: inherit; font-size: 1rem; border-radius: 6px; outline-color: transparent; diff --git a/components/lib/themes/primeone/presets/aura/index.js b/components/lib/themes/primeone/presets/aura/index.js index 26c54c86a..43561f6e1 100644 --- a/components/lib/themes/primeone/presets/aura/index.js +++ b/components/lib/themes/primeone/presets/aura/index.js @@ -114,8 +114,6 @@ export default { stone: { 50: '#fafaf9', 100: '#f5f5f4', 200: '#e7e5e4', 300: '#d6d3d1', 400: '#a8a29e', 500: '#78716c', 600: '#57534e', 700: '#44403c', 800: '#292524', 900: '#1c1917', 950: '#0c0a09' } }, semantic: { - fontFamily: '"Inter var", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"', - fontFeatureSettings: '"cv02", "cv03", "cv04", "cv11"', transitionDuration: '0.2s', focusRing: { width: '1px', diff --git a/doc/theming/styled/PresetsDoc.vue b/doc/theming/styled/PresetsDoc.vue index 935e5c482..15d3ee77d 100644 --- a/doc/theming/styled/PresetsDoc.vue +++ b/doc/theming/styled/PresetsDoc.vue @@ -53,8 +53,6 @@ export default { stone: { 50: '#fafaf9', 100: '#f5f5f4', 200: '#e7e5e4', 300: '#d6d3d1', 400: '#a8a29e', 500: '#78716c', 600: '#57534e', 700: '#44403c', 800: '#292524', 900: '#1c1917', 950: '#0c0a09' } }, semantic: { - fontFamily: 'system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans","Liberation Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"', - fontFeatureSettings: 'normal', transitionDuration: '0.2s', focusRing: { width: '1px', diff --git a/doc/theming/styled/customization/FontDoc.vue b/doc/theming/styled/customization/FontDoc.vue index 76e979f48..3aa24581a 100644 --- a/doc/theming/styled/customization/FontDoc.vue +++ b/doc/theming/styled/customization/FontDoc.vue @@ -1,27 +1,5 @@ - -