 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 |
|
miss
|
3e4d4a7ce0
|
拖拽效果的增加
|
2017-07-21 21:50:50 +08:00 |
|
daiao
|
06f73b6c82
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/courses/index.html.erb
app/views/shixuns/_form.html.erb
|
2017-07-21 10:00:45 +08:00 |
|
caishi
|
21f0be3a26
|
修改的部分Issues，样式问题
|
2017-07-18 11:12:33 +08:00 |
|
caishi
|
d53a607157
|
TPI添加评论Tab
|
2017-07-18 08:45:33 +08:00 |
|
daiao
|
4ce68786b9
|
顶部导航栏恢复上个版本的灰色
|
2017-07-17 16:24:22 +08:00 |
|
caishi
|
06032119fd
|
课程实训首页以及弹框的页面
|
2017-07-11 09:11:42 +08:00 |
|
daiao
|
9c47800348
|
实训tpi页面选中tab时字体颜色改为#bfbfbf，且命令行不应该有白边框和滚动条
|
2017-07-07 21:32:01 +08:00 |
|
cxt
|
5ba8c73f1b
|
实训首页的搜索
|
2017-07-07 16:17:45 +08:00 |
|
cxt
|
7b9c59d6e8
|
基础数据加上“专业”、“课程”，实训的适用专业和课程
|
2017-07-06 17:52:59 +08:00 |
|
daiao
|
b6af847a4a
|
实训的“已关闭”是状态，不是按钮，请去除鼠标手和悬浮效果
|
2017-06-30 16:53:08 +08:00 |
|
daiao
|
93349b3484
|
项目实训首页排序文字精简
|
2017-06-29 17:38:10 +08:00 |
|
daiao
|
058b7e1d7d
|
统一确认弹框的公共样式
|
2017-06-28 10:05:23 +08:00 |
|
daiao
|
ff2a509a9f
|
顶部导航栏的调整（背景色和头像）
|
2017-06-27 14:04:08 +08:00 |
|
daiao
|
f59e7952b3
|
实训TPI的全部任务页面，关卡状态显示不够明显
|
2017-06-23 09:56:31 +08:00 |
|
daiao
|
cf73698051
|
实训TPI参考答案与过关任务无法进行复制
|
2017-06-09 17:24:49 +08:00 |