aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-04-14 23:14:52 -0700
committerSimon <simon@kisikew.org>2012-04-14 23:14:52 -0700
commit4572179a24d575df19b96427479dc11f7d137683 (patch)
treef7b6f7a086a96a096730b19ed520b93ca534427c /view/theme/dispy
parentdddf3307af24de71a8b6e52a984ba2f2e310c3b7 (diff)
parentd836be1dc3dfee6f969fab0c03094af8b44dd697 (diff)
downloadvolse-hubzilla-4572179a24d575df19b96427479dc11f7d137683.tar.gz
volse-hubzilla-4572179a24d575df19b96427479dc11f7d137683.tar.bz2
volse-hubzilla-4572179a24d575df19b96427479dc11f7d137683.zip
Merge pull request #236 from simonlnu/master
fix fpostJS, add and fix some other stuff
Diffstat (limited to 'view/theme/dispy')
-rw-r--r--view/theme/dispy/communityhome.tpl2
-rw-r--r--view/theme/dispy/jot-header.tpl2
-rw-r--r--view/theme/dispy/style.css4
3 files changed, 4 insertions, 4 deletions
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index edabab611..df8bbad7c 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -39,6 +39,6 @@
<h3 id="postit-header">'PostIt' to Friendica</h3>
<div id="postit">
-<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
+<a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
</div>
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 44120da40..5838729cc 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -36,7 +36,7 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : true,
+ force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
convert_urls: false,
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 47e1d1132..92d27a2c8 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -2777,8 +2777,8 @@ div[id$="wrapper"] br {
}
#pause {
position: fixed;
- bottom: 5px;
- right: 5px;
+ bottom: 40px;
+ right: 30px;
}
.border, .border:hover {
border: 1px solid #babdb6;