Merge branch 'dev' into bootstrap3

This commit is contained in:
Amy Hendrix
2014-07-13 21:55:43 -04:00

View File

@@ -131,19 +131,6 @@ p.stats {
}
}
// Overrides applying only to mobile view
@media only screen and (max-width: 767px) {
.sidebar {
margin-left: 0;
border-left: none;
padding-left: 0;
}
#map {
height: 300px;
}
}
li.crop-hierarchy {
list-style-type: disc;
@@ -177,3 +164,21 @@ li.crop-hierarchy {
text-align: center;
border-radius: 0;
}
// Overrides applying only to mobile view. This must be at the end of the overrides file.
@media only screen and (max-width: 767px) {
.sidebar {
margin-left: 0;
border-left: none;
padding-left: 0;
}
#map {
height: 300px;
}
.navbar .nav > li {
display: block;
}
}