Merge remote-tracking branch 'mike/master' into dev

This commit is contained in:
Mario Vavti
2017-10-09 17:49:55 +02:00
11 changed files with 356 additions and 15 deletions

View File

@@ -1458,6 +1458,10 @@ blockquote {
background-color: $nav_bg !important;
}
.navbar {
z-index:1030;
}
.navbar-dark .navbar-nav .nav-link,
.usermenu i {
color: $nav_icon_colour;