 cxt
|
a944456e57
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/subjects/_subject_list.html.erb
|
2017-08-25 16:13:46 +08:00 |
 miss
|
064a62d881
|
实训套件和在线课堂首页的tip样式与实训首页的tip样式保持一致
实训TPI的评论区，评论换行后右侧的按钮应该始终显示在底部
|
2017-08-25 15:20:27 +08:00 |
 caishi
|
d854c7aa5b
|
实训课程页面修改
|
2017-08-25 14:35:37 +08:00 |
|
cxt
|
e884b0285a
|
Merge branch 'dev_cs' into dev_cxt
|
2017-08-24 18:27:57 +08:00 |
|
caishi
|
55392a29b3
|
实训课程页面改版
|
2017-08-24 17:36:49 +08:00 |
 daiao
|
0e456edf98
|
实训tpi页面，点击评测，在等待时间中点击全部任务，然后关闭弹出通过成功的提示，页面会有点样式性问题，点击网页后又恢复正常
|
2017-08-24 14:38:43 +08:00 |
|
miss
|
404098149e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/views/games/_repository.html.erb
|
2017-08-23 15:20:51 +08:00 |
|
miss
|
6ccd257f5a
|
缺省的测试区域不正常（360兼容问题）
tip颜色的修改
|
2017-08-23 15:02:04 +08:00 |
 XuCheng642
|
ce362108f5
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-23 09:25:00 +08:00 |
|
XuCheng642
|
bf01c1b4a8
|
issue的修改
|
2017-08-23 09:24:32 +08:00 |
|
daiao
|
55a1367b8a
|
新建和编辑关卡的时候，点击代码库弹框后，页面被滚动置顶部了
|
2017-08-22 16:11:56 +08:00 |
|
miss
|
720b138631
|
平台tip的进一步优化，解决加载之后的tip事件不执行
|
2017-08-22 14:17:47 +08:00 |
|
miss
|
c24374393b
|
tip样式层级的修改
|
2017-08-20 09:57:15 +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 |
|
cxt
|
0d6746b5c2
|
Merge branch 'dev_xucheng' into develop
|
2017-08-18 14:01:10 +08:00 |
|
caishi
|
4ecca2df04
|
Merge branch 'dev_cs' into develop
|
2017-08-18 13:59:12 +08:00 |
|
caishi
|
bc71a63eb6
|
边框阴影以及加载框里字体颜色
|
2017-08-18 10:59:10 +08:00 |
|
caishi
|
5922513e27
|
实训套件页面改版（未完成，已注释）
|
2017-08-18 10:45:12 +08:00 |
|
XuCheng642
|
01bc990770
|
超级管理员页面功能修改
|
2017-08-18 09:41:06 +08:00 |
|
miss
|
bd08eee523
|
平台Tip样式的更换
|
2017-08-17 17:33:38 +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 |
|
miss
|
eabdc8c8cc
|
样式修改
|
2017-08-16 08:56:49 +08:00 |
|
caishi
|
49d5d648c3
|
在线课堂的首页加入课堂和新建入口的间隔调整
课程页面显示效果调整存在缺陷
|
2017-08-15 09:20:46 +08:00 |
|
caishi
|
1b6a9d1bd5
|
添加最小高度
|
2017-08-10 16:08:50 +08:00 |
|
caishi
|
4a217fd38a
|
班级、课程页面改版
|
2017-08-10 09:21:48 +08:00 |
|
caishi
|
67975be61f
|
全部实训、实训套件、在线课堂头部渐变色改为图片，同时将新建按钮下移
|
2017-08-07 16:14:08 +08:00 |
|
caishi
|
013724be30
|
实训的编辑区域加宽，左右留白太多
实训的列表中显示信息位置调整
实训首页只有一排数据时，页面滑动到最下面后把鼠标移动到数据上会引起筛选处向下动
|
2017-08-07 11:01:11 +08:00 |
|
caishi
|
1f0a34babf
|
我的关注新页加最小高度
实训套件中拖拽实训模块应该用拖拽的手势，而不是点击手势
技能勋章添加第一个标签时回车会整个页面刷新
|
2017-08-06 17:14:55 +08:00 |
|
caishi
|
755214f92a
|
认证页面样式
issues修改
|
2017-08-04 19:25:12 +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 |
|
cxt
|
c25b584898
|
实名认证和职业认证
|
2017-08-04 11:20:28 +08:00 |
|
caishi
|
ff50a90e44
|
个人成长记录中心页面（还有金币图片）
班级动态点赞后“赞”的字会移到左边
样式修改
|
2017-08-04 09:52:13 +08:00 |
|
caishi
|
6e060b955e
|
全部实训加一个已发布的三角形
|
2017-08-02 15:32:04 +08:00 |
|
caishi
|
8e77e4b43a
|
样式修改
|
2017-08-01 10:40:38 +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 |
|
caishi
|
389e76dcd7
|
issue修改
|
2017-07-31 17:09:58 +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 |
|
cxt
|
8f995d7b46
|
Merge branch 'dev_cxt' into develop
|
2017-07-28 17:00:27 +08:00 |
|
cxt
|
f82b8f0e20
|
班级讨论区的上线
|
2017-07-28 16:59:17 +08:00 |
|
caishi
|
a506fd76ca
|
增加icon，修改样式
|
2017-07-28 16:53:44 +08:00 |
|
caishi
|
81b74c879a
|
选择题样式问题
|
2017-07-28 16:25:17 +08:00 |
|
daiao
|
70c016ad07
|
Merge branch 'dev_cs' into dev_daiao
Conflicts:
public/stylesheets/css/edu-common.css
|
2017-07-28 14:10:08 +08:00 |
|
caishi
|
2c1ad468e4
|
作品评阅、作业编辑、作业设置、作业详情、作业补交、提交作业页面各版块需要加上阴影
班级页面固定弹框高度
更换tab公共样式背景色
|
2017-07-28 10:28:51 +08:00 |
|
daiao
|
9b4478d629
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-27 14:45:34 +08:00 |