Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove sass from website #11229

Merged
merged 3 commits into from
Apr 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ packageExtensions:
"@docusaurus/plugin-pwa@*":
peerDependencies:
"@babel/core": "^7.0.0"
"docusaurus-plugin-sass@*":
peerDependencies:
webpack: "*"

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@
"jest-jasmine-ci": "yarn jest-jasmine --color --config jest.config.ci.js",
"jest-coverage": "yarn jest --coverage",
"lint": "eslint . --cache --ext js,jsx,ts,tsx,md",
"lint:prettier": "prettier '**/*.{md,yml,yaml}' 'website/**/*.{css,scss,js}' --write --ignore-path .gitignore",
"lint:prettier:ci": "prettier '**/*.{md,yml,yaml}' 'website/**/*.{css,scss,js}' --check --ignore-path .gitignore",
"lint:prettier": "prettier '**/*.{md,yml,yaml}' 'website/**/*.{css,js}' --write --ignore-path .gitignore",
"lint:prettier:ci": "prettier '**/*.{md,yml,yaml}' 'website/**/*.{css,js}' --check --ignore-path .gitignore",
"test-types": "yarn jest --config jest.config.types.js",
"test-ci": "yarn jest-coverage --color -i --config jest.config.ci.js && yarn test-leak && node ./scripts/mapCoverage.js && codecov",
"test-ci-partial": "yarn test-ci-partial:parallel -i",
Expand Down
9 changes: 4 additions & 5 deletions website/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,17 @@ module.exports = {
},
theme: {
customCss: [
path.resolve('src/css/docusaurusTheme.css'),
path.resolve('src/css/algoliaDocSearchTheme.css'),
path.resolve('src/components/v1/legacyCSS.css'),
path.resolve('src/css/docusaurusTheme.scss'),
path.resolve('src/css/algoliaDocSearchTheme.scss'),
path.resolve('static/css/custom.scss'),
path.resolve('static/css/jest.scss'),
path.resolve('static/css/custom.css'),
path.resolve('static/css/jest.css'),
],
},
},
],
],
plugins: [
'docusaurus-plugin-sass',
[
'@docusaurus/plugin-client-redirects',
{
Expand Down
1 change: 0 additions & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"@docusaurus/plugin-pwa": "2.0.0-alpha.c32d8bd11",
"@docusaurus/preset-classic": "2.0.0-alpha.c32d8bd11",
"clsx": "^1.1.1",
"docusaurus-plugin-sass": "^0.1.12",
"fs-extra": "^9.0.1",
"globby": "^11.0.1",
"react": "^17.0.1",
Expand Down
2 changes: 1 addition & 1 deletion website/src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import MarkdownBlock from '@site/src/components/v1/MarkdownBlock';

import UsersJSON from '@site/users.json';

import styles from './index.module.scss';
import styles from './index.module.css';

import GitHubButton from 'react-github-btn';

Expand Down
55 changes: 55 additions & 0 deletions website/src/pages/index.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/* Twitter Follow Button */

.twitter-follow-button {
display: inline-block;
position: relative;
height: 28px;
box-sizing: border-box;
padding: 1px 10px 1px 9px;
background-color: #1b95e0;
color: #fff;
border-radius: 4px;
font-weight: 400;
cursor: pointer;
font-size: 13px;
line-height: 26px;
text-decoration: none;
}

.twitter-follow-button:hover {
color: #fff;
background-color: #0c7abf;
text-decoration: none;
}

.twitter-follow-button--icon {
position: relative;
display: inline-block;
top: 4px;
height: 18px;
width: 18px;
margin-right: 4px;
background: transparent 0 0 no-repeat;
background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2072%2072%22%3E%3Cpath%20fill%3D%22none%22%20d%3D%22M0%200h72v72H0z%22%2F%3E%3Cpath%20class%3D%22icon%22%20fill%3D%22%23fff%22%20d%3D%22M68.812%2015.14c-2.348%201.04-4.87%201.744-7.52%202.06%202.704-1.62%204.78-4.186%205.757-7.243-2.53%201.5-5.33%202.592-8.314%203.176C56.35%2010.59%2052.948%209%2049.182%209c-7.23%200-13.092%205.86-13.092%2013.093%200%201.026.118%202.02.338%202.98C25.543%2024.527%2015.9%2019.318%209.44%2011.396c-1.125%201.936-1.77%204.184-1.77%206.58%200%204.543%202.312%208.552%205.824%2010.9-2.146-.07-4.165-.658-5.93-1.64-.002.056-.002.11-.002.163%200%206.345%204.513%2011.638%2010.504%2012.84-1.1.298-2.256.457-3.45.457-.845%200-1.666-.078-2.464-.23%201.667%205.2%206.5%208.985%2012.23%209.09-4.482%203.51-10.13%205.605-16.26%205.605-1.055%200-2.096-.06-3.122-.184%205.794%203.717%2012.676%205.882%2020.067%205.882%2024.083%200%2037.25-19.95%2037.25-37.25%200-.565-.013-1.133-.038-1.693%202.558-1.847%204.778-4.15%206.532-6.774z%22%2F%3E%3C%2Fsvg%3E);
}

.socialLinks {
position: absolute;
z-index: 1;
top: 10px;
right: 0;
display: flex;
justify-content: flex-end;
max-width: 1200px;
}

.socialLinks > * {
margin-right: 1rem;
}
55 changes: 0 additions & 55 deletions website/src/pages/index.module.scss

This file was deleted.

2 changes: 1 addition & 1 deletion website/src/pages/videos.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Container from '@site/src/components/v1/Container';
import MarkdownBlock from '@site/src/components/v1/MarkdownBlock';

import VideosJSON from '@site/videos.json';
import styles from './videos.module.scss';
import styles from './videos.module.css';

const VideoTypes = {
YOUTUBE: 'youtube',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
text-align: center;
margin: 0 auto;
max-width: 900px;
}

.prose {
margin: 0 auto;
max-width: 560px;
text-align: center;
}
.showcaseSection .prose {
margin: 0 auto;
max-width: 560px;
text-align: center;
}
File renamed without changes.
49 changes: 27 additions & 22 deletions website/static/css/jest.scss → website/static/css/jest.css
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
margin-bottom: 0;
}

/* On mobile, show the screenshot under the body */
/* On mobile, show the screenshot under the body */
@media only screen and (max-width: 780px) {
/* Ensure the consistent order of text first, then image */
.containerV1 .wrapperV1 .imageAlignLeft {
Expand Down Expand Up @@ -302,32 +302,37 @@ body
}
}

// Temporary fix for not ideal Docusaurus 2 layout
// May be removed when we close https://github.com/facebook/docusaurus/issues/4083
.main-wrapper.blog-wrapper .container .row {
// Blog post list
.col.col--2:first-child {
--ifm-col-width: 22%;
div[class^='sidebar'] {
padding-right: 1rem;
}
}
/* Temporary fix for not ideal Docusaurus 2 layout */
/* May be removed when we close https://github.com/facebook/docusaurus/issues/4083 */
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@slorber this is closed - any idea if we can remove the overrides here now?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It depends on whether the default Docusaurrus blog layout satisfy you or not: https://docusaurus.io/blog/2021/01/19/docusaurus-2020-recap

We improved but you may still want to keep custom CSS. Worth removing this and see if it looks good to you.

.main-wrapper.blog-wrapper .container .row .col.col--2:first-child {
--ifm-col-width: 22%;
}

// Center
.col.col--8 {
--ifm-col-width: 62%;
@media only screen and (max-width: 996px) {
--ifm-col-width: 100% !important;
}
}
.main-wrapper.blog-wrapper
.container
.row
/* Blog post list */
.col.col--2:first-child
div[class^='sidebar'] {
padding-right: 1rem;
}

// TOC
.col.col--2:last-child {
--ifm-col-width: 16%;
/* Center */
.main-wrapper.blog-wrapper .container .row .col.col--8 {
--ifm-col-width: 62%;
}
@media only screen and (max-width: 996px) {
.main-wrapper.blog-wrapper .container .row .col.col--8 {
--ifm-col-width: 100% !important;
}
}

// For large screens, make the container a bit larger than Docusaurus default
/* TOC */
.main-wrapper.blog-wrapper .container .row .col.col--2:last-child {
--ifm-col-width: 16%;
}

/* For large screens, make the container a bit larger than Docusaurus default */
@media (min-width: 1650px) {
.container {
max-width: 1500px;
Expand Down
Loading