aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-19 17:39:42 -0800
committerzotlabs <mike@macgirvin.com>2017-11-19 17:39:42 -0800
commit6a49e3124e193edf57005873e825bf8328649183 (patch)
tree138c2387b7d107575f89a3de9ad3c35ae2ce60c6 /view/theme
parent16f584608f8147a58bfe295ff3295aae0f85b38a (diff)
parent88d0bf94d89ac739469528bdab7905d0c00cf8a9 (diff)
downloadvolse-hubzilla-6a49e3124e193edf57005873e825bf8328649183.tar.gz
volse-hubzilla-6a49e3124e193edf57005873e825bf8328649183.tar.bz2
volse-hubzilla-6a49e3124e193edf57005873e825bf8328649183.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css7
-rw-r--r--view/theme/redbasic/js/redbasic.js10
2 files changed, 12 insertions, 5 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6df5a060b..5f31004ff 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1484,7 +1484,7 @@ blockquote {
color: $nav_active_icon_colour;
}
-@media screen and (max-width: 767px) {
+@media screen and (max-width: 992px) {
aside#region_1 {
border-right: 1px solid $nav_bd;
@@ -1504,6 +1504,11 @@ blockquote {
flex-basis: 25%;
}
+ #navbar-collapse-2 .navbar-app i {
+ font-size: 1rem;
+ margin-right: 0.5rem;
+ }
+
}
.shareable_element_text {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index ed9ef02aa..41f5eb7ce 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -8,7 +8,7 @@ $(document).ready(function() {
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) {
$(window).resize(function() {
- if($(window).width() < 767) {
+ if($(window).width() < 992) {
$('main').css('width', $(window).width() + $('aside').outerWidth() );
} else {
$('main').css('width', '100%' );
@@ -17,7 +17,7 @@ $(document).ready(function() {
}
$('#css3-calc').remove(); // Remove the test element
- if($(window).width() >= 767) {
+ if($(window).width() >= 992) {
$('#left_aside_wrapper').stick_in_parent({
offset_top: parseInt($('aside').css('padding-top')),
parent: 'main',
@@ -25,7 +25,7 @@ $(document).ready(function() {
});
}
- if($(window).width() >= 1200) {
+ if($(window).width() >= 992) {
$('#right_aside_wrapper').stick_in_parent({
offset_top: parseInt($('aside').css('padding-top')),
parent: 'main',
@@ -77,7 +77,9 @@ $(document).ready(function() {
}
});
- $('#notifications-btn').click(function() {
+ $('.notifications-btn').click(function(e) {
+ e.preventDefault();
+ e.stopPropagation();
if($('#navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-2').removeClass('show');
}