aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-01-05 12:19:14 -0800
committerzotlabs <mike@macgirvin.com>2017-01-05 12:19:14 -0800
commita87d12f167ebed14736b7480d2c32be1e003c409 (patch)
tree3de27c400dcfbc20e1343fd0e983cccff7c6f493
parentec18c3770bd1ff444713c94f8405b75692848274 (diff)
parent3e0ea9727fd73daafea5597e76fab8eed252f215 (diff)
downloadvolse-hubzilla-a87d12f167ebed14736b7480d2c32be1e003c409.tar.gz
volse-hubzilla-a87d12f167ebed14736b7480d2c32be1e003c409.tar.bz2
volse-hubzilla-a87d12f167ebed14736b7480d2c32be1e003c409.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--view/css/widgets.css3
-rw-r--r--view/php/default.php2
-rw-r--r--view/theme/redbasic/js/redbasic.js8
-rw-r--r--view/tpl/notes.tpl7
4 files changed, 13 insertions, 7 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css
index abaf03038..9b97d8bf7 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -64,8 +64,9 @@ li:hover .widget-nav-pills-icons {
#note-text {
padding: 5px;
width: 100%;
- resize: vertical;
+ resize: none;
min-height: 250px;
+ overflow: hidden;
}
/* saved searches */
diff --git a/view/php/default.php b/view/php/default.php
index 839a36b5b..373fa2fd0 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -10,7 +10,7 @@
<header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main>
- <aside id="region_1"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></aside>
+ <aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
<div id="pause"></div>
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 185dc7bcd..3ff0c43ae 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -18,7 +18,9 @@ $(document).ready(function() {
if($(window).width() > 767) {
$('#left_aside_wrapper').stick_in_parent({
- offset_top: $('nav').outerHeight(true)
+ offset_top: $('nav').outerHeight(true),
+ parent: '#region_1',
+ spacer: '#left_aside_spacer'
});
}
@@ -105,7 +107,9 @@ function toggleAside() {
$('main').addClass('region_1-on')
$('<div id="overlay"></div>').appendTo('section');
$('#left_aside_wrapper').stick_in_parent({
- offset_top: $('nav').outerHeight(true) - 10
+ offset_top: $('nav').outerHeight(true) - 10,
+ parent: '#region_1',
+ spacer: '#left_aside_spacer'
});
}
}
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index f9fed1feb..c4da3783b 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -5,9 +5,10 @@
var noteSaveTimer = null;
var noteText = $('#note-text');
- $(document).ready(function(){
- noteText.height(noteText[0].scrollHeight);
- });
+ noteText.on('change keyup keydown paste cut', function () {
+ $(this).height(0).height(this.scrollHeight);
+ $(document.body).trigger("sticky_kit:recalc");
+ }).change();
$(document).on('focusout',"#note-text",function(e){
if(noteSaveTimer)