1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Merge branch 'develop' into develop-2.3

This commit is contained in:
Jeremy Stretch
2017-11-17 12:05:38 -05:00
18 changed files with 87 additions and 16 deletions

View File

@@ -35,8 +35,22 @@ footer p {
margin: 20px 0;
}
/* Collapse the nav menu on displays less than 1200px wide */
/* Hide the username in the navigation menu on displays less than 1400px wide */
@media (max-width: 1399px) {
#navbar_user {
display: none;
}
}
/* Hide the search bar in the navigation menu on displays less than 1200px wide */
@media (max-width: 1199px) {
#navbar_search {
display: none;
}
}
/* Collapse the nav menu on displays less than 960px wide */
@media (max-width: 959px) {
.navbar-header {
float: none;
}
@@ -72,12 +86,8 @@ footer p {
.collapse.in {
display:block !important;
}
}
/* Hide the nav search bar on displays less than 1600px wide */
@media (max-width: 1599px) {
#navbar_search {
display: none;
#navbar_user {
display: inline;
}
}