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

博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理

This commit is contained in:
Tim 2016-07-27 14:36:46 +08:00
parent c2388073d6
commit 52475099dc
9 changed files with 24 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/blogs/_homepage.html.erb
View File

@ -1,6 +1,5 @@
<div class="resources mt10" id="user_activity_<%= user_activity_id%>" >
<div class="homepagePostBrief" onmouseover="$('#homepage_message_setting_<%=activity.id%>').show();" onmouseout="$('#homepage_message_setting_<%= activity.id%>').hide();">
<div class="homepagePostDes">
<% if activity.author.id == User.current.id%>
<div class="homepagePostSetting" id="homepage_message_setting_<%= activity.id%>" style="display: none">
<ul>
@ -35,7 +34,6 @@
</ul>
</div>
<%end%>
<div class="cl"></div>
<div class="homepagePostTitle hidden m_w530">
<%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id,
:blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey", :style => 'text-align:center;' %>
@ -45,7 +43,6 @@
<div class="cl"></div>
<div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
<div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
</div>
<div class="cl"></div>
</div>
<% all_comments = []%>

14
app/views/layouts/_course_base_info.html.erb
View File

@ -11,15 +11,15 @@
</p>
<% if is_teacher %>
<div class="homepagePostSetting" >
<div class="sy_class_setting" >
<ul>
<li class="homepagePostSettingIcon">
<ul class="homepagePostSettiongText">
<li><%= link_to "班级配置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "postOptionLink" %></li>
<li><%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "postOptionLink" %></li>
<li><%= link_to "复制学期", copy_course_course_path(@course.id),:remote=>true, :class => "postOptionLink" %></li>
<li class="sy_class_setting_icon">
<ul class="sy_class_setting_text">
<li><%= link_to "班级配置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "sy_class_option" %></li>
<li><%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "sy_class_option" %></li>
<li><%= link_to "复制学期", copy_course_course_path(@course.id),:remote=>true, :class => "sy_class_option" %></li>
<% if @course.syllabus %>
<li><%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "postOptionLink", :target => "_blank" %></li>
<li><%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "sy_class_option", :target => "_blank" %></li>
<% end %>
</ul>
</li>

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

@ -51,6 +51,10 @@ a.btn_message_free{ background:#ff5722; display:block; text-align:center; color
.break_word{word-break: break-all;word-wrap: break-word;}
.break_word_firefox{white-space: pre-wrap !important;word-break: break-all;}
/*显隐*/
.undis {display:none;}
.dis {display:inline-block;}
/* font & color */
h2{ font-size:18px;} /*color:#269ac9;*/
h3{ font-size:14px;}/* color:#e8770d;*/
@ -520,7 +524,6 @@ a:hover.bgreen_n_btn{background:#08a384;}
.upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;}
.upbtn:hover{color:#64bdd9;cursor: pointer;}
.upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
.undis{display:none;}
.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}

2
public/stylesheets/css/courses.css
View File

@ -54,8 +54,6 @@ a:hover.UsersApBtn{border:1px solid #888888; }
/* 代码查重弹框 */
a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}
a:hover.Blue-btn{ background:#3598db; color:#fff;}
.fl{ float:left;}
.fr{ float:right;}
.blue-border-box{ width:500px; padding:20px; margin:0 auto; background:#fff;}
.box-con h4{ font-size:14px; font-weight: bold; width:450px; text-align:center;}
.box-con{ width:450px; margin:0 auto; text-align:center;}

2
public/stylesheets/css/org.css
View File

@ -27,8 +27,6 @@ a.saveBtn:hover {background-color:#297fb8;}
.orgMemContainer {width:268px;}
.orgMemberAdd {float:right;}
.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
.undis {display:none;}
.dis {display:inline-block;}
a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;}

7
public/stylesheets/css/public.css
View File

@ -471,8 +471,6 @@ a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-r
a.postRouteLink {font-weight:bold; color:#484848;}
a.postRouteLink:hover {text-decoration:underline;}
.homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
.homepagePostSetting ul li:hover ul {display:block;}
.resourceSendO {width:65px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:2px 0px; display:none;}
.ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
@ -499,7 +497,6 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
.wlist_select a{background-color: #64bdd9;cursor: default;}
/*博客列表界面样式*/
a{text-decoration:none}
.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
/*.bloglistbox{ min-height:690px;}*/
.list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;}
@ -543,8 +540,6 @@ a:hover.st_img { border:1px solid #1c9ec7; }
.searchCourseImage {width:75px; margin-right:10px;}
.searchContentDes {width:883px;}
.searchTag {font-size:12px; color:#ffffff; background-color:#7ec8e4; height:16px; min-height:16px; max-height:16px; float:left; line-height:16px; padding:0px 3px;}
.undis {display:none;}
.dis {display:inline-block;}
.numRed {color:#FF6600;}
.pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;}
.pageCell {border:1px solid #dddddd; padding:5px 12px; float:left; margin-left:-1px; position:relative;}
@ -977,6 +972,8 @@ a:hover.pr_join_a{ background:#298fbd;}
.lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}
/****标签(和资源库的tag样式一致)***/
.project_Label{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; margin-bottom:10px;}
/*.project_Label{ width:218px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; margin-bottom:10px; border:1px solid #dddddd;}*/
.project_Label_New {width:218px; padding-left:10px; background:#fff; margin-top:15px; margin-bottom:10px;}
a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; }
.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}

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

@ -239,9 +239,9 @@ a.postReplyCancel:hover {color:#ffffff;}
.whiteSettingIcon {background:url(/images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
.whiteSettingIcon:hover {background:url(/images/homepage_icon.png) -93px -44px no-repeat;}
a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;text-align:center;}
a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
a.postOptionLink:hover {color:#ffffff; background-color:#3b94d6;}
a.postOptionLink2 {color:#616060; display:block; width:35px; padding:0px 15px;}
a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
a.postOptionLink2:hover {color:#ffffff; background-color:#3b94d6;}
.homepagePostReplyPortrait {float:left; width:33px;}
.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
.homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
@ -337,7 +337,6 @@ a.projectsLineGrey:hover {color:#ffffff;}
a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
a.homepageMenuControl {float:left; width:180px;}
.homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
.project_Label_New {width:218px; padding-left:10px; background:#fff; margin-top:15px; margin-bottom:10px;}
.homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
.homepageRightBannerImg{width:1000px; margin:0px auto; height: 60px; margin-top: 10px; background:url(/images/TeachersDay.jpg)}

1
public/stylesheets/sy_public.css
View File

@ -140,7 +140,6 @@ a.pages-big{
}
.pages{
width:330px;
margin:20px auto 10px;
}
/* 输入框 */

38
public/stylesheets/syllabus.css
View File

@ -1,13 +1,3 @@
/****标签(和资源库的tag样式一致)***/
.project_Label{ width:218px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; margin-bottom:10px; border:1px solid #dddddd;}
.project_Label_New {width:218px; padding-left:10px; background:#fff; margin-top:15px; margin-bottom:10px;}
a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; }
.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; }
.re_tag a{ color:#0d90c3;}
.tag_h{ }
.tag_h span,.tag_h a{ margin-bottom:5px;}
/*信息*/
.project_info{ background:#fff; padding:10px 8px; width:222px; margin-bottom:10px; border:1px solid #dddddd;}
.pr_info_id{ width:130px; color:#5a5a5a; font-size:14px; margin-top:5px;}
@ -112,14 +102,11 @@ input.syllabus_input_min{
.syllabus_class_list_more a{ color:#ff7e00;}
.syllabus_class_title{ font-size:14px; color:#333; width:500px; margin-bottom:3px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
.syllabus_class_w{ width:650px;}
.dis {display:block;}
.undis {display:none;}
/*班级列表界面(用的博客列表的样式)*/
.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
.bloglistbox{ min-height:690px;}
.list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;}
.category2{ }
.list_title{padding:10px 0; border-bottom:1px solid #ddd;}
.category2 a,.category2 span{ float:left; margin-right:5px;}
.grayTxt{ color:#9093a6;}
@ -131,7 +118,6 @@ a.sort_no{ background: url(../images/syllabus/icons_syllabus.png) -16px -12px no
.item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;}
a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block;}
a:hover.list-title{ color:#269ac9;}
.c_red{ font-weight:normal; font-size:12px;}
.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}
.list-file li{ line-height:1.9;}
.list-info span{ margin-left:5px;}
@ -208,12 +194,6 @@ a:hover.course-title{ color:#269ac9;}
.sy_tab_nomal {
border-bottom:none;
}
.undis {
display:none;
}
.dis {
display:block;
}
/* 课程大纲 */
.icons_tishi{
width: 110px;
@ -324,22 +304,22 @@ a:hover.sy_teachers_name{
border:1px solid #e5e5e5;
position: relative;
}
.homepagePostSetting {
.sy_class_setting {
position:absolute;
width:20px;
height:20px;
right:10px;
top:10px;
}
.homepagePostSetting ul li:hover ul {
.sy_class_setting ul li:hover ul {
display:block;
}
.homepagePostSettingIcon {
background:url(../images/sy/icons_sy.png) 1px -408px no-repeat;
.sy_class_setting_icon {
background:url(../images/homepage_icon.png) -93px -5px no-repeat;
width:20px;
height:20px;
}
.homepagePostSettiongText {
.sy_class_setting_text {
width:75px;
text-align: center;
line-height:2;
@ -355,16 +335,16 @@ a:hover.sy_teachers_name{
display:none;
box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
}
.homepagePostSettingIcon:hover {
background:url(../images/sy/icons_sy.png) -28px -408px no-repeat;
.sy_class_setting_icon:hover {
background:url(../images/homepage_icon.png) -93px -44px no-repeat;
}
a.postOptionLink {
a.sy_class_option {
color:#616060;
display:block;
width:55px;
padding:0px 10px;
}
a.postOptionLink:hover {
a.sy_class_option:hover {
color:#fff;
background-color:#3b94d6;
}