diff options
| author | git-marijus <mario@mariovavti.com> | 2017-06-09 12:57:05 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-06-09 12:57:05 +0200 |
| commit | 8f2457855c89d0bac57694348608d9dad396dd36 (patch) | |
| tree | 158c18f72c2ecfba3c71d0132e930a851685024d /view | |
| parent | 7e4c880e1ee993537de80f923445191bc53f3698 (diff) | |
| parent | f730e476f0d6db20eea29cd97e995f91a793d61c (diff) | |
| download | volse-hubzilla-8f2457855c89d0bac57694348608d9dad396dd36.tar.gz volse-hubzilla-8f2457855c89d0bac57694348608d9dad396dd36.tar.bz2 volse-hubzilla-8f2457855c89d0bac57694348608d9dad396dd36.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme_init.php | 1 |
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'); |