解决按钮冲突
This commit is contained in:
parent
9d2f7d1c28
commit
0c849c3216
|
@ -45,7 +45,7 @@
|
||||||
<%= content_tag('span', link_to("#{@project.members.count}", member_project_path(@project)), :class => "info") %>
|
<%= content_tag('span', link_to("#{@project.members.count}", member_project_path(@project)), :class => "info") %>
|
||||||
<%= content_tag('span', l(:label_x_member, :count => @project.members.count)) %>
|
<%= content_tag('span', l(:label_x_member, :count => @project.members.count)) %>
|
||||||
</p>
|
</p>
|
||||||
<div class="buttons" style="margin-top:30px;margin-left:144px">
|
<div class="buttons_for_course" style="margin-top:30px;margin-left:144px">
|
||||||
<span class="info"></span>
|
<span class="info"></span>
|
||||||
<%= join_in_course_for_list(@project, User.current,['regular'])%>
|
<%= join_in_course_for_list(@project, User.current,['regular'])%>
|
||||||
</div>
|
</div>
|
||||||
|
@ -55,9 +55,11 @@
|
||||||
<div class="add-info">
|
<div class="add-info">
|
||||||
<div class="main-language" style="margin-left: 30px;margin-top:-10px">
|
<div class="main-language" style="margin-left: 30px;margin-top:-10px">
|
||||||
<%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
|
<%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
|
||||||
|
<% unless Course.find_by_extra(@project.identifier).nil? %>
|
||||||
<%= DateTime.parse(Course.find_by_extra(@project.identifier).setup_time.to_s).strftime("%Y年%m月%d日").to_s unless Course.find_by_extra(@project.identifier).setup_time.nil? %>
|
<%= DateTime.parse(Course.find_by_extra(@project.identifier).setup_time.to_s).strftime("%Y年%m月%d日").to_s unless Course.find_by_extra(@project.identifier).setup_time.nil? %>
|
||||||
<%= '-' unless Course.find_by_extra(@project.identifier).setup_time.nil? %>
|
<%= '-' unless Course.find_by_extra(@project.identifier).setup_time.nil? %>
|
||||||
<%= DateTime.parse(Course.find_by_extra(@project.identifier).endup_time.to_s).strftime("%Y年%m月%d日").to_s unless Course.find_by_extra(@project.identifier).endup_time.nil? %>
|
<%= DateTime.parse(Course.find_by_extra(@project.identifier).endup_time.to_s).strftime("%Y年%m月%d日").to_s unless Course.find_by_extra(@project.identifier).endup_time.nil? %>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -1908,7 +1908,8 @@ div.avatar_user{
|
||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.buttons a, .buttons button{
|
/*#added by nie*/
|
||||||
|
.buttons_for_course a {
|
||||||
display:block;
|
display:block;
|
||||||
float:left;
|
float:left;
|
||||||
margin:0 7px 0 0;
|
margin:0 7px 0 0;
|
||||||
|
@ -1917,7 +1918,7 @@ div.avatar_user{
|
||||||
border-top:1px solid #eee;
|
border-top:1px solid #eee;
|
||||||
border-left:1px solid #eee;
|
border-left:1px solid #eee;
|
||||||
|
|
||||||
font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
|
font-family:"微软雅黑", sans-serif;
|
||||||
font-size:12px;
|
font-size:12px;
|
||||||
line-height:130%;
|
line-height:130%;
|
||||||
text-decoration:none;
|
text-decoration:none;
|
||||||
|
@ -1926,87 +1927,41 @@ div.avatar_user{
|
||||||
cursor:pointer;
|
cursor:pointer;
|
||||||
padding:5px 10px 6px 7px; /* Links */
|
padding:5px 10px 6px 7px; /* Links */
|
||||||
}
|
}
|
||||||
.buttons button{
|
|
||||||
width:auto;
|
|
||||||
overflow:visible;
|
|
||||||
padding:4px 10px 3px 7px; /* IE6 */
|
|
||||||
}
|
|
||||||
.buttons button[type]{
|
|
||||||
padding:5px 10px 5px 7px; /* Firefox */
|
|
||||||
line-height:17px; /* Safari */
|
|
||||||
}
|
|
||||||
*:first-child+html button[type]{
|
|
||||||
padding:4px 10px 3px 7px; /* IE7 */
|
|
||||||
}
|
|
||||||
.buttons button img, .buttons a img{
|
|
||||||
margin:0 3px -3px 0 !important;
|
|
||||||
padding:0;
|
|
||||||
border:none;
|
|
||||||
width:16px;
|
|
||||||
height:16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* STANDARD */
|
/* STANDARD */
|
||||||
|
|
||||||
button:hover, .buttons a:hover{
|
.buttons_for_course a:hover{
|
||||||
background-color:#dff4ff;
|
background-color:#dff4ff;
|
||||||
border:1px solid #c2e1ef;
|
border:1px solid #c2e1ef;
|
||||||
color:#336699;
|
color:#336699;
|
||||||
}
|
}
|
||||||
.buttons a:active{
|
.buttons_for_course a:active{
|
||||||
background-color:#6299c5;
|
background-color:#6299c5;
|
||||||
border:1px solid #6299c5;
|
border:1px solid #6299c5;
|
||||||
color:#fff;
|
color:#fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* POSITIVE */
|
|
||||||
|
|
||||||
button.positive, .buttons a.positive{
|
|
||||||
color:#529214;
|
|
||||||
}
|
|
||||||
.buttons a.positive:hover, button.positive:hover{
|
|
||||||
background-color:#E6EFC2;
|
|
||||||
border:1px solid #C6D880;
|
|
||||||
color:#529214;
|
|
||||||
}
|
|
||||||
.buttons a.positive:active{
|
|
||||||
background-color:#529214;
|
|
||||||
border:1px solid #529214;
|
|
||||||
color:#fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* NEGATIVE */
|
|
||||||
|
|
||||||
.buttons a.negative, button.negative{
|
|
||||||
color:#d12f19;
|
|
||||||
}
|
|
||||||
.buttons a.negative:hover, button.negative:hover{
|
|
||||||
background:#fbe3e4;
|
|
||||||
border:1px solid #fbc2c4;
|
|
||||||
color:#d12f19;
|
|
||||||
}
|
|
||||||
.buttons a.negative:active{
|
|
||||||
background-color:#d12f19;
|
|
||||||
border:1px solid #d12f19;
|
|
||||||
color:#fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* REGULAR */
|
/* REGULAR */
|
||||||
|
|
||||||
button.regular, .buttons a.regular{
|
.buttons_for_course a.regular{
|
||||||
color:#ffffff;
|
color:#ffffff;
|
||||||
}
|
}
|
||||||
.buttons a.regular:hover, button.regular:hover{
|
.buttons_for_course a.regular:hover {
|
||||||
background-color:#dff4ff;
|
background-color:#dff4ff;
|
||||||
border:1px solid #c2e1ef;
|
border:1px solid #c2e1ef;
|
||||||
color:#336699;
|
color:#336699;
|
||||||
}
|
}
|
||||||
.buttons a.regular:active{
|
.buttons_for_course a.regular:active{
|
||||||
background-color:#6299c5;
|
background-color:#6299c5;
|
||||||
border:1px solid #6299c5;
|
border:1px solid #6299c5;
|
||||||
color:#fff;
|
color:#fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* end */
|
||||||
|
|
||||||
.course-font {
|
.course-font {
|
||||||
color:#8c8a8a;
|
color:#8c8a8a;
|
||||||
|
|
Loading…
Reference in New Issue