aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-06-07 22:40:44 +0200
committerMario Vavti <mario@mariovavti.com>2017-06-07 22:40:44 +0200
commit55836e8ca65ca9a2ae25591de3232470d7a50049 (patch)
treeface76b8cda01ebfe8a1d3090235f1b524b75761 /view
parenta17acfb04f9a97e575839eefbd5f46f020c3a589 (diff)
downloadvolse-hubzilla-55836e8ca65ca9a2ae25591de3232470d7a50049.tar.gz
volse-hubzilla-55836e8ca65ca9a2ae25591de3232470d7a50049.tar.bz2
volse-hubzilla-55836e8ca65ca9a2ae25591de3232470d7a50049.zip
update bs-dev
Diffstat (limited to 'view')
-rw-r--r--view/css/bootstrap-red.css6
-rw-r--r--view/theme/redbasic/php/theme_init.php1
2 files changed, 7 insertions, 0 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 1bb82f11c..b2b2ca759 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -46,6 +46,12 @@ nav .dropdown-menu {
overflow: auto;
}
+/* this is a hack and needs fixing in bootstrap */
+nav .dropdown-menu-right {
+ right: 0;
+ left: auto !important;
+}
+
#navbar-collapse-2 {
flex-basis: 100%;
max-height: 70vh;
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 020bda363..bfeabcb46 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -8,6 +8,7 @@ head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
require_once('view/php/theme_init.php');
+head_add_js('/library/popper/popper.js');
head_add_js('/library/bootstrap/js/bootstrap.min.js');
head_add_js('/library/bootbox/bootbox.min.js');
head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');