Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
21,470 Commits 2 Branches 0 Tags 163 MiB
Commit Graph

121 Commits

Author SHA1 Message Date
caishi a5124c9952 TPI加载效果 2017-08-18 16:21:32 +08:00
caishi 0d48f328e7 Merge branch 'dev_cs' into develop 2017-08-18 15:25:50 +08:00
caishi d478b297cb 实训配置页隐藏提示，icon移入效果 2017-08-18 15:24:47 +08:00
daiao 1ddac249e2 Merge branch 'dev_TPI' into develop 
Conflicts:
	public/stylesheets/css/edu-common.css
	public/stylesheets/css/taskstyle.css
 2017-08-18 14:03:05 +08:00
caishi 5922513e27 实训套件页面改版（未完成，已注释） 2017-08-18 10:45:12 +08:00
daiao da1e4c2b5d Merge branch 'develop' into dev_TPI 
Conflicts:
	app/controllers/games_controller.rb
	app/controllers/shixuns_controller.rb
	app/views/games/_code_actions.html.erb
	app/views/games/_repository.html.erb
	public/javascripts/application.js
	public/stylesheets/css/taskstyle.css
 2017-08-17 14:42:26 +08:00
caishi 7cc1b2426f Issues修改 2017-08-17 10:29:54 +08:00
caishi b0dbc2dce8 镜像管理页、以及部分Issues的修改 2017-08-16 11:22:40 +08:00
miss e5e56bf8a3 加载样式修改 2017-08-16 11:06:55 +08:00
caishi d3df2a8ab5 图片太大加载慢，修改样式 2017-08-11 18:44:22 +08:00
caishi d5a0492914 新增加载等待的样式 2017-08-11 17:21:42 +08:00
caishi c1b512a3be 全部任务列表增加经验值、金币的信息 2017-08-11 15:10:51 +08:00
caishi 4a217fd38a 班级、课程页面改版 2017-08-10 09:21:48 +08:00
caishi 013724be30 实训的编辑区域加宽，左右留白太多 
实训的列表中显示信息位置调整
实训首页只有一排数据时，页面滑动到最下面后把鼠标移动到数据上会引起筛选处向下动
 2017-08-07 11:01:11 +08:00
caishi 218d0502ac TPI选项卡默认选中的字体颜色 2017-08-06 11:18:42 +08:00
daiao a8891d3d4f Merge branch 'dev_daiao' into develop 
Conflicts:
	public/stylesheets/css/edu-public.css
 2017-08-04 14:11:26 +08:00
caishi ff50a90e44 个人成长记录中心页面（还有金币图片） 
班级动态点赞后“赞”的字会移到左边
样式修改
 2017-08-04 09:52:13 +08:00
caishi 6e060b955e 全部实训加一个已发布的三角形 2017-08-02 15:32:04 +08:00
caishi 8c20db0e64 TPI实训评论tab修改 2017-08-02 14:28:52 +08:00
miss 56c25b5cd6 拖拽线的修改 2017-08-02 14:17:38 +08:00
caishi 56d520c569 实训套件界面修改，以及tab样式的公用 2017-08-01 08:57:44 +08:00
caishi 2df90b3376 Merge branch 'dev_cs' into develop 
Conflicts:
	public/stylesheets/css/edu-common.css
 2017-07-31 17:13:05 +08:00
miss 55b5b7fd03 拖拽留白区域的解决 
tip样式的完善
 2017-07-31 16:12:24 +08:00
caishi c0f15945a7 选择题tpi页面固定单行高度，但是内容过多时，框内边距应该是10px 
实训首页和实训套件首页的最新排序和最热排序的点击范围需要扩大，目前是点击字才会有效果
实训配置页面的简介颜色与其他不一致，应该为#888
 2017-07-31 12:09:41 +08:00
miss 466ddd05d2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 17:04:04 +08:00
miss 6093437889 拖拽版面比例的修改。实训列表的tip样式修改 2017-07-28 17:03:12 +08:00
caishi 81b74c879a 选择题样式问题 2017-07-28 16:25:17 +08:00
daiao 804c2ed76a Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/games/_game_show.html.erb
 2017-07-28 15:08:46 +08:00
miss e7fa442c44 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 14:46:03 +08:00
miss 8e7c1b907e 拖拽功能的修改。 
实训页面的tip修改
 2017-07-28 14:44:51 +08:00
caishi 2c1ad468e4 作品评阅、作业编辑、作业设置、作业详情、作业补交、提交作业页面各版块需要加上阴影 
班级页面固定弹框高度
更换tab公共样式背景色
 2017-07-28 10:28:51 +08:00
caishi f805839a55 TPI评论区样式修改 
添加答题选项的tab
 2017-07-27 12:44:40 +08:00
cxt e81bd33dea Merge branch 'dev_cs' into develop 2017-07-26 19:41:52 +08:00
caishi 4330284827 1.新建TPM的页面隐藏显示“预备知识”编辑块 
2.实训首页隐藏tab整页“预备知识”
 2017-07-26 19:34:27 +08:00
cxt 393a80aaa2 Merge branch 'dev_cs' into develop 2017-07-26 17:42:57 +08:00
miss 75d3b92bac Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-26 15:49:38 +08:00
miss 32b4ba9a5f 拖拽线的优化 
拖拽比例的调整
 2017-07-26 15:48:09 +08:00
caishi 7522ed948d 对应任务的icon 2017-07-26 15:47:34 +08:00
caishi fc7b2b5945 新建实训关卡入口 2017-07-26 14:42:39 +08:00
caishi 055296bdf4 Merge branch 'develop' into dev_cs 2017-07-26 14:20:27 +08:00
caishi c71df99869 本关任务添加选择题的显示 2017-07-26 14:19:02 +08:00
miss 9961fcf511 拖拽调整 2017-07-26 14:18:42 +08:00
caishi f0043373e7 新建阶段添加单选多选的设置 2017-07-26 11:18:23 +08:00
daiao 32c3a9ea70 tpi拖动 2017-07-26 11:16:16 +08:00
daiao a4050c6da9 TPI拖拽 2017-07-26 10:21:38 +08:00
miss 5b284c8892 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-26 10:08:39 +08:00
miss 37b908771c 拖拽的修改。样式的调整 2017-07-26 10:06:27 +08:00
caishi 5d3637a25b Merge branch 'develop' into dev_cs 
Conflicts:
	app/views/courses/index.html.erb
	app/views/layouts/_unlogin_header.html.erb
 2017-07-23 16:56:35 +08:00
caishi aabec8b8f0 一些修改 2017-07-23 16:54:26 +08:00
miss e7d07cd366 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-21 21:55:58 +08:00