deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed inline SVG in S5.

Browse source 
More S5 Stylesheet tweaks.
This commit is contained in:
Jacques Distler 2007-03-01 10:50:06 -06:00
parent 41ff4724b8
commit 6a7645c45c
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/wiki_controller.rb
View file

@ -290,7 +290,6 @@ class WikiController < ApplicationController
def s5 def s5
if @web.markup == :markdownMML or @web.markup == :markdown if @web.markup == :markdownMML or @web.markup == :markdown
# @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), {:raw => true}).to_s5)
@s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
{:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}'], :content_only => true, {:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}'], :content_only => true,
:author => @page.author, :title => @page.plain_name}).to_s5) :author => @page.author, :title => @page.plain_name}).to_s5)

2
app/views/wiki/page.rhtml
View file

@ -44,7 +44,7 @@
<%= link_to 'PDF', {:web => @web.address, :action => 'pdf', :id => @page.name}, <%= link_to 'PDF', {:web => @web.address, :action => 'pdf', :id => @page.name},
{:id => 'view_pdf'} %> {:id => 'view_pdf'} %>
<% end %> <% end %>
<% if #{@params['category']} == 'S5-slideshow' %> <% if WikiReference.pages_in_category('S5-slideshow').map.include?(@page.name) %>
| |
<%= link_to 'S5', {:web => @web.address, :action => 's5', :id => @page.name} %> <%= link_to 'S5', {:web => @web.address, :action => 's5', :id => @page.name} %>
<% end %> <% end %>

14
public/s5/ui/default/math.css
View file

@ -3,3 +3,17 @@ math[display=block] {overflow:auto;}
math { white-space: nowrap } math { white-space: nowrap }
.maruku-eq-number {float:right} .maruku-eq-number {float:right}
.blockquotesource {margin-left:1em;} .blockquotesource {margin-left:1em;}
table.plaintable {
border-collapse:collapse;
margin-left:30px;
border:0;
}
.plaintable td {border:1px solid #000; padding: 3px;}
.plaintable th {padding: 3px;}
.plaintable caption {
font-weight: bold;
font-size:1.1em;
text-align:center;
margin-left:30px;
}

3
public/s5/ui/default/pretty.css
View file

@ -54,7 +54,7 @@ html>body div#controls {position: fixed; padding: 0; top: auto;}
cursor: pointer;} cursor: pointer;}
#controls #navList #jumplist {background: #DDD; color: #272;} #controls #navList #jumplist {background: #DDD; color: #272;}
#currentSlide {text-align: center; font-size: 0.5em; color: #494;} #currentSlide {text-align: center; font-size: 0.5em; color: #4E4;}
#slide0 {padding-top: 3.5em; font-size: 90%;} #slide0 {padding-top: 3.5em; font-size: 90%;}
#slide0 h1 {position: static; margin: 1em 0 0; padding: 0; #slide0 h1 {position: static; margin: 1em 0 0; padding: 0;
@ -75,7 +75,6 @@ html>body .external {border-bottom: none;}
img.incremental {visibility: hidden;} img.incremental {visibility: hidden;}
.slide .current {color: #B02;} .slide .current {color: #B02;}
/* diagnostics /* diagnostics
li:after {content: " [" attr(class) "]"; color: #F88;} li:after {content: " [" attr(class) "]"; color: #F88;}

4
public/s5/ui/default/slides.js
View file

@ -33,8 +33,8 @@ var isOp = navigator.userAgent.indexOf('Opera') > -1 ? 1 : 0;
var isGe = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('Safari') < 1 ? 1 : 0; var isGe = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('Safari') < 1 ? 1 : 0;
function hasClass(object, className) { function hasClass(object, className) {
if (!object.className) return false; if (!object.className ||!object.getAttribute('class')) return false;
return (object.className.search('(^|\\s)' + className + '(\\s|$)') != -1); return (object.getAttribute('class').search('(^|\\s)' + className + '(\\s|$)') != -1);
} }
function hasValue(object, value) { function hasValue(object, value) {