diff --git a/app/views/users/_user_tiddings_list.erb b/app/views/users/_user_tiddings_list.erb
index 78d75957..530d84b1 100644
--- a/app/views/users/_user_tiddings_list.erb
+++ b/app/views/users/_user_tiddings_list.erb
@@ -28,7 +28,7 @@
"><%= tids.status == 0 ? '待处理' : tids.status == 1 ? '已处理' : "" %>
<% end %>
- <%= tids.container_type == "StudentJoinCourse" ? tids.user.try(:show_name) : "" %><%= message_content(tids.keyx_word).html_safe %>
+ <%= tids.container_type == "StudentJoinCourse" ? tids.user.try(:show_name) : "" %><%= message_content(tids.key_word).html_safe %>
<% if @onclick_time < tids.created_at %>
diff --git a/public/react/src/modules/ShCommunity/CommunityHome.js b/public/react/src/modules/ShCommunity/CommunityHome.js
index 666b7b42..d1f51fad 100644
--- a/public/react/src/modules/ShCommunity/CommunityHome.js
+++ b/public/react/src/modules/ShCommunity/CommunityHome.js
@@ -27,7 +27,7 @@ class CommunityHome extends Component {
}
}
componentWillMount(){
- window.document.title = 'Educoder';
+ window.document.title = 'EduCoder';
}
componentWillReceiveProps(nextProps){
diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js
index 0d0a7b02..a1647d70 100644
--- a/public/react/src/modules/tpm/NewFooter.js
+++ b/public/react/src/modules/tpm/NewFooter.js
@@ -36,14 +36,14 @@ class NewFooter extends Component {
-
*/}
- 网站首页
- 关于我们
diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css
index 045ce67e..d80ab3cb 100644
--- a/public/react/src/modules/tpm/TPMIndex.css
+++ b/public/react/src/modules/tpm/TPMIndex.css
@@ -37,7 +37,4 @@ body>.-task-title {
}
/*Main START*/
-.newMain {
- /* 330̫���ˣ�*/
- padding-bottom: 240px !important;
-}
+
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index f689c99e..109837e8 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -13,11 +13,11 @@ const $ = window.$;
let _url_origin = getUrl()
$('head').append( $('')
- .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`) );
+ .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440978`) );
$('head').append( $('')
.attr('href', `${_url_origin}/stylesheets/educoder/magic-check.css?1525440977`) );
$('head').append( $('')
- .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440977`) );
+ .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440978`) );
$('head').append( $('')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-admin.css?1525440977`) );
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 0d1614ac..d90aa5e3 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -51,6 +51,8 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
.search-content a{display: inline-block;width:100%;height: 30px;line-height: 30px;padding:0px 20px;box-sizing: border-box;text-align: left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
/*底部*/
.newFooter{ position: absolute; bottom: 0; width: 100%; height: 235px;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;}
+/* 去掉了logo */
+.newFooter{ height: 110px; }
.footercon{border-bottom:1px solid #47494d;}
.inner-footernav{width: 560px;margin: 0px auto}
.inner-footernav li{float: left;height: 50px;width: 80px;text-align: center}
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 1d693f20..c46f94bd 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -192,6 +192,7 @@ input::-ms-clear{display:none;}
.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
.educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;padding-top: 60px}/*padding-bottom根据底部的高度而定*/
+.newMain{ padding-bottom: 120px !important; }
/*高度*/
.height-100{height: 100%;}