improvements #156

async-labs · May 29, 2021 · 0954f1f · 0954f1f
1 parent 25ea612
commit 0954f1f
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 19 deletions.
diff --git a/book/10-begin/app/components/posts/PostEditor.tsx b/book/10-begin/app/components/posts/PostEditor.tsx
@@ -124,7 +124,6 @@ class PostEditor extends React.Component<Props, State> {
  input: {
  border: 'none',
  outline: 'none',
- font: '16px Roboto',
  color: isThemeDark ? '#fff' : '#000',
  fontWeight: 300,
  height: '100vh',

diff --git a/book/10-end/app/components/posts/PostContent.tsx b/book/10-end/app/components/posts/PostContent.tsx
@@ -8,7 +8,7 @@ class PostContent extends React.Component<Props> {
 
  return (
  <div
- style={{ fontSize: '15px', lineHeight: '2em', fontWeight: 300, wordBreak: 'break-all' }}
+ style={{ fontSize: '15px', lineHeight: '2em', font: '16px Roboto', wordBreak: 'break-all' }}
  dangerouslySetInnerHTML={{ __html: html }}
  />
  );

diff --git a/book/10-end/app/components/posts/PostEditor.tsx b/book/10-end/app/components/posts/PostEditor.tsx
@@ -123,9 +123,8 @@ class PostEditor extends React.Component<Props, State> {
  input: {
  border: 'none',
  outline: 'none',
- font: '16px Roboto',
  color: isThemeDark ? '#fff' : '#000',
- fontWeight: 300,
+ font: '16px Roboto',
  height: '100vh',
  lineHeight: '1.5em',
  backgroundColor: content ? textareaBackgroundColor : 'transparent',

diff --git a/book/10-end/app/pages/_document.tsx b/book/10-end/app/pages/_document.tsx
@@ -45,14 +45,12 @@ class MyDocument extends Document {
  rel="prefetch"
  href="/fonts/IBM-Plex-Mono/IBMPlexMono-Regular.woff2"
  as="font"
- crossOrigin="anonymous"
  type="font/woff2"
  />
  <link
  rel="prefetch"
  href="/fonts/IBM-Plex-Mono/IBMPlexMono-Bold.woff2"
  as="font"
- crossOrigin="anonymous"
  type="font/woff2"
  />
 

diff --git a/book/7-end/app/pages/_app.tsx b/book/7-end/app/pages/_app.tsx
@@ -108,10 +108,10 @@ class MyApp extends App {
  const { Component, pageProps } = this.props;
  const store = this.store;
 
+ const isThemeDark = store.currentUser ? store.currentUser.darkTheme : true;
+
  return (
- <ThemeProvider
- theme={store.currentUser && store.currentUser.darkTheme ? themeDark : themeLight}
- >
+ <ThemeProvider theme={isThemeDark ? themeDark : themeLight}>
  <Head>
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <link

diff --git a/book/8-begin/app/pages/_app.tsx b/book/8-begin/app/pages/_app.tsx
@@ -108,10 +108,10 @@ class MyApp extends App {
  const { Component, pageProps } = this.props;
  const store = this.store;
 
+ const isThemeDark = store.currentUser ? store.currentUser.darkTheme : true;
+
  return (
- <ThemeProvider
- theme={store.currentUser && store.currentUser.darkTheme ? themeDark : themeLight}
- >
+ <ThemeProvider theme={isThemeDark ? themeDark : themeLight}>
  <Head>
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <link

diff --git a/book/8-end/app/components/posts/PostEditor.tsx b/book/8-end/app/components/posts/PostEditor.tsx
@@ -124,7 +124,6 @@ class PostEditor extends React.Component<Props, State> {
  input: {
  border: 'none',
  outline: 'none',
- font: '16px Roboto',
  color: isThemeDark ? '#fff' : '#000',
  fontWeight: 300,
  height: '100vh',

diff --git a/book/9-begin/app/components/posts/PostEditor.tsx b/book/9-begin/app/components/posts/PostEditor.tsx
@@ -124,7 +124,6 @@ class PostEditor extends React.Component<Props, State> {
  input: {
  border: 'none',
  outline: 'none',
- font: '16px Roboto',
  color: isThemeDark ? '#fff' : '#000',
  fontWeight: 300,
  height: '100vh',

diff --git a/book/9-end/app/components/posts/PostEditor.tsx b/book/9-end/app/components/posts/PostEditor.tsx
@@ -124,7 +124,6 @@ class PostEditor extends React.Component<Props, State> {
  input: {
  border: 'none',
  outline: 'none',
- font: '16px Roboto',
  color: isThemeDark ? '#fff' : '#000',
  fontWeight: 300,
  height: '100vh',

diff --git a/saas/app/components/posts/PostContent.tsx b/saas/app/components/posts/PostContent.tsx
@@ -8,7 +8,7 @@ class PostContent extends React.Component<Props> {
 
  return (
  <div
- style={{ fontSize: '15px', lineHeight: '2em', fontWeight: 300, wordBreak: 'break-all' }}
+ style={{ fontSize: '15px', lineHeight: '2em', font: '16px Roboto', wordBreak: 'break-all' }}
  dangerouslySetInnerHTML={{ __html: html }}
  />
  );

diff --git a/saas/app/components/posts/PostEditor.tsx b/saas/app/components/posts/PostEditor.tsx
@@ -120,7 +120,7 @@ class PostEditor extends React.Component<Props, State> {
  border: 'none',
  outline: 'none',
  color: isThemeDark ? '#fff' : '#000',
- fontWeight: 300,
+ font: '16px Roboto',
  height: '100vh',
  lineHeight: '1.5em',
  backgroundColor: content ? textareaBackgroundColor : 'transparent',

diff --git a/saas/app/pages/_document.tsx b/saas/app/pages/_document.tsx
@@ -45,14 +45,12 @@ class MyDocument extends Document {
  rel="prefetch"
  href="/fonts/IBM-Plex-Mono/IBMPlexMono-Regular.woff2"
  as="font"
- crossOrigin="anonymous"
  type="font/woff2"
  />
  <link
  rel="prefetch"
  href="/fonts/IBM-Plex-Mono/IBMPlexMono-Bold.woff2"
  as="font"
- crossOrigin="anonymous"
  type="font/woff2"
  />