jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into 'develop' 

界面bug

* 班级学生列表中的分班“编辑”“删除”按钮
* 博客：标题为非汉字类型显示超出边框已改，弊端是如果是英文单词会自动断开

See merge request !132
This commit is contained in:
黄井泉 2017-01-20 13:41:18 +08:00
parent 906e2ca050 0db1aea9f1
commit 2100eba325
8 changed files with 35 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/blog_comments/show.html.erb
View File

@ -81,8 +81,8 @@
</ul>
</div>
<%end%>
<div class="postDetailTitle fl">
<a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">主题: <%= @article.title%></a>
<div class=" fl " style="font-size:14px;font-weight: bold; color:#333; max-width:600px;margin-bottom: 15px;word-break:break-all; word-wrap:break-word;">
<p> <%= @article.title%></p>
</div>
<div class="cl"></div>

2
app/views/layouts/_logined_header_show.html.erb
View File

@ -23,7 +23,7 @@
<% end %>
</ul>
</div>
<div class="fl" id="navHomepageSearch">
<div class="fl" id="navHomepageSearch" style="margin-left:75px;">
<!--<form class="navHomepageSearchBox">-->
<% name = name%>
<a href ="javascript:void(0);" disabled="true"><%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>

4
app/views/layouts/_unlogin_header.html.erb
View File

@ -59,11 +59,11 @@
}
}
</script>
<div class="fl" id="navHomepageSearch">
<div class="fl" id="navHomepageSearch" >
<!--<form class="navHomepageSearchBox">-->
<% name = name%>
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox',:style=>'width:380px;', method: :get) do %>
<input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的班级、项目、用户、资源以及帖子" onkeypress="search_in_header_I(event,$(this));"/>
<input type="hidden" name="search_type" id="type" value="all"/>
<input type="text" style="display: none;"/>

2
app/views/versions/_issue_statistics.html.erb
View File

@ -1,4 +1,4 @@
<table class="new_roadmap_table " cellpadding="0" cellspacing="0">
<table class="new_roadmap_table " cellpadding="0" cellspacing="0" style="width:968px;">
<thead>
<tr>
<th>指派给</th>

2
app/views/versions/show.html.erb
View File

@ -53,7 +53,7 @@
</div>
<div id="new_roadmap_content_1">
<div class="pd15box">
<table class="new_roadmap_table " cellpadding="0" cellspacing="0">
<table class="new_roadmap_table " cellpadding="0" cellspacing="0" style="width:968px;" >
<thead>
<tr>
<th>ID</th>

8
public/stylesheets/css/common.css
View File

@ -387,10 +387,10 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
.hw_search_box a:hover.hw_btn_search{background:url(../images/hw/icons_hw.png) -40px -57px no-repeat;}
.hw_files_icon{display:block; width:17px; height:14px; background:url(../images/hw/icons_hw.png) 0 -135px no-repeat;}
/* 编辑删除 */
.sy_icons_edit{ display: inline-block; padding:9px;background:url(../images/sy/sy_icons02.png) 0 1px no-repeat; }
.sy_icons_del{ padding:9px;background:url(../images/sy/sy_icons02.png) 0 -21px no-repeat;}
.sy_icons_edit:hover{ background:url(../images/sy/sy_icons02.png) -20px 1px no-repeat; }
.sy_icons_del:hover{ background:url(../images/sy/sy_icons02.png) -20px -21px no-repeat;}
.sy_icons_edit{ display: inline-block; padding:9px;background:url(../../images/sy/sy_icons02.png) 0 1px no-repeat;}
.sy_icons_del{ padding:9px;background:url(../../images/sy/sy_icons02.png) 0 -21px no-repeat;}
.sy_icons_edit:hover{ background:url(../../images/sy/sy_icons02.png) -20px 1px no-repeat; }
.sy_icons_del:hover{ background:url(../../images/sy/sy_icons02.png) -20px -21px no-repeat;}
/* 翻页 */
.pages a{ display:block; border:1px solid #d1d1d1; color:#888; float:left; width:30px;text-align:center; padding:3px 0; line-height:1.9; margin-right:5px;}
.pages a:hover{ background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;}

116
public/stylesheets/css/popup.css
View File

@ -153,13 +153,13 @@ a:hover.CloseBtn{background:url(/images/CloseBtn.png) 0px -24px no-repeat; }
.ping_star{ width:160px; color:#333; font-weight:bold; margin-bottom:5px;}
.ping_star span a{ float:right; width:20px; height:20px; background:url(../images/star.png) -2px 0 no-repeat; margin-right:3px;}
.ping_star span a:hover{background:url(../images/star.png) -24px 0 no-repeat;}
.ping_con textarea{ width:455px; height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;}
a.ping_sub{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;}
.ping_con textarea{ width:455px; height:76px; border:1px solid #3b94d6; margin-bottom:5px; color:#666; font-size:12px;}
a.ping_sub{ float:right; height:22px; width:60px; background:#3b94d6; color:#fff; text-align:center;}
a:hover.ping_sub{ background:#14a8b9;}
.recall{ border-top:1px solid #CCC; padding:5px 0;}
.recall_head{ float:left;}
.recall_head a{ display:block; width:30px; height:30px; border:1px solid #CCC; padding:1px;}
.recall_head a:hover{border:1px solid #15bccf;}
.recall_head a:hover{border:1px solid #3b94d6;}
.recall_con{ float:left;color:#777777; width:520px; margin-left:10px;word-break: break-all;word-wrap: break-word; }
.recall_con a{ color:#3b94d6; }
.ping_list{ margin-top:15px;}
@ -168,13 +168,13 @@ a:hover.ping_sub{ background:#14a8b9;}
.ping_tb_{ border-bottom:3px solid #e4e4e4; text-align:center;}
.ping_tb_ ul{height:24px;}
.ping_tb_ li{float:left;height: 24px;width: auto; padding:0 10px;cursor:pointer;}
.ping_normaltab { color:#15bccf ; border-bottom:3px solid #e4e4e4;}
.ping_hovertab { color:#656767; font-weight:bold; border-bottom:3px solid #15bccf; }
.ping_normaltab { color:#3b94d6 ; border-bottom:3px solid #e4e4e4;}
.ping_hovertab { color:#656767; font-weight:bold; border-bottom:3px solid #3b94d6; }
.ping_dis{display:block; }
.ping_undis{display:none;}
.ping_C{border-bottom:1px dashed #CCC; padding:10px 0 0px;}
.ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}
.ping_dispic a:hover{border:1px solid #15bccf;}
.ping_dispic a:hover{border:1px solid #3b94d6;}
.ping_discon{ float:left; width:610px; margin-left:10px; }
/*.ping_distop span{ float:left;}*/
.ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
@ -193,7 +193,7 @@ span.author { font-size: 0.9em; color: #888; }
.ni_con p{ color:#808181; }
.ni_con a:hover{ text-decoration:none;}
.ni_btn{ width:190px; margin:15px auto; line-height:1.9;}
a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#3b94d6; text-align:center; padding-top:4px; float:left; margin-right:15px;}
a:hover.tijiao{ background:#0f99a9;}
.c_pink{ color:#e65d5e;}
.ni_con_work { width:300px; margin:25px 20px;}
@ -296,94 +296,22 @@ a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: no
/*公共弹框*/
/* 按钮*/
/* 加入班级弹窗 */
#sy_popup_box{
width:460px;
background:#fff;
padding-bottom:30px;
-webkit-border-radius:5px;
-moz-border-radius:5px;
-o-border-radius:5px;
border-radius:5px;
box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
}
.sy_popup_top{
background:#3b94d6;
height:40px;
-webkit-border-radius: 5px 5px 0px 0px;
-moz-border-radius: 5px 5px 0px 0px;
-o-border-radius: 5px 5px 0px 0px;
border-radius: 5px 5px 0px 0px;
}
.sy_popup_top h3{
font-size:18px;
color:#fff;
font-weight:normal;
line-height:40px;
padding-left:10px;
}
a.sy_icons_close{
width:20px;
height:20px;
display:block;
background: url(/images/sy/sy_icons_close.png) 0 0px no-repeat;
margin:8px 10px 0 0;
}
a:hover.sy_icons_close{
background: url(/images/sy/sy_icons_close.png) -40px 0px no-repeat;
}
.sy_popup_con{
margin:30px auto 0;
font-size:14px;
width:330px;
}
.sy_popup_add label{
display:block;
float:left;
width:85px;
text-align:right;
line-height:40px;
}
.sy_popup_add li{
line-height:40px;
}
.sy_input_txt{
border:1px solid #dedede;
height:36px;
background:#fff;
padding:0 5px;
width:220px;
}
.sy_popup_con02{
margin:30px auto 0;
font-size:14px;
text-align:center;
width:360px;
}
.sy_popup_con02 ul li p{
margin-bottom:15px;
text-align:center;
font-size:14px;
color:#616161;
}
#sy_popup_box{ width:460px; background:#fff; padding-bottom:30px; border-radius:5px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
.sy_popup_top{ background:#3b94d6; height:40px; -webkit-border-radius: 5px 5px 0px 0px; -moz-border-radius: 5px 5px 0px 0px; -o-border-radius: 5px 5px 0px 0px; border-radius: 5px 5px 0px 0px;}
.sy_popup_top h3{ font-size:18px; color:#fff; font-weight:normal; line-height:40px; padding-left:10px;}
a.sy_icons_close{ width:20px; height:20px; display:block; background: url(/images/sy/sy_icons_close.png) 0 0px no-repeat; margin:8px 10px 0 0;}
a:hover.sy_icons_close{background: url(/images/sy/sy_icons_close.png) -40px 0px no-repeat;}
.sy_popup_con{ margin:30px auto 0;font-size:14px; width:330px;}
.sy_popup_add label{ display:block; float:left; width:85px; text-align:right; line-height:40px;}
.sy_popup_add li{ line-height:40px;}
.sy_input_txt{ border:1px solid #dedede; height:36px; background:#fff; padding:0 5px; width:220px;}
.sy_popup_con02{ margin:30px auto 0; font-size:14px; text-align:center; width:360px;}
.sy_popup_con02 ul li p{ margin-bottom:15px; text-align:center; font-size:14px; color:#616161;}
.sy_popup_con02 a{ margin:0 auto;}
.sy_popup_top_tishi{ background:#ededed; }
.sy_popup_top_tishi h3{color:#616161; font-size:16px;}
a.sy_icons_close02{
width:20px;
height:20px;
display:block;
background: url(/images/sy/sy_icons_close02.png) 0 0px no-repeat;
margin:8px 10px 0 0;
border: none;
outline: none;
transition: all 0s linear;
}
a:hover.sy_icons_close02{
background: url(/images/sy/sy_icons_close02.png) -40px 0px no-repeat;
}
a.sy_icons_close02{ width:20px; height:20px; display:block; background: url(/images/sy/sy_icons_close02.png) 0 0px no-repeat; margin:8px 10px 0 0; border: none; outline: none; transition: all 0s linear;}
a:hover.sy_icons_close02{ background: url(/images/sy/sy_icons_close02.png) -40px 0px no-repeat;}
img.ui-datepicker-trigger { display: block; background: url(/images/public_icon.png) -31px 0 no-repeat; cursor: pointer; vertical-align: middle; margin-left: 5px; margin-top: 5px; margin-right: 5px; width: 16px;
height: 15px; float: left;}

4
public/stylesheets/css/structure.css
View File

@ -273,7 +273,7 @@ a:hover.qx_btn{color:#3b94d6;}
.navHomepageMenu:hover {background-color:#2182ca;}
.navHomepageSearchBoxcontainer {margin-top:11px;}
.navHomepageSearchBox {width:340px; border:none; outline:none; height:32px; background-color:#ffffff;}
#navHomepageSearch{margin-top: 11px;background-color: white; margin-left:75px;}
#navHomepageSearch{margin-top: 11px;background-color: white; }
.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left; padding-left:5px !important; margin:0;}
#navSearchAlert {display:none;}
.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;}
@ -421,7 +421,7 @@ li.menuArrow:hover {background:url(/images/item.png) -20px -70px no-repeat;}
a.topnav_login_box:hover {color:#a1ebff;}
.navRow1 {margin:0; padding:0;}
.navRow2 {margin:0; padding:0;}
.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 2px;}
.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top:7px;}
.topnav_login_list a{color:#3b94d6;}
.topnav_login_list a:hover{color:#2182ca;}
.topnav_login_list li{ }