diff --git a/app/views/users/_private_file.html.erb b/app/views/users/_private_file.html.erb
new file mode 100644
index 000000000..e2ad9546b
--- /dev/null
+++ b/app/views/users/_private_file.html.erb
@@ -0,0 +1,34 @@
+
+<%#= render partial: "users/private_file" %>
+
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index 7746be40c..1f76b1cc8 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -164,6 +164,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.maxh360 {max-height: 810px;}
.maxh300 { max-height: 300px; }
.lh18 { line-height: 18px;}
+.color-grey-c{color: #ccc;}
/* Font & background Color */
.color-grey3{color:#333!important;}
.color-grey8{color: #888!important;}
@@ -545,10 +546,13 @@ a:hover.btn_green_64_width{ background: #14ad5a; color: #fff;}
.c-grey4 {color:#888888;}
.c-grey5 {color:#aaaaaa;}
.c-grey6 {color:#777777;}
-.c-blue {color:#3b94d6;}
+.c-blue {color:#3b94d6!important;}
.c-white {color:#ffffff;}
.c-black {color:#333}
+.padding30-20{padding:30px 20px;}
+.bor-bottom-greyE{border-bottom: 1px solid #eee;}
+
.bg_white_bor{background-color: #fff;border:1px solid #dddddd}
#intro_content p{word-break:break-word!important;}
@@ -558,3 +562,7 @@ a:hover.btn_green_64_width{ background: #14ad5a; color: #fff;}
/* Home 首页相关样式*/
.floating_color{color: #fff}
+
+
+
+
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 4873eb717..8c78b9575 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -548,8 +548,25 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
.homepageBackground{ background-color:#90C5EC; flex:1; text-align: center }
.homepageClickBackground{ background-color:#3b94d6; flex:1; text-align: center }
.flex-cell_homepage:hover{ background-color:#3b94d6;}
-
-
+/*私信*/
+.flex1{flex:1;}
+.private-item:last-child {
+ border-bottom: none;
+}
+.private-item {
+ padding: 30px 30px 30px 25px;
+ border-bottom: 1px solid #F5F5F5;
+ cursor: pointer;
+ font-size: 14px;
+}
+.private_message_a img{
+ width: 48px;
+ height: 48px;
+ border-radius: 50%;
+}
+.private-item:hover {
+ background-color: #f5f5f5;
+}
/*oschina授权页*/
.authTop{width: 100%;position: fixed;left: 0px;top:0px;background-color: #51B7EC;height: 58px;color: #fff;}
.authmain{width: 1000px;margin:0px auto;display: block!important;}
@@ -717,11 +734,8 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
.partnerInfo a span.name{font-size: 20px;color: #4D4D4D;float: left;}
.partnerInfo a{margin-right: 0px;}
-<<<<<<< HEAD
-=======
->>>>>>> dev-homepage-revision
.middlePanel{width: 1200px;margin:0px auto;}
.btn_big_default{
width: 100px;
@@ -1062,8 +1076,3 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
left: 0px;
bottom: 0px;
}
-<<<<<<< HEAD
-=======
-
-
->>>>>>> dev-homepage-revision
+ 全部私信 + 写私信 +
+
+
\ No newline at end of file
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index ba2f854d8..17d3bd958 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -3,6 +3,8 @@
<%= render partial: "users/infos" %>
+ 
+
+
+
+
+ + + 与你的私信 + [3条] + 6天前 +
+
+ 呀呀呀呀呀呀晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕呀呀呀呀呀呀晕晕
+
+
+
+
+
+
+
+ + + 与你的私信 + [3条] + 6天前 +
+
+ 呀呀呀呀呀呀晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕晕呀呀呀呀呀呀晕晕
+
+