diff options
| author | Peter Martischka <pita@pitapoison.de> | 2010-04-08 14:19:02 +0200 |
|---|---|---|
| committer | Peter Martischka <pita@pitapoison.de> | 2010-04-08 14:19:02 +0200 |
| commit | 9c1dfc38451a4ee70c99de16bd5799cbe0c69730 (patch) | |
| tree | 2207e094cd042fc703f5626b6d8ed4780ae3fdc9 /etherpad | |
| parent | a4fb5aafdf290308966a2311d28a70a6ddfb4802 (diff) | |
| parent | d84d8b6bd3e6443c5d78b761d1585eaec24f77e7 (diff) | |
| download | etherpad-9c1dfc38451a4ee70c99de16bd5799cbe0c69730.tar.gz etherpad-9c1dfc38451a4ee70c99de16bd5799cbe0c69730.tar.bz2 etherpad-9c1dfc38451a4ee70c99de16bd5799cbe0c69730.zip | |
Merge branch 'master' of git://github.com/ether/pad
Diffstat (limited to 'etherpad')
| -rw-r--r-- | etherpad/etc/etherpad.localdev-default.properties | 2 | ||||
| -rw-r--r-- | etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs | 2 | ||||
| -rw-r--r-- | etherpad/src/templates/admin/pluginmanager.ejs | 2 |
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> |