diff --git a/server/pages/About.js b/server/pages/About.js index a0ea3850..dd2c35e5 100644 --- a/server/pages/About.js +++ b/server/pages/About.js @@ -2,7 +2,7 @@ import * as React from 'react'; import Grid from 'styled-components-grid'; import styled from 'styled-components'; -import { Helmet } from 'react-helmet'; +import PageTitle from './components/PageTitle'; import Flex from '../../shared/components/Flex'; import Header from './components/Header'; import Content from './components/Content'; @@ -35,9 +35,8 @@ const Avatar = styled.img` export default function About() { return ( - - About Us - + +

About Us

The team behind Outline

diff --git a/server/pages/Changelog.js b/server/pages/Changelog.js index e7ca70d7..457f37f5 100644 --- a/server/pages/Changelog.js +++ b/server/pages/Changelog.js @@ -4,7 +4,7 @@ import { groupBy, map } from 'lodash'; import format from 'date-fns/format'; import styled from 'styled-components'; import Grid from 'styled-components-grid'; -import { Helmet } from 'react-helmet'; +import PageTitle from './components/PageTitle'; import Markdown from './components/Markdown'; import Header from './components/Header'; import Content from './components/Content'; @@ -25,9 +25,7 @@ function Changelog({ releases }: Props) { return ( - - Changelog - +

Changelog

We’re building in public. Here’s what has changed recently.

diff --git a/server/pages/Pricing.js b/server/pages/Pricing.js index 73ad259d..97456b39 100644 --- a/server/pages/Pricing.js +++ b/server/pages/Pricing.js @@ -3,18 +3,17 @@ import * as React from 'react'; import styled from 'styled-components'; import breakpoint from 'styled-components-breakpoint'; import Grid from 'styled-components-grid'; -import { Helmet } from 'react-helmet'; +import PageTitle from './components/PageTitle'; import Header from './components/Header'; import Content from './components/Content'; import Button from './components/Button'; import Notice from '../../shared/components/Notice'; +import { mailToUrl, githubUrl } from '../../shared/utils/routeHelpers'; export default function Pricing() { return ( - - Pricing - +

Our Pricing

Our pricing is simple. You’ll only pay for what you use.

@@ -57,7 +56,9 @@ export default function Pricing() { $ 5{' '} - per seat per month + + per seat per month +
@@ -70,15 +71,18 @@ export default function Pricing() {
- Note: Outline is currently in Beta. This plan is currently free - until public release in Q1 2019. + Note: Outline is in Beta. This plan is currently free until public + release in Q1 2019. -

Self Hosted

-

Host your own instance on-premise or in the cloud

+ +
+

Self Hosted

+

Host your own instance on-premise or in the cloud.

+
-

- -

+ + +

- Run Outline on your own infrastructure. Get dedicated support with - setup, maintainence, and product issues. -

-

- + Support continued development of Outline. Get dedicated support + with setup, maintainence, and product issues.

+ + +
@@ -172,6 +178,10 @@ const Plan = styled(Grid.Unit)` } `; +const Centered = styled.div` + text-align: center; +`; + const Name = styled.h3` text-align: center; `; diff --git a/server/pages/Privacy.js b/server/pages/Privacy.js index 93ca7846..a220de1d 100644 --- a/server/pages/Privacy.js +++ b/server/pages/Privacy.js @@ -1,16 +1,14 @@ // @flow import * as React from 'react'; import Grid from 'styled-components-grid'; -import { Helmet } from 'react-helmet'; +import PageTitle from './components/PageTitle'; import Header from './components/Header'; import Content from './components/Content'; export default function Privacy() { return ( - - Privacy Policy - +

Privacy Policy

How we collect and use your information

diff --git a/server/pages/SubdomainSignin.js b/server/pages/SubdomainSignin.js index a63ecddf..987a0a8f 100644 --- a/server/pages/SubdomainSignin.js +++ b/server/pages/SubdomainSignin.js @@ -1,6 +1,5 @@ // @flow import * as React from 'react'; -import { Helmet } from 'react-helmet'; import styled from 'styled-components'; import Grid from 'styled-components-grid'; import Hero from './components/Hero'; @@ -8,6 +7,7 @@ import HeroText from './components/HeroText'; import SigninButtons from './components/SigninButtons'; import AuthErrors from './components/AuthErrors'; import Centered from './components/Centered'; +import PageTitle from './components/PageTitle'; import { Team } from '../models'; type Props = { @@ -36,9 +36,7 @@ function SubdomainSignin({ return ( - - Outline - Sign in to {team.name} - +

{lastSignedIn ? 'Welcome back,' : 'Hey there,'}

diff --git a/server/pages/components/PageTitle.js b/server/pages/components/PageTitle.js new file mode 100644 index 00000000..f9d6f37e --- /dev/null +++ b/server/pages/components/PageTitle.js @@ -0,0 +1,13 @@ +// @flow +import * as React from 'react'; +import { Helmet } from 'react-helmet'; + +function PageTitle({ title }: { title: string }) { + return ( + + {title} – Outline + + ); +} + +export default PageTitle; diff --git a/server/pages/developers/Api.js b/server/pages/developers/Api.js index ef4359f5..6ec30941 100644 --- a/server/pages/developers/Api.js +++ b/server/pages/developers/Api.js @@ -1,17 +1,15 @@ // @flow import * as React from 'react'; -import Grid from 'styled-components-grid'; -import { Helmet } from 'react-helmet'; import styled from 'styled-components'; +import Grid from 'styled-components-grid'; +import PageTitle from '../components/PageTitle'; import Header from '../components/Header'; import Content from '../components/Content'; export default function Pricing() { return ( - - API Reference - Outline - +

API Reference

Outline is built on an open, best-in-class, API

diff --git a/server/pages/developers/index.js b/server/pages/developers/index.js index a9afed8d..b4d26599 100644 --- a/server/pages/developers/index.js +++ b/server/pages/developers/index.js @@ -1,17 +1,15 @@ // @flow import * as React from 'react'; import Grid from 'styled-components-grid'; -import { Helmet } from 'react-helmet'; import styled from 'styled-components'; +import PageTitle from '../components/PageTitle'; import Header from '../components/Header'; import Content from '../components/Content'; export default function Pricing() { return ( - - Developers - Outline - +

Developers

Outline is built on an open, best-in-class, API

diff --git a/server/pages/integrations/Integration.js b/server/pages/integrations/Integration.js index d64fd3f0..3d5f9b9d 100644 --- a/server/pages/integrations/Integration.js +++ b/server/pages/integrations/Integration.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; import Grid from 'styled-components-grid'; -import { Helmet } from 'react-helmet'; +import PageTitle from '../components/PageTitle'; import Markdown from '../components/Markdown'; import Header from '../components/Header'; import Content from '../components/Content'; @@ -23,9 +23,7 @@ type Props = { export default function Integration({ integration, content }: Props) { return ( - - {integration.name} Integration – Outline - +

{integration.name} Integration

{integration.description}

diff --git a/server/pages/integrations/index.js b/server/pages/integrations/index.js index 698de413..3c74ed3d 100644 --- a/server/pages/integrations/index.js +++ b/server/pages/integrations/index.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { map, groupBy } from 'lodash'; import styled from 'styled-components'; import Grid from 'styled-components-grid'; -import { Helmet } from 'react-helmet'; +import PageTitle from '../components/PageTitle'; import Header from '../components/Header'; import Content from '../components/Content'; import integrations from './content'; @@ -13,9 +13,7 @@ const categories = groupBy(integrations, i => i.category); function Integrations() { return ( - - Integrations - +

Integrations