document css/

wiki h2 bug
This commit is contained in:
yanxd 2014-06-10 15:59:57 +08:00
parent 541b22b84d
commit 73f5bab075
5 changed files with 909 additions and 2124 deletions

View File

@ -1,3 +1,5 @@
<div class="frame-wiki">
<div class="contextual"> <div class="contextual">
<% if User.current.allowed_to?(:edit_documents, @project) %> <% if User.current.allowed_to?(:edit_documents, @project) %>
<%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %> <%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
@ -7,24 +9,13 @@
<% end %> <% end %>
</div> </div>
<!-- <h3><%=h @document.title %></h3> <h2><%=h @document.title %></h2>
<p><em><%=h @document.category.name %><br /> <p><em><%=h @document.category.name %><br />
<%= format_date @document.created_on %></em></p> <%= format_date @document.created_on %></em></p>
<div class="wiki"> <div class="wiki">
<%= textilizable @document.description, :attachments => @document.attachments %> <%= textilizable @document, :description, :attachments => @document.attachments %>
</div> --> </div>
<!--add by huang-->
<table width="660px" align="center">
<tr><td><h3><strong><%=h @document.title %></strong></h3></td></tr>
<tr><td>
<div class="font_description">
<%= textilizable @document.description, :attachments => @document.attachments %>
</div>
</td></tr>
<tr><td align="right"><p class="font_lighter"><%= format_date @document.created_on %></p></td></tr>
<tr><td class="line_under"></td></tr>
</table>
<h3><%= l(:label_attachment_plural) %></h3> <h3><%= l(:label_attachment_plural) %></h3>
@ -42,3 +33,4 @@
<% end %> <% end %>
<% html_title @document.title -%> <% html_title @document.title -%>
</div>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,9 @@
/* Temporary
*******************************************************************************/
.frame-wiki {
padding: 0 10px;
}
/* TODO: base/common/page 准备封装一些基本样式组合调用 参考YUI /* TODO: base/common/page 准备封装一些基本样式组合调用 参考YUI
*******************************************************************************/ *******************************************************************************/
* { * {

View File

@ -524,19 +524,8 @@ ul.projects li.root
margin:4px 20px 20px; margin:4px 20px 20px;
padding-bottom:15px; padding-bottom:15px;
text-align:left text-align:left
/*font-size: 18px;*/
} }
#footer a:hover
{
/*background:#666 none repeat scroll 0 0;*/
/*color:#FFF!important*/
}
#footer a:link,#footer a:visited
{
/*color:#666*/
}
#footer .bgr:after #footer .bgr:after
{ {
@ -544,60 +533,6 @@ ul.projects li.root
float:right float:right
} }
h1,h2,h3,h4
{
font-family:'微软雅黑',"PT Sans","Lucida Grande",arial,sans-serif /*modify by men*/
}
h1
{
font-size:24px; /*工作台界面框框大小*/
font-weight:400;
margin:0 0 0 .25em;
padding:0 0 10px;
text-align:left
}
h2,h3,h4,.wiki h1,.wiki h2,.wiki h3
{
border-bottom:0
}
h2,.wiki h1
{
background-color:#e0e0e0; /*第三层背景非导航条*/
margin:-6px -10px 10px;
padding:10px 20px;
font-size:14px;
color:#fff;
border-top:1px #ddd solid
}
.wiki h1
{
font-family:"PT Sans","Trebuchet MS",Helvetica,sans-serif;
font-weight:700
}
.wiki h2
{
background-color:transparent
}
div.issue div.wiki h3
{
text-decoration:underline
}
h3,h4
{
font-weight:400
}
div.wiki h3,div.wiki h4
{
font-weight:700
}
#sidebar h3 #sidebar h3
{ {