aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-12-16 19:57:49 -0800
committerzotlabs <mike@macgirvin.com>2016-12-16 19:57:49 -0800
commit0c665e11f11c081111411fa2938e8e3f00d02634 (patch)
treee488c81a3aa5bd18982c5522240b01a449f40633 /view/theme
parent827d4c5fb094715a65d4559f8c6159eb5d31d5f7 (diff)
parent6eed7eb54054502d438ea18a9411d3be7cdf14fc (diff)
downloadvolse-hubzilla-0c665e11f11c081111411fa2938e8e3f00d02634.tar.gz
volse-hubzilla-0c665e11f11c081111411fa2938e8e3f00d02634.tar.bz2
volse-hubzilla-0c665e11f11c081111411fa2938e8e3f00d02634.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css16
-rw-r--r--view/theme/redbasic/js/redbasic.js18
2 files changed, 24 insertions, 10 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5f5df808f..9bc39dfb4 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -473,7 +473,6 @@ footer {
#contact-block {
width: 100%;
- float: left;
}
#contact-block-numcontacts {
@@ -482,12 +481,10 @@ footer {
}
.contact-block-div {
- float: left;
- width: 50px;
- height: 50px;
+ display: inline;
}
+
.contact-block-textdiv {
- float: left;
width: 150px;
height: 34px;
}
@@ -495,12 +492,11 @@ footer {
#contact-block-end {
clear: both;
}
-.contact-block-link {
- float: left;
-}
+
.contact-block-img {
- width:48px;
- height:48px;
+ width:47px;
+ height:47px;
+ margin-bottom: 3px;
}
#tag-remove {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c5f74db3f..8fb1117ce 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,6 +16,23 @@ $(document).ready(function() {
}
$('#css3-calc').remove(); // Remove the test element
+ if($(window).outerWidth() > 767) {
+ $('#left_aside_wrapper').stick_in_parent({
+ offset_top: $('nav').outerHeight(true)
+ });
+ }
+
+ $(window).resize(function() {
+ if($(window).outerWidth() > 767) {
+ $('#left_aside_wrapper').stick_in_parent({
+ offset_top: $('nav').outerHeight(true)
+ });
+ }
+ else {
+ $('#left_aside_wrapper').trigger("sticky_kit:detach");
+ }
+ });
+
$('#expand-aside').click(function() {
$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
$('main').toggleClass('region_1-on');
@@ -72,5 +89,6 @@ function makeFullScreen(full) {
$('#tabs-collapse-1').css({'visibility': ''});
$('#inline-btn').hide();
$('main').css({'transition': ''});
+ $(document.body).trigger("sticky_kit:recalc");
}
}