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

解决样式冲突

This commit is contained in:
huang 2016-03-04 09:57:54 +08:00
parent 97e6299a2b
commit 596d4e17e9
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/views/users/_user_resource_info.html.erb
View File

@ -23,21 +23,22 @@
<%= render :partial => 'users/resources_list' , :locals => { :attachments => @attachments} %> <%= render :partial => 'users/resources_list' , :locals => { :attachments => @attachments} %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="resource-list-option fl"> <div class="resource-list-option fl">
<div class="resource-check-all"> <div class="resource-check-all">
<input id="checkboxAll" type="checkbox" value="" onclick="all_select();" class="resourcesCheckbox" /> <input id="checkboxAll" type="checkbox" value="" onclick="all_select();" class="resourcesCheckbox" />
</div> </div>
<a href="javascript:void(0);" class="replyGrey1 mr15" onclick="all_select();">全选</a> <a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a> <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a> </div>
<a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a> <div class="cl"></div>
<div class="resourcesSelectSend"> <div class="resourcesSelectSend mt10 fl">
<div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div> <div class="resourcesSelectSendButton fl mr15 inactive-border" onclick="batch_send();">
<div class="resourcesSelectSendButton" onclick="batch_send();"> <a href="javascript:void(0);" class="sendButtonBlue db inactive-text" data-remote="true">发送至</a>
<a href="javascript:void(0);" class="sendButtonBlue db" data-remote="true" >发送</a>
</div>
</div> </div>
<div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
</div> </div>
</form> </form>
<div class="cl"></div>
<div> <div>
<ul class="wlist" id="pages" style="margin-top: 5px;"> <ul class="wlist" id="pages" style="margin-top: 5px;">
<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %> <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>

2
app/views/users/user_resource.html.erb
View File

@ -70,7 +70,7 @@
} }
</script> </script>
<div class="resource-wrapper"> <div>
<ul class="resource-banner"> <ul class="resource-banner">
<li class="fl resource-switch"> <li class="fl resource-switch">
<a href="<%= user_resource_user_path(@user, :type => '6') %>" class="resource-tab resource-tab-active" data-remote="true">公共资源</a> <a href="<%= user_resource_user_path(@user, :type => '6') %>" class="resource-tab resource-tab-active" data-remote="true">公共资源</a>

2
public/stylesheets/public.css
View File

@ -909,7 +909,7 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;} .resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;}
.resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;} .resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
.resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;} .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
.resourcesSelectSend {float:right;} .resourcesSelectSend {vertical-align: middle;height: 28px;line-height: 28px;}
.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; border-radius:5px; } .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; border-radius:5px; }
a.sendButtonBlue {color:#269ac9;} a.sendButtonBlue {color:#269ac9;}
a.sendButtonBlue:hover {color:#ffffff;} a.sendButtonBlue:hover {color:#ffffff;}