These are chat archives for Anddward/L_and_W

27th
Jun 2016
Anddward.Liao
@Anddward
Jun 27 2016 07:43
Screen Shot 2016-06-27 at 15.42.18.png
以后 node_modules 不需要加入版本管理
cocowuhuiling
@cocowuhuiling
Jun 27 2016 07:44
我刚才发现了一些小问题
现在在改
Anddward.Liao
@Anddward
Jun 27 2016 07:45
如果觉得ignore不好写,用这个网站生成.gitignore,一般加入 osx,windows,sublimetext,node,bower,vim等标签
Anddward.Liao
@Anddward
Jun 27 2016 07:51
push 了代码,仅仅更换了一些图片而已,同时加入了.gitignore
cocowuhuiling
@cocowuhuiling
Jun 27 2016 07:51
ok
cocowuhuiling
@cocowuhuiling
Jun 27 2016 08:12
This message was deleted
<<<<<<< Updated upstream
    height: 540px;
=======
    height: 492px;
    a {
      height: 100%;
    }
>>>>>>> Stashed changes
Anddward.Liao
@Anddward
Jun 27 2016 08:12
冲突,你等阵sync一下
cocowuhuiling
@cocowuhuiling
Jun 27 2016 08:13
height:540px是你的?
Anddward.Liao
@Anddward
Jun 27 2016 08:14
嗯,刚好16:9
cocowuhuiling
@cocowuhuiling
Jun 27 2016 08:14
ok
Anddward.Liao
@Anddward
Jun 27 2016 08:14
你pull一下就可以了
cocowuhuiling
@cocowuhuiling
Jun 27 2016 08:15
ok
Anddward.Liao
@Anddward
Jun 27 2016 08:22
Screen Shot 2016-06-27 at 16.20.55.png
cocowuhuiling
@cocowuhuiling
Jun 27 2016 08:23
?
Anddward.Liao
@Anddward
Jun 27 2016 08:26
有时间就处理一下这里,图片占据3/4,并且左边与上面的元素对其
waypoint有点问题,我先换下图片,如果你有时间就先看看能不能优化一下,没时间我稍后再处理这个bug
cocowuhuiling
@cocowuhuiling
Jun 27 2016 08:28
Anddward.Liao
@Anddward
Jun 27 2016 08:29
Screen Shot 2016-06-27 at 16.28.25.png
cocowuhuiling
@cocowuhuiling
Jun 27 2016 08:29
waypoint这个问题,我本来想跟你说的
你来处理这个问题吧,因为我想把剩下的所有的响应式的样式问题调好来
cocowuhuiling
@cocowuhuiling
Jun 27 2016 08:50
cocodeMacBook-Pro:zookeProject/Gms-website(master) $ git push origin master                                                                                                      1 ↵
To git@git.coding.net:cocowhl/Gms-website.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'git@git.coding.net:cocowhl/Gms-website.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Anddward.Liao
@Anddward
Jun 27 2016 08:51
git pull
pull 完解决完冲突,再push
cocowuhuiling
@cocowuhuiling
Jun 27 2016 08:53
已解决
我现在有时间做s8的问题了
其他页面的响应式的细节问题基本解决了
cocowuhuiling
@cocowuhuiling
Jun 27 2016 09:27
老公,你有更换s8页面的图片?
Anddward.Liao
@Anddward
Jun 27 2016 10:32
Screen Shot 2016-06-27 at 18.31.30.png
右边的箭头往中间指