This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new be2c62c modified: homePage mousemove && community module delete
repeat message (#417)
be2c62c is described below
commit be2c62c338c298995d6d59602ea3d44fcac8c490
Author: jujuAnna <[email protected]>
AuthorDate: Thu Aug 19 08:53:52 2021 +0800
modified: homePage mousemove && community module delete repeat message
(#417)
* modified: homePage mousemove && community module delete repeat message
* Delete comment
Co-authored-by: zhuyan02 <[email protected]>
---
site_config/blog.js | 6 +++---
site_config/community.jsx | 26 ++++++++------------------
site_config/docs1-3-6.js | 2 +-
site_config/site.js | 4 ++--
src/components/header/index.jsx | 2 +-
src/components/header/index.scss | 7 +++++--
src/pages/community/index.jsx | 22 ----------------------
src/pages/community/index.scss | 4 +++-
8 files changed, 23 insertions(+), 50 deletions(-)
diff --git a/site_config/blog.js b/site_config/blog.js
index a98d6c8..746b5dd 100644
--- a/site_config/blog.js
+++ b/site_config/blog.js
@@ -25,7 +25,7 @@ export default {
dateStr: '2021-03-20',
desc: 'Apache Dolphin Scheduler(Incubating) will organize a meetup in
Shanghai 2019.10.26. Welcome to register.',
link: '/en-us/blog/FAQ.html',
- },
+ },
{
title: 'Apache Dolphin Scheduler(Incubating) Meetup 2019.10 Shanghai',
author: 'William',
@@ -69,7 +69,7 @@ export default {
dateStr: '2021-05-29',
desc: 'DolphinScheduler 核心之 DAG 大 JSON 拆分始末',
link: '/zh-cn/blog/dolphinscheduler_json.html',
- },
+ },
{
title: '为什么要把 DolphinScheduler 工作流定义中保存任务及关系的大 json 给拆了?',
author: '进勇',
@@ -117,7 +117,7 @@ export default {
desc: 'Apache Dolphin Scheduler(Incubating)
将于2019年10月26日在上海组织一次会议，欢迎踊跃报名。 ',
link: '/zh-cn/blog/meetup_2019_10_26.html',
},
-
+
],
},
};
diff --git a/site_config/community.jsx b/site_config/community.jsx
index 1c676ae..1933cd8 100644
--- a/site_config/community.jsx
+++ b/site_config/community.jsx
@@ -5,15 +5,6 @@ export default {
barText: 'Community',
sidemenu: [
{
- title: 'Community News',
- children: [
- {
- title: 'Community News',
- link: '/en-us/community/index.html',
- },
- ],
- },
- {
title: 'Team',
children: [
{
@@ -67,6 +58,10 @@ export default {
title: 'Code of Conduct',
link: '/en-us/community/development/code-conduct.html',
},
+ {
+ title: 'Contributor Guide',
+ link: '/en-us/community/contributor-guide.html',
+ },
],
},
{
@@ -211,15 +206,6 @@ export default {
barText: '社区',
sidemenu: [
{
- title: '社区动态',
- children: [
- {
- title: '社区动态',
- link: '/zh-cn/community/index.html',
- },
- ],
- },
- {
title: '团队',
children: [
{
@@ -273,6 +259,10 @@ export default {
title: '行为准则',
link: '/zh-cn/community/development/code-conduct.html',
},
+ {
+ title: '贡献者指南',
+ link: '/zh-cn/community/contributor-guide.html',
+ },
],
},
{
diff --git a/site_config/docs1-3-6.js b/site_config/docs1-3-6.js
index 6fe277c..52d4578 100644
--- a/site_config/docs1-3-6.js
+++ b/site_config/docs1-3-6.js
@@ -77,7 +77,7 @@ export default {
],
},
{
- title: "Integration",
+ title: 'Integration',
children: [
{
title: 'Ambari Integration',
diff --git a/site_config/site.js b/site_config/site.js
index 0656991..1673917 100644
--- a/site_config/site.js
+++ b/site_config/site.js
@@ -98,7 +98,7 @@ export default {
{
key: 'community',
text: 'COMMUNITY',
- link: '/en-us/community/index.html',
+ link: '/en-us/community/team.html',
},
{
key: 'ASF',
@@ -311,7 +311,7 @@ export default {
{
key: 'community',
text: '社区',
- link: '/zh-cn/community/index.html',
+ link: '/zh-cn/community/team.html',
},
{
key: 'ASF',
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 9d09818..4e58b41 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -222,7 +222,7 @@ class Header extends React.Component {
</span>
}
>
- <Menu.ItemGroup>
+ <Menu.ItemGroup className="showUL">
{item.children.map(items => (
<Menu.Item key={items.key} ><a href={getLink(items.link)}
target={items.target || '_self'}>{items.text}</a></Menu.Item>
))}
diff --git a/src/components/header/index.scss b/src/components/header/index.scss
index 8597162..f550732 100644
--- a/src/components/header/index.scss
+++ b/src/components/header/index.scss
@@ -8,7 +8,9 @@
.ant-menu-submenu-title {
padding: 0 15px !important;
}
-
+.ant-menu-submenu-hidden {
+ display: none;
+}
.header-container {
position: fixed;
left: 0;
@@ -91,7 +93,7 @@
opacity:0.6;
font-family: Avenir-Medium;
}
- }
+ }
}
}
.blackClass {
@@ -280,6 +282,7 @@
}
}
+
@media screen and (max-width: $mobileWidth) {
.header-container {
.header-body {
diff --git a/src/pages/community/index.jsx b/src/pages/community/index.jsx
index 7593c51..82f5097 100644
--- a/src/pages/community/index.jsx
+++ b/src/pages/community/index.jsx
@@ -4,9 +4,6 @@ import Language from '../../components/language';
import Header from '../../components/header';
import Footer from '../../components/footer';
import Sidemenu from '../../components/sidemenu';
-import Slider from '../../components/slider';
-import EventCard from './eventCard';
-import ContactItem from './contactItem';
import ContributorItem from './contributorItem';
import communityConfig from '../../../site_config/community.jsx';
import './index.scss';
@@ -27,25 +24,6 @@ class Community extends Language {
<section className="content-section">
<Sidemenu dataSource={dataSource.sidemenu} />
<div className="doc-content markdown-body">
- <section className="events-section">
- <h3>{dataSource.events.title}</h3>
- <Slider>
- {dataSource.events.list.map((event, i) => (
- <EventCard event={event} key={i} />
- ))}
- </Slider>
- </section>
- <section className="contact-section">
- <h3>{dataSource.contacts.title}</h3>
- <p>{dataSource.contacts.desc}</p>
- <div className="contact-list">
- {
- dataSource.contacts.list.map((contact, i) => (
- <ContactItem contact={contact} key={i} />
- ))
- }
- </div>
- </section>
<section className="contributor-section">
<h3>{dataSource.contributorGuide.title}</h3>
<p>{dataSource.contributorGuide.desc}</p>
diff --git a/src/pages/community/index.scss b/src/pages/community/index.scss
index e21caeb..2036cf5 100644
--- a/src/pages/community/index.scss
+++ b/src/pages/community/index.scss
@@ -147,7 +147,9 @@
font-size: 36px;
color: #333;
text-align: center;
- margin: 0 0 12px;
+ margin: 0 0 20px;
+ border-bottom: 1px solid #eaecef;
+ padding-bottom: 10px;
}
p {
font-family: Avenir-Medium;
