summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etherpad/etc/etherpad.localdev-default.properties2
-rw-r--r--etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs2
-rw-r--r--etherpad/src/templates/admin/pluginmanager.ejs2
3 files changed, 3 insertions, 3 deletions
diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties
index c540d12..1143178 100644
--- a/etherpad/etc/etherpad.localdev-default.properties
+++ b/etherpad/etc/etherpad.localdev-default.properties
@@ -16,4 +16,4 @@ transportPrefix = /comet
transportUseWildcardSubdomains = true
useVirtualFileRoot = ./src
motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0
-topdomains = localhost,redhog.org
+topdomains = localhost
diff --git a/etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs b/etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs
index d5d09c3..1f33eb8 100644
--- a/etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs
+++ b/etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs
@@ -54,7 +54,7 @@ limitations under the License. */ %>
<div id="padpage">
<div id="padtop">
- <div id="topbar" style="margin: 7px; margin-top: 0px;">
+ <div id="topbar">
<div id="topbarleft"><!-- --></div>
<div id="topbarright"><!-- --></div>
<div id="topbarcenter"><a href="/" id="topbaretherpad">EtherPad</a></div>
diff --git a/etherpad/src/templates/admin/pluginmanager.ejs b/etherpad/src/templates/admin/pluginmanager.ejs
index 1cd7139..077d10a 100644
--- a/etherpad/src/templates/admin/pluginmanager.ejs
+++ b/etherpad/src/templates/admin/pluginmanager.ejs
@@ -53,7 +53,7 @@ limitations under the License. */ %>
<div id="padpage">
<div id="padtop">
- <div id="topbar" style="margin: 7px; margin-top: 0px;">
+ <div id="topbar">
<div id="topbarleft"><!-- --></div>
<div id="topbarright"><!-- --></div>
<div id="topbarcenter"><a href="/" id="topbaretherpad">EtherPad</a></div>