Skip to content

Commit 226ea95

Browse files
committed
Merge remote-tracking branch 'origin/master' into latex-landing-page-20251003
2 parents 1ae6310 + 4b4cce1 commit 226ea95

File tree

6 files changed

+268
-199
lines changed

6 files changed

+268
-199
lines changed

src/packages/next/components/landing/collaboration.tsx

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,47 @@ import Info from "./info";
1010

1111
interface Props {
1212
image: StaticImageData;
13+
alt?: string;
14+
children?: React.ReactNode;
1315
}
1416

1517
export default function Collaboration(props: Props) {
16-
const { image } = props;
18+
const {
19+
image,
20+
alt = "Editing a document in two browser windows",
21+
children,
22+
} = props;
1723
return (
1824
<Info
1925
anchor="a-realtimesync"
2026
icon="users"
2127
title="Collaborative editing without limits"
2228
image={image}
23-
alt="Editing a document in two browser windows"
29+
alt={alt}
2430
>
25-
<Paragraph>
26-
Privately share your project with{" "}
27-
<A href="https://doc.cocalc.com/project-settings.html#about-collaborators">
28-
<strong>an unlimited number of collaborators</strong>
29-
</A>
30-
. Simultaneous modifications of your document are{" "}
31-
<strong>synchronized in real time</strong>. You see the cursors of
32-
others while they edit the document and also see the presence of
33-
watching collaborators.
34-
</Paragraph>
31+
{children ?? (
32+
<>
33+
<Paragraph>
34+
Collaborate with colleagues on the same file – at the same time. It
35+
works just like editing a document in Google Docs. You see the
36+
cursors of others moving around and the edits they make in realtime.
37+
</Paragraph>
3538

36-
<Paragraph>
37-
Additionally, any compilation status and output is synchronized between
38-
everyone, because everything runs online and is fully managed by CoCalc.
39-
</Paragraph>
39+
<Paragraph>
40+
You can share your project privately with{" "}
41+
<A href="https://doc.cocalc.com/project-settings.html#about-collaborators">
42+
any number of collaborators
43+
</A>
44+
. This ensures that they see exactly the same files and can fully
45+
work with you.
46+
</Paragraph>
4047

41-
<Paragraph>
42-
This ensures that everyone involved experiences editing the document in
43-
exactly the same way.
44-
</Paragraph>
48+
<Paragraph>
49+
If two users modify the same thing at the same time, they are both
50+
notified and can fix any conflicting changes.
51+
</Paragraph>
52+
</>
53+
)}
4554
</Info>
4655
);
4756
}

src/packages/next/components/landing/compare.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,21 @@
312312
"authorea": true,
313313
"papeeria": false
314314
},
315+
{
316+
"feature": "AI Formula Assistant",
317+
"cocalc": {
318+
"type": true,
319+
"note": "Generate LaTeX formulas from natural language descriptions using AI",
320+
"link": "https://cocalc.com/features/latex-editor#a-ai-formula"
321+
},
322+
"overleaf": {
323+
"type": true,
324+
"note": "AI Assist add-on generates equations from prompts or images (paid feature with limited free uses)",
325+
"link": "https://www.overleaf.com/learn/how-to/AI_Assist"
326+
},
327+
"authorea": false,
328+
"papeeria": false
329+
},
315330
{
316331
"feature": "Bibliography",
317332
"cocalc": {

src/packages/next/components/landing/info.tsx

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,20 @@ interface HeadingProps {
310310
style?: CSSProperties;
311311
textStyle?: CSSProperties;
312312
level?: TitleProps["level"];
313+
anchor?: string;
314+
icon?: IconName | JSX.Element;
313315
}
314316

315317
Info.Heading = (props: HeadingProps) => {
316-
const { level = 1, children, description, style, textStyle } = props;
318+
const {
319+
level = 1,
320+
children,
321+
description,
322+
style,
323+
textStyle,
324+
anchor,
325+
icon,
326+
} = props;
317327
return (
318328
<div
319329
style={{
@@ -327,13 +337,19 @@ Info.Heading = (props: HeadingProps) => {
327337
>
328338
<Title
329339
level={level}
340+
id={anchor}
330341
style={{
331342
color: COLORS.GRAY_D,
332343
maxWidth: MAX_WIDTH_LANDING,
333-
margin: "0 auto",
344+
margin: "0 auto 20px auto",
334345
...textStyle,
335346
}}
336347
>
348+
{icon != null && (
349+
<span style={{ fontSize: "24pt", marginRight: "5px" }}>
350+
{typeof icon === "string" ? <Icon name={icon} /> : icon}{" "}
351+
</span>
352+
)}
337353
{children}
338354
</Title>
339355
{description && (

src/packages/next/pages/features/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import apiScreenshot from "/public/features/api-screenshot.png";
2222
import ChatGptInChatroom from "/public/features/chatgpt-fix-code.png";
2323
import teachingScreenshot from "/public/features/cocalc-course-assignments-2019.png";
2424
import JupyterTF from "/public/features/cocalc-jupyter2-20170508.png";
25-
import LatexEditorImage from "/public/features/cocalc-latex-editor-2019.png";
25+
import LatexEditorImage from "public/features/latex-editor-main-20251003.png";
2626
import octaveJupyter from "/public/features/cocalc-octave-jupyter-20200511.png";
2727
import RJupyter from "/public/features/cocalc-r-jupyter.png";
2828
import linuxShellScript from "/public/features/cocalc-shell-script-run.png";

0 commit comments

Comments
 (0)