harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
zotlabs 2017-01-05 12:19:14 -08:00
commit a87d12f167
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
view/css/widgets.css
View File

@ -64,8 +64,9 @@ li:hover .widget-nav-pills-icons {
#note-text { #note-text {
padding: 5px; padding: 5px;
width: 100%; width: 100%;
resize: vertical; resize: none;
min-height: 250px; min-height: 250px;
overflow: hidden;
} }
/* saved searches */ /* saved searches */

2
view/php/default.php
View File

@ -10,7 +10,7 @@
<header><?php if(x($page,'header')) echo $page['header']; ?></header> <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> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main> <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']; ?> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
<div id="pause"></div> <div id="pause"></div>

8
view/theme/redbasic/js/redbasic.js
View File

@ -18,7 +18,9 @@ $(document).ready(function() {
if($(window).width() > 767) { if($(window).width() > 767) {
$('#left_aside_wrapper').stick_in_parent({ $('#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') $('main').addClass('region_1-on')
$('<div id="overlay"></div>').appendTo('section'); $('<div id="overlay"></div>').appendTo('section');
$('#left_aside_wrapper').stick_in_parent({ $('#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'
}); });
} }
} }

7
view/tpl/notes.tpl
View File

@ -5,9 +5,10 @@
var noteSaveTimer = null; var noteSaveTimer = null;
var noteText = $('#note-text'); var noteText = $('#note-text');
$(document).ready(function(){ noteText.on('change keyup keydown paste cut', function () {
noteText.height(noteText[0].scrollHeight); $(this).height(0).height(this.scrollHeight);
}); $(document.body).trigger("sticky_kit:recalc");
}).change();
$(document).on('focusout',"#note-text",function(e){ $(document).on('focusout',"#note-text",function(e){
if(noteSaveTimer) if(noteSaveTimer)