mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-26 02:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge pull request #1124 from Wikinaut/fix-issue-377-add-favicon-url-settings-parameter

Browse source 
fix #377: add favicon url as optional settings.json parameter
This commit is contained in:
John McLear 2012-11-06 03:08:25 -08:00
commit 28bcdcec25
6 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/templates/index.html
View file

@ -32,7 +32,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link rel="shortcut icon" href="favicon.ico">
<link rel="shortcut icon" href="<%=settings.favicon%>">
<style>
html, body {

2
src/templates/pad.html
View file

@ -32,7 +32,7 @@
<meta name="robots" content="noindex, nofollow">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link rel="shortcut icon" href="../favicon.ico">
<link rel="shortcut icon" href="<%=settings.favicon%>">
<% e.begin_block("styles"); %>
<link href="../static/css/pad.css" rel="stylesheet">

2
src/templates/timeslider.html
View file

@ -30,7 +30,7 @@
<head>
<meta charset="utf-8">
<meta name="robots" content="noindex, nofollow">
<link rel="shortcut icon" href="../../favicon.ico">
<link rel="shortcut icon" href="<%=settings.favicon%>">
<link rel="stylesheet" href="../../static/css/pad.css">
<link rel="stylesheet" href="../../static/css/timeslider.css">
<link rel="stylesheet" href="../../static/custom/timeslider.css">