Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

ActivityPub typography fix (#22202)

Browse source 
ref
https://linear.app/ghost/issue/AP-750/visual-designfrontend-regressions

- Default font-family is not set properly in local storage
This commit is contained in:
Peter Zimon 2025-02-17 13:19:37 +01:00 • committed by GitHub
parent db8b0c289d
commit c0179b4704
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/admin-x-activitypub/src/components/feed/ArticleModal.tsx
View file

@ -38,6 +38,8 @@ interface IframeWindow extends Window {
resizeIframe?: () => void;
}
const FONT_SANS = 'Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif';
const ArticleBody: React.FC<{
heading: string;
image: string|undefined;
@ -77,7 +79,7 @@ const ArticleBody: React.FC<{
:root {
--font-size: ${fontSize};
--line-height: ${lineHeight};
--font-family: ${fontFamily.value};
--font-family: ${(fontFamily.value === 'sans-serif' ? FONT_SANS : fontFamily.value)};
--letter-spacing: ${fontFamily.label === 'Clean sans-serif' ? '-0.013em' : '0'};
--content-spacing-factor: ${SPACING_FACTORS[FONT_SIZES.indexOf(fontSize)]};
}
@ -480,7 +482,7 @@ const ArticleModal: React.FC<ArticleModalProps> = ({
const [fontFamily, setFontFamily] = useState<SelectOption>(() => {
const saved = localStorage.getItem(STORAGE_KEYS.FONT_FAMILY);
return saved ? JSON.parse(saved) : {
value: 'sans-serif',
value: FONT_SANS,
label: 'Clean sans-serif'
};
});
@ -737,7 +739,7 @@ const ArticleModal: React.FC<ArticleModalProps> = ({
controlClasses={{control: '!min-h-[40px] !py-0 !pl-1', option: '!pl-1 !py-[4px]'}}
options={[
{
value: 'Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif',
value: FONT_SANS,
label: 'Clean sans-serif',
className: 'font-sans'
},
@ -750,7 +752,7 @@ const ArticleModal: React.FC<ArticleModalProps> = ({
title='Typeface'
value={fontFamily}
onSelect={option => setFontFamily(option || {
value: 'Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif',
value: FONT_SANS,
label: 'Clean sans-serif',
className: 'font-sans'
})}
@ -813,7 +815,7 @@ const ArticleModal: React.FC<ArticleModalProps> = ({
setCurrentFontSizeIndex(1); // Default font size
setCurrentLineHeightIndex(1); // Default line height
setFontFamily({
value: 'Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif',
value: FONT_SANS,
label: 'Clean sans-serif'
});
}}