diff --git a/dashboard/src/modules.js b/dashboard/src/modules.js index 271c427a1..0dc6e20f8 100644 --- a/dashboard/src/modules.js +++ b/dashboard/src/modules.js @@ -11,3 +11,6 @@ import * as moment from 'moment/dist/moment.js'; // attach to global for compatibility window.moment = moment.default; window.Chart = Chart; + +// hack to disable old bootstrap transitions +setTimeout(() => window.$.support.transition = false, 3000); diff --git a/dashboard/src/theme.scss b/dashboard/src/theme.scss index 5b6aeec31..228e0850a 100644 --- a/dashboard/src/theme.scss +++ b/dashboard/src/theme.scss @@ -118,6 +118,10 @@ h1, h2, h3, h4, h5, h6, word-wrap: break-word; } +.navbar-collapse.collapse.in { + background-color: white; +} + .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover { background-color: $brand-primary; color: white; @@ -277,10 +281,6 @@ html, body { background-color: white; border-color: white; - .navbar-collapse { - background-color: white; - } - @media(min-width:768px) { max-height: 50px; } @@ -2206,8 +2206,8 @@ tag-input { background-color: #ffffffe3; } - .navbar .navbar-collapse { - background-color: transparent; + .dropdown-menu { + background-color: #ffffffe3; } footer { @@ -2315,7 +2315,7 @@ tag-input { border-color: $backgroundDark; } - .navbar .navbar-collapse { + .navbar-collapse.collapse.in { background-color: $backgroundDark; } @@ -2489,12 +2489,16 @@ tag-input { border-radius: 2px; } - .navbar { + .navbar-default { background-color: #000000e3; } - .navbar .navbar-collapse { - background-color: transparent; + .navbar-collapse.collapse.in { + background-color: #000000e3; + } + + .dropdown-menu { + background-color: #000000e3; } footer {