Commit Graph

178 Commits

Author SHA1 Message Date
Linda 0629b76705 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-24 17:36:30 +08:00
cxt 8f0a0e94f2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-24 16:28:52 +08:00
Linda 7ae8f91446 新建作业的页面样式有点问题 2017-05-24 15:41:55 +08:00
daiao 46e5fdb8f0 平台底部导航栏固定在平台底部 2017-05-24 14:51:23 +08:00
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
huang 6a3f9673b5 Merge branch 'dev_cxt' into develop 2017-05-23 19:04:50 +08:00
Linda a61e20ba07 身份认证的步骤样式不够理想,请参照修改 2017-05-23 18:59:58 +08:00
Linda 6fdf7aaf97 登录注册页的背景色被划分成两块了,请取消 2017-05-23 17:25:14 +08:00
Linda b0c3e53318 顶部导航栏的搜索下拉选项的样式调整 2017-05-23 17:23:39 +08:00
Linda eb80de9b96 实训重置代码按钮点击后出现的弹框,文字大小不一致? 2017-05-23 17:07:26 +08:00
Linda 3d643550e5 课程的图片“更换图片”应该是鼠标悬浮样式,而不是始终显示 2017-05-23 16:15:49 +08:00
Linda 0931d17c14 激活账号提示页的底部按钮样式需要调整 2017-05-23 15:41:04 +08:00
cxt 1e8a36a8d2 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/student_work/show.html.erb
2017-05-23 15:32:16 +08:00
Linda b522988329 实训项目的首页头部,请调整按钮位置 2017-05-23 15:24:40 +08:00
Linda 94da0f9bb7 班级作业列表的标签和菜单icon没有居中 2017-05-23 15:19:05 +08:00
cxt 935922b365 普通、编程、分组作业的提交和编辑 2017-05-23 15:18:53 +08:00
Linda 632f701c01 班级设置页的基本信息,输入框的边距太大 2017-05-23 14:51:29 +08:00
Linda d72aaff892 班级动态的内容显示也需要增加宽度 2017-05-23 14:34:38 +08:00
Linda ccec3e7c35 班级头部的邀请码可以突出显示 2017-05-23 14:34:06 +08:00
Linda bdea0c45bc 作业、通知、留言动态的小齿轮及其菜单样式请替换成最新样式">作业、通知、留言动态的小齿轮及其菜单样式请替换成最新样式 2017-05-23 14:33:25 +08:00
Linda 14f5cc3ddb 课程教师团队的添加弹框样式出问题了 2017-05-23 10:37:32 +08:00
Linda 7d4a392310 平台首页的顶部导航栏与内页的导航栏没有一致 2017-05-23 10:25:23 +08:00
Linda 7b32872358 班级宽度调整为1200px 2017-05-22 15:22:24 +08:00
huang 61f2f632ca Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/homework_common/index.html.erb
	app/views/layouts/base_edu.html.erb
2017-05-22 11:14:18 +08:00
cxt f46bd2ac06 新版作业 2017-05-22 10:29:51 +08:00
huang 7ad005d28e 合作者提供删除功能 2017-05-19 17:14:15 +08:00
daiao 0f488e82e0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:45:21 +08:00
daiao 9c801959fb 我的主页课堂列表与课程页列表添加切换列表事件 2017-05-19 16:44:57 +08:00
Linda a0d76041cd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:04:50 +08:00
Linda 006fec71a7 智能课堂的首页,请按照游戏实训优化整体效果 2017-05-19 16:04:30 +08:00
Linda 87ceaca558 实训项目的统计页显示错乱 2017-05-19 15:07:26 +08:00
daiao 3d48973cfc 新版身份认证审批 2017-05-19 14:46:45 +08:00
Linda a7629ddc69 班级设置页的基本信息,输入框的边距太大 2017-05-19 14:09:47 +08:00
Linda 2f0b7cac4a 主页的快速入口为空时,右侧的下拉菜单无法使用 2017-05-19 11:15:29 +08:00
Linda 170314cfb2 个人主页的“+开始”的菜单选项样式应该与其它新页面相同 2017-05-19 10:49:26 +08:00
Linda d9a91a2963 个人主页悬浮课堂列表时,不应该班级和课程名称同时变色 2017-05-19 10:33:27 +08:00
Linda 1783520660 课程资源库发送样式修改 2017-05-18 17:11:49 +08:00
Linda f28dd26212 课程首页边距过高样式修改 2017-05-18 17:05:35 +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
daiao aa0ed21b8c Merge branch 'dev_daiao' into develop 2017-05-18 14:26:40 +08:00
daiao e0a4a9b1ab TMP新增预备知识页面,新建/配置加入预备知识MD 2017-05-18 11:30:29 +08:00
daiao 08c4c7ee79 实训新建页面 2017-05-17 17:19:16 +08:00
Linda 2e4714362e 课程题库标题超过宽度出现滚动条修改 2017-05-17 16:33:16 +08:00
Linda 860a20448f 课程资源库标题和人名颜色修改 2017-05-17 16:09:16 +08:00
daiao 6a457698be TMP列表经验值没有对齐 2017-05-17 15:13:39 +08:00
Linda 530bf295cc 我的主页查看更多位置修改 2017-05-17 14:26:55 +08:00