<% if !course_endTime_timeout?(project)%>
<%= join_in_course(project, User.current)%>
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index b616fd593..8e44135b8 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -1,63 +1,3 @@
-/*.body_resize { width:950px; margin:0 auto; padding:0;}
-.left { width:371px; float:left; margin:20px 5px 10px 5px; padding:5px;}
-
-.right { width:527px; float:left; margin:20px 5px 10px 5px; padding:5px;}
-.right ul { list-style:none; margin:5px 20px; padding:0;}
-.right li { font: bold 12px Arial, Helvetica, sans-serif; color:#6f6f6f; padding:5px 20px; margin:0; background:url(images/about_ul_li.gif) left no-repeat;}
-
-
-.body { background:#ebebeb; border-bottom:1px solid #fff; }
-
-.home {
- font:bold 16px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
- color:#2c2c2c;
- border-bottom:1px solid #cccccc;
- padding:10px 5px;
- margin:0 0 10px 0;
-}
-
-p {
- font:normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
- color:#6f6f6f;
- line-height:1.8em;
- padding:5px 5px;
- margin:0;
-}
-
-div.project {
- font:normal 15px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
- color:#6f6f6f;
- line-height:1.8em;
- padding:5px 5px;
- margin:0;
- border-bottom:1px solid #eeeeee;
- width: 95%;
- float: right;
-}
-div.project a{
- color: #5B5B5B;
-}
-
-div.project {
- overflow: hidden;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
-}
-div.project>.nowrap {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
-}
-
-span.grey {
- float: right;
- font: normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
- color:#afaeae;
- line-height:1.8em;
- padding:5px 5px;
- margin:0;
-}*/
.top_bar{
height: auto;
}
@@ -120,7 +60,6 @@ ul.welcome-message-list{
height: 25px;
line-height: 25px;
background-color: rgb(252, 252, 252);
- color: green;
/*text-indent: 8px;*/
margin: 0;
padding: 0px;
@@ -200,17 +139,41 @@ ul.even{
font-weight: 700;
}
+/*course welcome,左侧新开课程部分开始*/
ul.d-p-projectlist{
margin-top: 0px;
}
+#J_Slide h3{
+ margin-left: 5px;
+ color: #e8770d;
+}
+#J_Slide h3~span{
+ margin-top: -20px;
+ float: right;
+ display: block;
+}
+.d-p-projectlist li{
+ position: relative;
+ height:5em;
+}
+.d-p-projectlist li > .avatar{
+ float: left;
+ height: 100%;
+}
+.d-p-projectlist li > .join_course_link{
+ position:absolute;
+ bottom:0;
+ right:0;
+ margin:5px 10px 5px 5px;
+}
.d-p-projectlist li .desc_item{
float: left;
display: inline-block;
- /*margin: 2px;*/
line-height: 2em;
margin-left: 10px;
width: 380px;
}
+/*course welcome,左侧新开课程部分结束?*/
/*