diff options
| author | John McLear <john@mclear.co.uk> | 2014-11-19 00:17:01 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2014-11-19 00:17:01 +0000 |
| commit | 16d8068d7d79a4e35e251153918cbf84b6b1a15e (patch) | |
| tree | ca43dcf021a9b87ee712dec3a90f5e7570f4afbc /src/templates | |
| parent | 9aea689438d364cfd89a476d06729b3dd1195b8e (diff) | |
| parent | 7b9fd81284a6e2191d007769c899907ea3f64232 (diff) | |
| download | etherpad-lite-16d8068d7d79a4e35e251153918cbf84b6b1a15e.zip | |
Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/pad.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/templates/pad.html b/src/templates/pad.html index b996ab6a..f0267002 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -41,7 +41,11 @@ <% e.begin_block("styles"); %> <link href="../static/css/pad.css" rel="stylesheet"> + + <% e.begin_block("customStyles"); %> <link href="../static/custom/pad.css" rel="stylesheet"> + <% e.end_block(); %> + <style title="dynamicsyntax"></style> <% e.end_block(); %> @@ -345,7 +349,9 @@ <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script> <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script> + <% e.begin_block("customScripts"); %> <script type="text/javascript" src="../static/custom/pad.js"></script> + <% e.end_block(); %> <!-- Bootstrap page --> <script type="text/javascript"> |