Commit f7ddb64c authored by Cynddl's avatar Cynddl
Browse files

Merge branch 'master' of https://github.com/stef/nnmon

Conflicts:
	media/css/style.css
	templates/view.html
parents 79bfa861 222e7bd6
......@@ -279,14 +279,11 @@ h1 span {
/* Navigation menu */
#wrapper {
border-bottom: 1px solid #ddd;
}
#nav {
height: 36px;
margin: 0; padding: 0;
list-style-type: none;
border-bottom: 1px solid #ddd;
}
#nav li {
display: inline-block;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment