wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into base-url

Browse Source 
Conflicts:
	lib/gollum/frontend/public/gollum/css/_styles.css
	lib/gollum/frontend/public/gollum/javascript/gollum.js
	lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js
	lib/gollum/frontend/templates/file_view.mustache
	lib/gollum/frontend/templates/layout.mustache
	lib/gollum/frontend/templates/page.mustache
This commit is contained in:
Sunny Ripert
2012-07-25 10:00:52 +02:00
parent 0269cd0b3b f811ac510e
commit b5653464d2
119 changed files with 1324 additions and 11613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/frontend/templates/layout.mustache
+10 -4
View File
@@ -6,19 +6,25 @@
<link rel="stylesheet" type="text/css" href="{{base_url}}css/editor.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}css/dialog.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}css/template.css" media="all">
<!--[if IE 7]>
<link rel="stylesheet" type="text/css" href="{{base_url}}css/ie7.css" media="all">
<![endif]-->
<script>var baseUrl = '{{base_url}}'</script>
<script type="text/javascript" src="{{base_url}}javascript/jquery.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/mousetrap.min.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/gollum.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/gollum.dialog.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/gollum.placeholder.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/editor/gollum.editor.js"></script>
{{#mathjax}}<script type="text/javascript" src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>{{/mathjax}}
{{#mathjax}}<script>(function(d,j){
j = d.createElement('script');
j.src = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
(d.head || d.getElementsByTagName('head')[0]).appendChild(j);
}(document));
</script>{{/mathjax}}
<title>{{title}}</title>
</head>
<body>