Skip to content

Commit

Permalink
minor React bump, small style tweaks and fixes (facebook#2565)
Browse files Browse the repository at this point in the history
* minor React bump, small style tweaks and fixes

* use trimmed versions for test build on CircleCI

* fix typo
  • Loading branch information
Simek authored Mar 29, 2021
1 parent dbb2acc commit fdfe6f2
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ jobs:
- run: yarn ci-check
- run: export NODE_OPTIONS=--max_old_space_size=4096
- run: export TERSER_PARALLEL=false
# Run build test only for three latest version to avoid memory issues
- run: export DEPOLY_PREVIEW=true
- run:
name: Compile website
command: yarn test
Expand Down
4 changes: 2 additions & 2 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"@docusaurus/plugin-pwa": "2.0.0-alpha.72",
"@docusaurus/preset-classic": "2.0.0-alpha.72",
"docusaurus-plugin-sass": "^0.1.12",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-github-btn": "^1.2.0"
},
"devDependencies": {
Expand Down
15 changes: 9 additions & 6 deletions website/src/css/customTheme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ hr {

code {
display: inline-block;
line-height: 1.1em;
line-height: 1.2em;
vertical-align: top;
}

Expand Down Expand Up @@ -415,6 +415,7 @@ html[data-theme="dark"] .avatar__name a {
&.navbar__link {
font-weight: 300;
font-size: 18px;
user-select: none;
}

&.dropdown a {
Expand Down Expand Up @@ -535,10 +536,7 @@ html[data-theme="dark"] .avatar__name a {
padding: 12px;

.menu__list-item a {
padding-left: 12px;
padding-right: 12px;
padding-top: 6px;
padding-bottom: 8px;
padding: 6px 12px 8px;
}
}

Expand Down Expand Up @@ -607,6 +605,7 @@ div[class^="docSidebarContainer"] {
.menu__list-item {
margin-bottom: 2px;
margin-top: 2px;
user-select: none;
}

.menu__list {
Expand Down Expand Up @@ -1371,7 +1370,7 @@ html[data-theme="dark"] .docsRating {
/* Snack Player */

.snack-player {
height: 505px;
height: 544px;
width: 100%;
overflow: hidden;
margin-bottom: 24px;
Expand Down Expand Up @@ -1453,6 +1452,10 @@ html[data-theme="dark"] .docsRating {
border-bottom: 0.01rem solid var(--ifm-table-border-color);
}

h3, h4, li {
user-select: none;
}

@extend %scrollbar-style;
}
}
Expand Down
1 change: 0 additions & 1 deletion website/src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import useDocusaurusContext from '@docusaurus/useDocusaurusContext';

import Layout from '@theme/Layout';
import CodeBlock from '@theme/CodeBlock';
import Seo from '@theme/Seo';

import CrossPlatformSVG from '../../static/img/homepage/cross-platform.svg';
import {setupDissectionAnimation} from './animations/_dissectionAnimation';
Expand Down
9 changes: 3 additions & 6 deletions website/src/theme/DocItem/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,10 @@ function DocItem(props) {
lastUpdatedBy,
unversionedId,
} = metadata;
const {pluginId} = useActivePlugin({
failfast: true,
});
const {pluginId} = useActivePlugin({failfast: true});

const versions = useVersions(pluginId);
const version = useActiveVersion(pluginId); // If site is not versioned or only one version is included
// we don't show the version badge
// See https://github.com/facebook/docusaurus/issues/3362
const version = useActiveVersion(pluginId);

const showVersionBadge = versions.length > 1 && !version.isLast;
return (
Expand Down
26 changes: 13 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9778,14 +9778,14 @@ react-docgen-renderer-template@^0.1.0:
resolved "https://registry.yarnpkg.com/react-docgen-renderer-template/-/react-docgen-renderer-template-0.1.0.tgz#29340c947ab42b0060aa8e1c64e379a822e2733e"
integrity sha512-3GyuFI9pBf3E2lW6oX6j3DvTQv55Wc9pWNKwDVcUFf8kDfpDyWmTeAYWPxoSEhSZxhEP+LV/1Tr4DLwE4CULQQ==

react-dom@^17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
react-dom@^17.0.2:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
scheduler "^0.20.1"
scheduler "^0.20.2"

react-error-overlay@^6.0.9:
version "6.0.9"
Expand Down Expand Up @@ -9905,10 +9905,10 @@ react-toggle@^4.1.2:
dependencies:
classnames "^2.2.5"

react@^17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
react@^17.0.2:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
Expand Down Expand Up @@ -10598,10 +10598,10 @@ sax@^1.2.4, sax@~1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==

scheduler@^0.20.1:
version "0.20.1"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
scheduler@^0.20.2:
version "0.20.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
Expand Down

0 comments on commit fdfe6f2

Please sign in to comment.