Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2009-07-07 00:15:33 -05:00
commit ad087b270a
3 changed files with 7 additions and 1 deletions

View file

@ -13,11 +13,11 @@
<meta name="defaultView" content="slideshow" />
<meta name="controlVis" content="hidden" />
<!-- style sheet links -->
<link rel="stylesheet" href="/s5/themes/<%=@s5_theme%>/slides.css" type="text/css" media="projection" id="slideProj" />
<link rel="stylesheet" href="/s5/ui/core/outline.css" type="text/css" media="screen" id="outlineStyle" />
<link rel="stylesheet" href="/s5/ui/core/print.css" type="text/css" media="print" id="slidePrint" />
<link rel="stylesheet" href="/s5/ui/core/opera.css" type="text/css" media="projection" id="operaFix" />
<link rel="stylesheet" href="/s5/ui/core/math.css" type="text/css" media="all" id="mathStyle" />
<link rel="stylesheet" href="/s5/themes/<%=@s5_theme%>/slides.css" type="text/css" media="projection" id="slideProj" />
<!-- S5 JS -->
<script src="/s5/ui/core/slides.js" type="text/javascript"></script>

View file

@ -100,3 +100,6 @@ img.incremental {visibility:hidden}
/* diagnostics
li:after {content:" [" attr(class) "]";color:#F88}
*/
pre.ruby span.ident { color: #AAF; }
pre.ruby span.punct { color: #9C8CFF; }
pre.xml .punct { color: #8DF; font-weight: bold; }

View file

@ -95,3 +95,6 @@ img.incremental {visibility:hidden}
/* diagnostics
li:after {content:" [" attr(class) "]";color:#F88}
*/
pre.ruby span.ident { color: #229; }
pre.ruby span.punct { color: #4838AB; }
pre.xml .punct { color: #059; font-weight: bold; }