Skip to content

docs(en): merge gulp into docschina/cn @ c4cd0a27 #1

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.

Sign up for GitHub

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

Open
docschina-bot wants to merge 5 commits into
base: cn
Choose a base branch
from
Open

docs(en): merge gulp into docschina/cn @ c4cd0a27 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c6a91f
Add Decojent as a new org sponsor (#124)
phated Jul 29, 2020
8ae19df
Add a package-lock because docusaurus had breaking changes
phated Jul 28, 2020
8274253
Utilize OneGraph to join GitHub Sponsors & OpenCollective
phated Jul 28, 2020
c4cd0a2
Merge branch 'source' of https://github.com/gulpjs/gulpjs.github.io i…
docschina-bot Aug 3, 2020
2082002
docs(en): merging all conflicts
docschina-bot Aug 7, 2020
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ yarn-error.log*
*.log

# lock
package-lock.json
yarn.lock

# generated
Expand Down
2 changes: 1 addition & 1 deletion .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
package-lock=false
package-lock=true
loglevel=error
55 changes: 46 additions & 9 deletions docusaurus.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,26 @@ module.exports = {
target: '_self',
},
links: [
<<<<<<< HEAD
{ to: 'docs/cn/getting-started/quick-start',
label: 'Get Started',
position: 'left',
},
{ to: 'docs/cn/api/concepts',
=======
{
to: 'docs/en/getting-started/quick-start',
label: 'Get Started',
position: 'left',
},
{
to: 'docs/en/api/concepts',
>>>>>>> c4cd0a27692d606fdb2328c59eb0231c959c17f1
label: 'API',
position: 'left',
},
{ to: 'plugins',
{
to: 'plugins',
label: 'Plugins',
position: 'left',
},
Expand All @@ -45,14 +56,16 @@ module.exports = {
position: 'left',
emphasis: true,
},
{ href: 'https://twitter.com/gulpjs',
{
href: 'https://twitter.com/gulpjs',
logo: {
alt: 'Gulp on Twitter',
src: 'img/twitter.svg',
},
position: 'right'
},
{ href: 'https://medium.com/gulpjs',
{
href: 'https://medium.com/gulpjs',
logo: {
alt: 'The gulp blog',
src: 'img/medium.svg',
Expand All @@ -63,29 +76,44 @@ module.exports = {
},
footer: {
links: [
{ items: [
{
items: [
{ html: '<img src="/img/gulp-white-logo.svg" alt="gulp" href="/" />' }
]
},
{ title: 'Docs',
{
title: 'Docs',
items: [
<<<<<<< HEAD
{ to: 'docs/cn/getting-started/quick-start',
label: 'Getting Started',
},
{ to: 'docs/cn/api/concepts',
=======
{
to: 'docs/en/getting-started/quick-start',
label: 'Getting Started',
},
{
to: 'docs/en/api/concepts',
>>>>>>> c4cd0a27692d606fdb2328c59eb0231c959c17f1
label: 'API',
},
]
},
{ title: 'Community',
{
title: 'Community',
items: [
{ href: 'https://github.com/gulpjs/gulp',
{
href: 'https://github.com/gulpjs/gulp',
label: 'GitHub',
},
{ href: 'https://stackoverflow.com/questions/tagged/gulp',
{
href: 'https://stackoverflow.com/questions/tagged/gulp',
label: 'Stack Overflow',
},
{ href: 'https://twitter.com/gulpjs',
{
href: 'https://twitter.com/gulpjs',
label: 'Twitter',
}
]
Expand Down Expand Up @@ -164,6 +192,15 @@ module.exports = {
flexBasis: '80px',
},
},
{
href: 'https://www.decojent.com',
src: 'sponsor-logos/decojent.svg',
alt: 'Decojent logo',
title: 'Decojent',
style: {
flexBasis: '100px'
}
}
]
},
stylesheets: [
Expand Down
Loading