Commit Graph

19 Commits

Author SHA1 Message Date
cxt 55e04d2886 作业详情页的回复 2017-05-24 10:49:33 +08:00
Linda b0526b50d9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:02:40 +08:00
Linda 1ac90b3d42 智能课堂首页的筛选块显示样式调整 2017-05-23 19:25:34 +08:00
huang 128d840037 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 19:05:19 +08:00
Linda 6fdf7aaf97 登录注册页的背景色被划分成两块了,请取消 2017-05-23 17:25:14 +08:00
Linda b0c3e53318 顶部导航栏的搜索下拉选项的样式调整 2017-05-23 17:23:39 +08:00
Linda 7d4a392310 平台首页的顶部导航栏与内页的导航栏没有一致 2017-05-23 10:25:23 +08:00
cxt f46bd2ac06 新版作业 2017-05-22 10:29:51 +08:00
cxt b74570f517 Merge branch 'develop' into dev_cxt
Conflicts:
	app/views/homework_common/index.html.erb
	app/views/layouts/base_courses.html.erb
	public/stylesheets/css/edu-public.css
2017-05-18 15:44:57 +08:00
cxt 45fecb8b8d 新建作业和作业设置 2017-05-18 15:39:53 +08:00
Linda d0b827019a 班级设置界面美化 2017-05-16 10:39:37 +08:00
Linda e5ba9d97d3 Merge branch 'dev_linda' into develop 2017-05-12 09:27:00 +08:00
Linda 2ee7206c45 edu首页头部底部在手机浏览情况下缺失修改 2017-05-12 09:21:29 +08:00
daiao 8ab53dd0b5 顶部导航栏的搜索框,请拉宽一点,保证提示文字显示全 2017-05-10 09:47:48 +08:00
cxt 3fdec893c9 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/layouts/base_edu.html.erb
	public/stylesheets/css/edu-public.css
2017-05-05 19:37:29 +08:00
cxt 6fe571cc99 课程资源库和课程题库 2017-05-05 19:36:32 +08:00
cxt e810d93491 课程资源库 2017-05-03 10:10:27 +08:00
cxt 0188d09454 Merge branch 'dev_cxt' into develop
Conflicts:
	app/views/layouts/new_base.html.erb
	public/stylesheets/css/edu-public.css
2017-04-28 22:55:45 +08:00
cxt 60d33cf661 课程首页(除课程资源库和课程题库) 2017-04-28 22:53:34 +08:00