aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-28 14:58:48 -0700
committerzotlabs <mike@macgirvin.com>2017-03-28 14:58:48 -0700
commitd12b360e926c5df8da1639a5935fcd3e9236e4e3 (patch)
treea5eed2bf4fa37183435a39ecbd73a0d75aff0c22 /view/theme
parent3e6088c6142d1dabbfdbb8b5df276ae942bd3554 (diff)
parent5564b47dbc640b30a8090a6138f0c2f841accbe9 (diff)
downloadvolse-hubzilla-d12b360e926c5df8da1639a5935fcd3e9236e4e3.tar.gz
volse-hubzilla-d12b360e926c5df8da1639a5935fcd3e9236e4e3.tar.bz2
volse-hubzilla-d12b360e926c5df8da1639a5935fcd3e9236e4e3.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/narrow_navbar.css2
-rw-r--r--view/theme/redbasic/css/style.css8
-rw-r--r--view/theme/redbasic/js/redbasic.js7
3 files changed, 12 insertions, 5 deletions
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index 33db6ce83..99f083638 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -11,7 +11,7 @@
}
.contextual-help-content-open {
- top: 2.4rem;
+ top: 2.5rem;
}
aside {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3265f1c44..156df07ff 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -191,7 +191,7 @@ nav {
.contextual-help-content-open {
display: block;
position: fixed;
- top: 3.25rem;
+ top: 3.35rem;
left: 0px;
width: 100%;
max-height: 50%;
@@ -1211,12 +1211,12 @@ a.active:hover .dropdown-sub-text {
}
.usermenu {
- width: 3.5rem;
+ width: 3.75rem;
}
#avatar {
- width: 2.2rem;
- height: 2.2rem;
+ width: 2.35rem;
+ height: 2.35rem;
border-radius: $radius;
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 14b977b80..fb048518e 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -3,6 +3,13 @@
*/
$(document).ready(function() {
+ //this is a hotfix to make collapsible bs panels work again. this needs fixing in bootstrap.
+ $('a').on('click', function(e) {
+ if($(this).data('toggle') == 'collapse') {
+ e.preventDefault();
+ }
+ });
+
// CSS3 calc() fallback (for unsupported browsers)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) {