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

Juzhiyuan #519

Merged
merged 8 commits into from
May 24, 2018
Merged

Juzhiyuan #519

merged 8 commits into from
May 24, 2018

Conversation

juzhiyuan
Copy link

@juzhiyuan juzhiyuan commented May 23, 2018

  • 首页添加了 概述
  • 首页添加了 焦点图
  • 首页添加了 介绍

@juzhiyuan juzhiyuan closed this May 23, 2018
@juzhiyuan juzhiyuan changed the base branch from dev to feature/cn-site May 23, 2018 09:23
@juzhiyuan juzhiyuan reopened this May 23, 2018
@S1ngS1ng
Copy link
Contributor

S1ngS1ng commented May 24, 2018

image

@wudifeixue Either we update it EVERY SINGLE YEAR, or it's time to remove this challenge 🤦‍♂️

@juzhiyuan
Copy link
Author

I just modified two files: index.html & index.css

@S1ngS1ng
Copy link
Contributor

S1ngS1ng commented May 24, 2018

@juzhiyuan 我这里获取不到你的改动。你有没有 push 呢?

@juzhiyuan
Copy link
Author

juzhiyuan commented May 24, 2018

@S1ngS1ng 有的,并且提交PR了。但是我没有点击Merge,这个事情应该由专人负责的吧。

@juzhiyuan
Copy link
Author

image

Copy link
Contributor

@S1ngS1ng S1ngS1ng left a comment

Choose a reason for hiding this comment

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

先把最后那行删了吧,别的问题不大~

<a href="#" class="btn">点击进入&nbsp;>&nbsp;></a>
</div>
<div class="right">
<img src="https://staticfile.shaoyaoju.org/20180523/地图2.png" alt="">
Copy link
Contributor

Choose a reason for hiding this comment

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

这几个图,后续会换成图标 + 文字的形式吧?现在看着很模糊。
image

</body>

</html>
No newline at end of file
Copy link
Contributor

Choose a reason for hiding this comment

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

感觉这一行像是 lint tool 加上的。删掉换成空行就好了


<body>
<div id="root">
<header>顶部菜单栏</header>
Copy link
Contributor

Choose a reason for hiding this comment

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

这个,还有 “底部区域”,“课程大纲” 那些都是暂时放在这儿占位的吧?

<img src="https://staticfile.shaoyaoju.org/20180523/%E7%BC%96%E7%A8%8B%E7%95%8C%E9%9D%A22.png" alt="">
</div>
</div>
<div class="swiper-slide">
Copy link
Contributor

Choose a reason for hiding this comment

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

移动端,怕是不太友好😂
image
咱们还需要处理这个么?

@juzhiyuan
Copy link
Author

@S1ngS1ng 航哥说不用管移动端;最后一行是 @chj-damon 写框架的时候留在上面的;图像会更换掉的;课程大纲、底部区域等由其他人负责。

@S1ngS1ng
Copy link
Contributor

@juzhiyuan 好的 👍

@Becavalier Becavalier requested review from jhonny-me and removed request for Becavalier May 24, 2018 08:07
@chj-damon chj-damon merged commit c96d2cf into FreeCodeCampChina:feature/cn-site May 24, 2018
@juzhiyuan juzhiyuan deleted the juzhiyuan branch May 24, 2018 12:11
@wudifeixue
Copy link
Contributor

@S1ngS1ng I think we should just remove the Friendly Date Challenge, first, it's not friendly at all, second, the English one has already removed it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants