aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot.php2
-rw-r--r--view/css/default.css6
-rw-r--r--view/js/main.js23
-rw-r--r--view/js/mod_hq.js3
-rw-r--r--view/php/default.php2
-rw-r--r--view/theme/redbasic/css/style.css28
-rw-r--r--view/theme/redbasic/js/redbasic.js36
-rw-r--r--view/tpl/conv_item.tpl4
-rw-r--r--view/tpl/navbar_default.tpl4
9 files changed, 34 insertions, 74 deletions
diff --git a/boot.php b/boot.php
index 95726d9f6..5a6a3a913 100644
--- a/boot.php
+++ b/boot.php
@@ -60,7 +60,7 @@ require_once('include/bbcode.php');
require_once('include/items.php');
define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '8.7.1');
+define('STD_VERSION', '8.7.3');
define('ZOT_REVISION', '6.0');
define('DB_UPDATE_VERSION', 1258);
diff --git a/view/css/default.css b/view/css/default.css
index bb6498193..768775fbc 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -20,7 +20,8 @@ main {
position: relative;
order: 1;
padding: 4.5rem 7px 0px 7px;
- width: 350px;
+ width: 25%;
+ min-width: 300px;
}
#region_2 {
@@ -35,5 +36,6 @@ main {
position: relative;
order: 3;
padding: 4.5rem 7px 0px 7px;
- width: 350px;
+ width: 25%;
+ min-width: 300px;
}
diff --git a/view/js/main.js b/view/js/main.js
index c463b1f59..ced1a517e 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -86,6 +86,10 @@ $(document).ready(function() {
$(document).on('click', '.conversation-settings-link', getConversationSettings);
$(document).on('click', '#settings_module_ajax_submit', postConversationSettings);
+ $(document).on('click', '#expand-aside', function() {
+ toggleAside();
+ });
+
$(document).on('click focus', '.comment-edit-form textarea', function(e) {
if(! this.autocomplete_handled) {
/* autocomplete @nicknames */
@@ -1779,4 +1783,21 @@ function push_notification(title, body, b64mid) {
}
}
-
+function toggleAside() {
+ if ($('main.region_1-on').length) {
+ $('#expand-aside-icon').addClass('fa-arrow-circle-right').removeClass('fa-arrow-circle-left');
+ $('html, body').css({ 'position': '', 'left': '' });
+ $('main').removeClass('region_1-on');
+ $('#region_1').addClass('d-none');
+ $('#region_2').css({ 'min-width': '' });
+ $('#overlay').remove();
+ }
+ else {
+ $('#expand-aside-icon').removeClass('fa-arrow-circle-right').addClass('fa-arrow-circle-left');
+ $('html, body').css({ 'position': 'sticky', 'left': '0px'});
+ $('main').addClass('region_1-on');
+ $('#region_1').removeClass('d-none');
+ $('#region_2').css({ 'min-width': window.outerWidth });
+ $('<div id="overlay"></div>').appendTo('body').one('click', function() { toggleAside(); });
+ }
+}
diff --git a/view/js/mod_hq.js b/view/js/mod_hq.js
index dc274c5bf..1e4c02768 100644
--- a/view/js/mod_hq.js
+++ b/view/js/mod_hq.js
@@ -20,20 +20,17 @@ $(document).ready(function() {
$(document).on('click', '.channel-activities-toggle', function(e) {
$(window).scrollTop(0);
- $(document).trigger('hz:hqControlsClickAction');
$('#channel-activities').toggleClass('d-none');
$(this).toggleClass('active');
});
$(document).on('click', '.jot-toggle', function(e) {
- $(document).trigger('hz:hqControlsClickAction');
$('#jot-popup').toggle();
$('#profile-jot-text').focus().get(0).scrollIntoView({block: 'center'});
$(this).toggleClass('active');
});
$(document).on('click', '.notes-toggle', function(e) {
- $(document).trigger('hz:hqControlsClickAction');
$('#personal-notes').toggleClass('d-none');
$('#note-text-html').get(0).scrollIntoView({block: 'center'});
$(this).toggleClass('active');
diff --git a/view/php/default.php b/view/php/default.php
index f0699090a..8d2c092a3 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -24,7 +24,7 @@
<main>
<div class="content">
<div class="columns">
- <aside id="region_1"><div class="aside_spacer_top_left"></div><div class="aside_spacer_left"><div id="left_aside_wrapper" class="aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
+ <aside id="region_1" class="d-none d-lg-block"><div class="aside_spacer_top_left"></div><div class="aside_spacer_left"><div id="left_aside_wrapper" class="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/css/style.css b/view/theme/redbasic/css/style.css
index 2805ed718..6ba5acd63 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1382,34 +1382,6 @@ blockquote {
z-index:1030;
}
-
-
-@media screen and (max-width: 992px) {
-
- main {
- left: -$left_aside_widthrem;
- width: calc( 100% + $left_aside_widthrem );
- }
-
- main.region_1-on {
- left: 0px;
- }
-
- #nav-app-link-wrapper {
- min-width: 0;
- }
-
- #nav-app-link-wrapper {
- margin-right: 0.5rem;
- }
-
- #navbar-collapse-2 .navbar-app i {
- font-size: 1rem;
- margin-right: 0.5rem;
- }
-
-}
-
.shareable_element_text {
height: 300px;
width: 300px;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 706bf2808..c288c8b92 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -8,20 +8,15 @@ let redbasic_theme_color = localStorage.getItem('redbasic_theme_color');
if (redbasic_dark_mode == 1) {
$('html').attr('data-bs-theme', 'dark');
}
+
if (redbasic_dark_mode == 0) {
$('html').attr('data-bs-theme', 'light');
}
-
-
-
-
if (redbasic_theme_color) {
$('meta[name=theme-color]').attr('content', redbasic_theme_color);
}
-
-
$(document).ready(function() {
// provide a fake progress bar for pwa standalone mode
if (window.matchMedia('(display-mode: standalone)').matches) {
@@ -69,15 +64,6 @@ $(document).ready(function() {
stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
}
- $('#expand-aside').on('click', function() {
- if($('main').hasClass('region_1-on')){
- toggleAside('left');
- }
- else {
- toggleAside('right');
- }
- });
-
$('.usermenu').click(function() {
if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
@@ -168,7 +154,7 @@ $(document).ready(function() {
if (touch_end > (touch_start + touch_offset)) {
//a left -> right swipe
if (touch_start < touch_max) {
- toggleAside('right');
+ toggleAside();
}
}
if (touch_end < (touch_start - touch_offset)) {
@@ -178,10 +164,6 @@ $(document).ready(function() {
}
});
- $(document).on('hz:hqControlsClickAction', function(e) {
- toggleAside('left');
- });
-
});
function setStyle(element, cssProperty) {
@@ -255,18 +237,4 @@ function makeFullScreen(full) {
}
}
-function toggleAside(swipe) {
- if ($('main').hasClass('region_1-on') && swipe === 'left') {
- $('#expand-aside-icon').addClass('fa-arrow-circle-right').removeClass('fa-arrow-circle-left');
- $('html, body').css({ 'position': '', left: '' });
- $('main').removeClass('region_1-on');
- $('#overlay').remove();
- }
- if (!$('main').hasClass('region_1-on') && swipe === 'right') {
- $('#expand-aside-icon').removeClass('fa-arrow-circle-right').addClass('fa-arrow-circle-left');
- $('html, body').css({ 'position': 'sticky', 'left': '0px'});
- $('main').addClass('region_1-on');
- $('<div id="overlay"></div>').appendTo('body').one('click', function() { toggleAside('left'); });
- }
-}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index d4299812d..041140879 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -7,7 +7,7 @@
<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite{{/if}}" data-b64mids='{{$item.mids}}'>
<a name="item_{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
- <div class="rounded clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
+ <div class="rounded wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
{{if $item.photo}}
<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
{{$item.photo}}
@@ -26,7 +26,7 @@
<hr class="m-0">
{{/if}}
{{/if}}
- <div class="p-2 wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}}" >
+ <div class="p-2 wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}} clearfix">
<div class="text-end float-end">
<div class="wall-item-ago opacity-75" id="wall-item-ago-{{$item.id}}">
{{if $item.editedtime}}
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index c6f350b09..019ed044a 100644
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -48,7 +48,7 @@
{{/if}}
</div>
{{if $sel.name}}
- <div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation}} has_location{{/if}}">
+ <div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation}} has_location{{/if}} p-1">
<a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate" style="width: 100%">
{{$sel.name}}
{{if $sitelocation}}
@@ -57,7 +57,7 @@
</a>
</div>
{{if $settings_url}}
- <div id="nav-app-settings-link-wrapper" class="navbar-nav">
+ <div id="nav-app-settings-link-wrapper" class="navbar-nav p-1">
<a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link">
<i class="fa fa-fw fa-cog"></i>
</a>