hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

document css/

Browse Source 
wiki h2 bug
GitlabVersion
yanxd 11 years ago
parent 541b22b84d
commit 73f5bab075
5 changed files with 910 additions and 2125 deletions
Show Stats Download Patch File Download Diff File

18
app/views/documents/show.html.erb
Unescape 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> -->
<!--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> </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>

18
lib/redcloth3.rb
Unescape View File

@ -31,7 +31,7 @@
# #
# == Sample Textile Text # == Sample Textile Text
# #
# h3. This is a title # h2. This is a title
# #
# h3. This is a subhead # h3. This is a subhead
# #
@ -129,7 +129,7 @@
# #
# Will become: # Will become:
# #
# <acronym title="American Civil Liberties Union">ACLU</acronym> # <abbr title="American Civil Liberties Union">ACLU</abbr>
# #
# == Adding Tables # == Adding Tables
# #
@ -152,7 +152,7 @@
# #
# doc = RedCloth.new " # doc = RedCloth.new "
# #
# h3. Test document # h2. Test document
# #
# Just a simple test." # Just a simple test."
# #
@ -227,7 +227,7 @@ class RedCloth3 < String
# refs_textile:: Textile references (i.e. [hobix]http://hobix.com/) # refs_textile:: Textile references (i.e. [hobix]http://hobix.com/)
# block_textile_table:: Textile table block structures # block_textile_table:: Textile table block structures
# block_textile_lists:: Textile list structures # block_textile_lists:: Textile list structures
# block_textile_prefix:: Textile blocks with prefixes (i.e. bq., h3., etc.) # block_textile_prefix:: Textile blocks with prefixes (i.e. bq., h2., etc.)
# inline_textile_image:: Textile inline images # inline_textile_image:: Textile inline images
# inline_textile_link:: Textile inline links # inline_textile_link:: Textile inline links
# inline_textile_span:: Textile inline spans # inline_textile_span:: Textile inline spans
@ -457,7 +457,7 @@ class RedCloth3 < String
# text.gsub! re, resub # text.gsub! re, resub
#end #end
text.gsub!(/\b([A-Z][A-Z0-9]{1,})\b(?:[(]([^)]*)[)])/) do |m| text.gsub!(/\b([A-Z][A-Z0-9]{1,})\b(?:[(]([^)]*)[)])/) do |m|
"<acronym title=\"#{htmlesc $2}\">#{$1}</acronym>" "<abbr title=\"#{htmlesc $2}\">#{$1}</abbr>"
end end
end end
@ -525,7 +525,7 @@ class RedCloth3 < String
tatts = pba( tatts, 'table' ) tatts = pba( tatts, 'table' )
tatts = shelve( tatts ) if tatts tatts = shelve( tatts ) if tatts
rows = [] rows = []
fullrow.gsub!(/([^|])\n/, "\\1<br />")
fullrow.each_line do |row| fullrow.each_line do |row|
ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
cells = [] cells = []
@ -699,7 +699,7 @@ class RedCloth3 < String
end end
alias textile_h1 textile_p alias textile_h1 textile_p
alias textile_h3 textile_p alias textile_h2 textile_p
alias textile_h3 textile_p alias textile_h3 textile_p
alias textile_h4 textile_p alias textile_h4 textile_p
alias textile_h5 textile_p alias textile_h5 textile_p
@ -733,7 +733,7 @@ class RedCloth3 < String
SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m
def block_markdown_setext( text ) def block_markdown_setext( text )
if text =~ SETEXT_RE if text =~ SETEXT_RE
tag = if $2 == "="; "h1"; else; "h3"; end tag = if $2 == "="; "h1"; else; "h2"; end
blk, cont = "<#{ tag }>#{ $1 }</#{ tag }>", $' blk, cont = "<#{ tag }>#{ $1 }</#{ tag }>", $'
blocks cont blocks cont
text.replace( blk + cont ) text.replace( blk + cont )
@ -1166,7 +1166,7 @@ class RedCloth3 < String
'li' => nil, 'li' => nil,
'p' => nil, 'p' => nil,
'h1' => nil, 'h1' => nil,
'h3' => nil, 'h2' => nil,
'h3' => nil, 'h3' => nil,
'h4' => nil, 'h4' => nil,
'h5' => nil, 'h5' => nil,

1148
public/application.css
View File

File diff suppressed because it is too large Load Diff

6
public/stylesheets/nyan.css
Unescape View File

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

65
public/themes/redpenny-master/stylesheets/application.css
Unescape 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
{ {

Write Preview
Loading…
Cancel
Save