From 23c65d4c57880737bded409842b9eaf81f295039 Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Thu, 1 Jun 2017 16:28:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E7=9A=84=E5=9D=97=E7=8A=B6=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E5=9C=A8=E6=9C=80=E5=90=8E=E4=B8=80=E5=88=97=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E6=96=B9=E7=9A=84=E5=9D=97=E5=9D=97=E4=BC=9A?= =?UTF-8?q?=E9=94=99=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shixuns/_shixun_list.html.erb | 7 +------ app/views/shixuns/index.html.erb | 2 +- public/stylesheets/css/taskstyle.css | 5 +++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/views/shixuns/_shixun_list.html.erb b/app/views/shixuns/_shixun_list.html.erb index c97194657..fe4ab7e72 100644 --- a/app/views/shixuns/_shixun_list.html.erb +++ b/app/views/shixuns/_shixun_list.html.erb @@ -1,6 +1,5 @@ <% @shixuns.each do |shixun| %>
-

<%= shixun.name %> @@ -11,17 +10,13 @@

<%= shixun.language == "JDBC" ? "Java/SQL" : shixun.language %> - -
-
- +
-
<% end %> diff --git a/app/views/shixuns/index.html.erb b/app/views/shixuns/index.html.erb index e0991efe6..e1d1acca3 100644 --- a/app/views/shixuns/index.html.erb +++ b/app/views/shixuns/index.html.erb @@ -55,7 +55,7 @@

-
+
<%= render "shixun_list" %>
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index 567a36692..7a45d818f 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -214,10 +214,11 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f .task-index-head-info li{ width:100px; float: left; text-align: center; color:#666;} .task-index-list{ width: 1200px;} -.task-index-list-box{ width:25%; } +.task-index-list-box{ width:23.7%;margin: 0 1.5% 1.5% 0px; border-radius:2px; border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; } .task-index-list-box:hover{-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1; } +.task-index-list-box:nth-child(4n+0) {margin: 0 0 1.5% 0;} .task-mg8{ margin:0 15px 15px 0px; border-radius:2px; border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; } -.task-index-list-box-top{padding:16px; padding-top:30px; background:#fff; text-align: center; position:relative;} +.task-index-list-box-top{padding:16px; padding-top:30px; background:#fff; text-align: center; position:relative; height: 160px;} .task-index-list-title{ max-width:80%; display: block; margin:10px auto 0px; font-size:14px; font-weight: bold;} .task-index-list-user{padding:5px 10px; border-radius:25px;background: #F5F6F7; margin:0px auto 20px; display: inline-block;} .task-index-list-box-bottom{ background: #F5F6F7; color:#666; padding:10px 10%;} From 2686afd465345638274a03fade22e12f70a9df0d Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Thu, 1 Jun 2017 17:09:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E7=9A=84=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BA=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_courseList.html.erb | 10 +++++++--- app/views/courses/index.html.erb | 9 ++------- public/stylesheets/css/ketang.css | 2 +- public/stylesheets/css/taskstyle.css | 1 + 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/courses/_courseList.html.erb b/app/views/courses/_courseList.html.erb index c3f958a21..48e75cb4a 100644 --- a/app/views/courses/_courseList.html.erb +++ b/app/views/courses/_courseList.html.erb @@ -1,11 +1,15 @@ <% @syllabuses.each do | sy | %>
-
- -

+

+ +

<%= sy.title %>

+
+ 用户 + Cillian +

<% sy_author = User.find(sy.user_id) %> <% if !sy_author.user_extensions.school_id.blank? && sy_author.user_extensions.school %> diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 63e163192..4e5f0fc56 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -4,17 +4,12 @@ <%= User.current.show_name %> > 智能课堂

-
-
+
+

智能课堂

<%= link_to "创建", new_course_path, :class => "task-btn task-btn-green fr mt6" %>
-
    -
  • <%= @shixuns_count %>
    全部实训
    • -
  • <%= @current_user_had_passed %>
    你已通过
    • -
  • <%= @shixun_my_score %>
    取得成绩
    • -