aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-03-28 19:29:42 +0200
committerMario Vavti <mario@mariovavti.com>2017-03-28 19:29:42 +0200
commit28ad60f892f1cdebe704e4bc1aa964d3366f4dcf (patch)
treec3aa5b89d9515937ff36ba2e94910fa108f4f769
parent171b6a222d164e157ebaaba6ee177ccbb6c14514 (diff)
downloadvolse-hubzilla-28ad60f892f1cdebe704e4bc1aa964d3366f4dcf.tar.gz
volse-hubzilla-28ad60f892f1cdebe704e4bc1aa964d3366f4dcf.tar.bz2
volse-hubzilla-28ad60f892f1cdebe704e4bc1aa964d3366f4dcf.zip
some fixes for latest bs-dev
-rw-r--r--view/css/bootstrap-red.css3
-rw-r--r--view/theme/redbasic/css/narrow_navbar.css2
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/theme/redbasic/js/redbasic.js7
4 files changed, 12 insertions, 2 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index c8da05787..69886b141 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -55,6 +55,9 @@ nav.navbar {
overflow: auto;
}
+.navbar-inverse .navbar-toggler {
+ color: rgba(255,255,255,1);
+}
/* nav overrides end */
.wall-item-tools .dropdown-menu {
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 3616e3de6..d5edc6902 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%;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 14b977b80..4d9a1d6cc 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 templates.
+ $('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) {